From f1c40fbd6603d85d66c94965f1c329bd3c07d402 Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Fri, 1 Aug 2025 15:32:37 +0300 Subject: Configured todo comments in nvim --- .config/nvim/queries/bash/highlights.scm | 7 ++ .config/nvim/queries/comment/highlights.scm | 60 ++++++++++++++++ .config/nvim/queries/go/injections.scm | 108 ++++++++++++++++++++++++++++ .config/nvim/queries/go/locals.scm | 15 ++++ 4 files changed, 190 insertions(+) create mode 100644 .config/nvim/queries/bash/highlights.scm create mode 100644 .config/nvim/queries/comment/highlights.scm create mode 100644 .config/nvim/queries/go/injections.scm create mode 100644 .config/nvim/queries/go/locals.scm (limited to '.config/nvim/queries') diff --git a/.config/nvim/queries/bash/highlights.scm b/.config/nvim/queries/bash/highlights.scm new file mode 100644 index 0000000..b7e6b17 --- /dev/null +++ b/.config/nvim/queries/bash/highlights.scm @@ -0,0 +1,7 @@ +;extends + +; highlight `return` and `exit` like return statements in other languages with +; `@keyword.return` + +((word) @keyword.return + (#any-of? @keyword.return "return" "exit")) diff --git a/.config/nvim/queries/comment/highlights.scm b/.config/nvim/queries/comment/highlights.scm new file mode 100644 index 0000000..133b405 --- /dev/null +++ b/.config/nvim/queries/comment/highlights.scm @@ -0,0 +1,60 @@ +((tag + (name) @comment.todo @nospell + ("(" @punctuation.bracket + (user) @constant + ")" @punctuation.bracket)? + ":" @punctuation.delimiter) + (#any-of? @comment.todo "TODO" "WIP")) + +("text" @comment.todo @nospell + (#any-of? @comment.todo "TODO" "WIP")) + +((tag + (name) @comment.note @nospell + ("(" @punctuation.bracket + (user) @constant + ")" @punctuation.bracket)? + ":" @punctuation.delimiter) + (#any-of? @comment.note "NOTE" "INFO" "DOCS" "TEST")) + +("text" @comment.note @nospell + (#any-of? @comment.note "NOTE" "INFO" "DOCS" "TEST")) + +((tag + (name) @comment.perf @nospell + ("(" @punctuation.bracket + (user) @constant + ")" @punctuation.bracket)? + ":" @punctuation.delimiter) + (#any-of? @comment.perf "PERF" "OPTIMIZE")) + +("text" @comment.perf @nospell + (#any-of? @comment.perf "PERF" "OPTIMIZE")) + +((tag + (name) @comment.warning @nospell + ("(" @punctuation.bracket + (user) @constant + ")" @punctuation.bracket)? + ":" @punctuation.delimiter) + (#any-of? @comment.warning "HACK" "WARNING" "WARN" "SECURITY" "SECURE")) + +("text" @comment.warning @nospell + (#any-of? @comment.warning "HACK" "WARNING" "WARN" "SECURITY" "SECURE")) + +((tag + (name) @comment.error @nospell + ("(" @punctuation.bracket + (user) @constant + ")" @punctuation.bracket)? + ":" @punctuation.delimiter) + (#any-of? @comment.error "FIXME" "FIX" "BUG" "ERROR" "UNSAFE" "SAFETY")) + +("text" @comment.error @nospell + (#any-of? @comment.error "FIXME" "FIX" "BUG" "ERROR" "UNSAFE" "SAFETY")) + +; Issue number (#123) +("text" @number + (#lua-match? @number "^#[0-9]+$")) + +(uri) @string.special.url @nospell diff --git a/.config/nvim/queries/go/injections.scm b/.config/nvim/queries/go/injections.scm new file mode 100644 index 0000000..5d5affc --- /dev/null +++ b/.config/nvim/queries/go/injections.scm @@ -0,0 +1,108 @@ +; extends + +; inject sql in single line strings +; e.g. db.GetContext(ctx, "SELECT * FROM users WHERE name = 'John'") + +((call_expression + (selector_expression + field: (field_identifier) @_field) + (argument_list + (interpreted_string_literal) @sql)) + (#any-of? @_field "Exec" "GetContext" "ExecContext" "SelectContext" "In" + "RebindNamed" "Rebind" "Query" "QueryRow" "QueryRowxContext" "NamedExec" "MustExec" "Get" "Queryx") + (#offset! @sql 0 1 0 -1)) + +; still buggy for nvim 0.10 +((call_expression + (selector_expression + field: (field_identifier) @_field (#any-of? @_field "Exec" "GetContext" "ExecContext" "SelectContext" "In" "RebindNamed" "Rebind" "Query" "QueryRow" "QueryRowxContext" "NamedExec" "MustExec" "Get" "Queryx")) + (argument_list + (interpreted_string_literal) @injection.content)) + (#offset! @injection.content 0 1 0 -1) + (#set! injection.language "sql")) + +; neovim nightly 0.10 +([ + (interpreted_string_literal) + (raw_string_literal) + ] @injection.content + (#match? @injection.content "(SELECT|select|INSERT|insert|UPDATE|update|DELETE|delete).+(FROM|from|INTO|into|VALUES|values|SET|set).*(WHERE|where|GROUP BY|group by)?") + (#offset! @injection.content 0 1 0 -1) +(#set! injection.language "sql")) + +; a general query injection +([ + (interpreted_string_literal) + (raw_string_literal) + ] @sql + (#match? @sql "(SELECT|select|INSERT|insert|UPDATE|update|DELETE|delete).+(FROM|from|INTO|into|VALUES|values|SET|set).*(WHERE|where|GROUP BY|group by)?") + (#offset! @sql 0 1 0 -1)) + +; ---------------------------------------------------------------- +; fallback keyword and comment based injection + +([ + (interpreted_string_literal) + (raw_string_literal) + ] @sql + (#contains? @sql "-- sql" "--sql" "ADD CONSTRAINT" "ALTER TABLE" "ALTER COLUMN" + "DATABASE" "FOREIGN KEY" "GROUP BY" "HAVING" "CREATE INDEX" "INSERT INTO" + "NOT NULL" "PRIMARY KEY" "UPDATE SET" "TRUNCATE TABLE" "LEFT JOIN" "add constraint" "alter table" "alter column" "database" "foreign key" "group by" "having" "create index" "insert into" + "not null" "primary key" "update set" "truncate table" "left join") + (#offset! @sql 0 1 0 -1)) + +; nvim 0.10 +([ + (interpreted_string_literal) + (raw_string_literal) + ] @injection.content + (#contains? @injection.content "-- sql" "--sql" "ADD CONSTRAINT" "ALTER TABLE" "ALTER COLUMN" + "DATABASE" "FOREIGN KEY" "GROUP BY" "HAVING" "CREATE INDEX" "INSERT INTO" + "NOT NULL" "PRIMARY KEY" "UPDATE SET" "TRUNCATE TABLE" "LEFT JOIN" "add constraint" "alter table" "alter column" "database" "foreign key" "group by" "having" "create index" "insert into" + "not null" "primary key" "update set" "truncate table" "left join") + (#offset! @injection.content 0 1 0 -1) + (#set! injection.language "sql")) + + +; should I use a more exhaustive list of keywords? +; "ADD" "ADD CONSTRAINT" "ALL" "ALTER" "AND" "ASC" "COLUMN" "CONSTRAINT" "CREATE" "DATABASE" "DELETE" "DESC" "DISTINCT" "DROP" "EXISTS" "FOREIGN KEY" "FROM" "JOIN" "GROUP BY" "HAVING" "IN" "INDEX" "INSERT INTO" "LIKE" "LIMIT" "NOT" "NOT NULL" "OR" "ORDER BY" "PRIMARY KEY" "SELECT" "SET" "TABLE" "TRUNCATE TABLE" "UNION" "UNIQUE" "UPDATE" "VALUES" "WHERE" + +; json + +((const_spec + name: (identifier) @_const + value: (expression_list (raw_string_literal) @json)) + (#lua-match? @_const ".*[J|j]son.*")) + +; jsonStr := `{"foo": "bar"}` + +((short_var_declaration + left: (expression_list + (identifier) @_var) + right: (expression_list + (raw_string_literal) @json)) + (#lua-match? @_var ".*[J|j]son.*") + (#offset! @json 0 1 0 -1)) + +; nvim 0.10 + +(const_spec + name: (identifier) + value: (expression_list (raw_string_literal) @injection.content + (#lua-match? @injection.content "^`[\n|\t| ]*\{.*\}[\n|\t| ]*`$") + (#offset! @injection.content 0 1 0 -1) + (#set! injection.language "json"))) + +(short_var_declaration + left: (expression_list (identifier)) + right: (expression_list (raw_string_literal) @injection.content) + (#lua-match? @injection.content "^`[\n|\t| ]*\{.*\}[\n|\t| ]*`$") + (#offset! @injection.content 0 1 0 -1) + (#set! injection.language "json")) + +(var_spec + name: (identifier) + value: (expression_list (raw_string_literal) @injection.content + (#lua-match? @injection.content "^`[\n|\t| ]*\{.*\}[\n|\t| ]*`$") + (#offset! @injection.content 0 1 0 -1) + (#set! injection.language "json"))) diff --git a/.config/nvim/queries/go/locals.scm b/.config/nvim/queries/go/locals.scm new file mode 100644 index 0000000..9232669 --- /dev/null +++ b/.config/nvim/queries/go/locals.scm @@ -0,0 +1,15 @@ +; extends + +(var_spec) @local.scope + +(field_declaration + name: (field_identifier) @local.definition.field) + +(method_elem + name: (field_identifier) @function.method.name + parameters: (parameter_list) @function.method.parameter_list) @local.interface.method.declaration + +(type_declaration + (type_spec + name: (type_identifier) @local.name + type: [(struct_type) (interface_type)] @local.type)) @local.start -- cgit v1.3.1