diff options
| -rw-r--r-- | .github/ISSUE_TEMPLATE/language-request.md | 4 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | doc/nvim-treesitter.txt | 4 | ||||
| -rw-r--r-- | lua/nvim-treesitter/fold.lua | 2 | ||||
| -rw-r--r-- | lua/nvim-treesitter/locals.lua | 2 | ||||
| -rw-r--r-- | lua/nvim-treesitter/query_predicates.lua | 2 | ||||
| -rw-r--r-- | queries/clojure/highlights.scm | 4 | ||||
| -rw-r--r-- | queries/cpp/locals.scm | 4 | ||||
| -rw-r--r-- | queries/glimmer/highlights.scm | 2 | ||||
| -rw-r--r-- | queries/julia/highlights.scm | 2 | ||||
| -rw-r--r-- | queries/python/highlights.scm | 2 | ||||
| -rw-r--r-- | queries/python/locals.scm | 2 | ||||
| -rw-r--r-- | queries/scala/highlights.scm | 4 | ||||
| -rw-r--r-- | queries/supercollider/highlights.scm | 2 |
15 files changed, 20 insertions, 20 deletions
diff --git a/.github/ISSUE_TEMPLATE/language-request.md b/.github/ISSUE_TEMPLATE/language-request.md index b10287ea6..6182af225 100644 --- a/.github/ISSUE_TEMPLATE/language-request.md +++ b/.github/ISSUE_TEMPLATE/language-request.md @@ -7,6 +7,6 @@ assignees: '' --- -**Language informations** +**Language information** -Please paste any useful informations here ! +Please paste any useful information here ! diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cb21f988d..6397a08d4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,7 +5,7 @@ First of all, thank you very much for contributing to `nvim-treesitter`. If you haven't already, you should really come and reach out to us on our [gitter](https://gitter.im/nvim-treesitter/community?utm_source=share-link&utm_medium=link&utm_campaign=share-link) room, so we can help you with any question you might have! -As you know, `nvim-treesitter` is roughly splitted in two parts : +As you know, `nvim-treesitter` is roughly split in two parts : - Parser configurations : for various things like `locals`, `highlights` - What we like to call *modules* : tiny lua modules that provide a given feature, based on parser configurations @@ -361,7 +361,7 @@ EOF ## Adding queries -Queries are what `nvim-treesitter` uses to extract informations from the syntax tree; they are +Queries are what `nvim-treesitter` uses to extract information from the syntax tree; they are located in the `queries/{language}/*` runtime directories (like the `queries` folder of this plugin), e.g., `queries/{language}/{locals,highlights,textobjects}.scm`. Other modules may require additional queries such as `folding.scm`. diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt index 6ae700be2..174d1a702 100644 --- a/doc/nvim-treesitter.txt +++ b/doc/nvim-treesitter.txt @@ -17,7 +17,7 @@ Authors: ============================================================================== INTRODUCTION *nvim-treesitter-intro* -nvim-treesitter wraps the Neovim treesitter API to provide functionnalities +nvim-treesitter wraps the Neovim treesitter API to provide functionalities such as highlighting and incremental selection, and a command to easily install parsers. @@ -205,7 +205,7 @@ Perform the |:TSInstall| operation synchronously. *:TSInstallInfo* :TSInstallInfo~ -List informations about currently installed parsers +List information about currently installed parsers *:TSUpdate* :TSUpdate {language} ...~ diff --git a/lua/nvim-treesitter/fold.lua b/lua/nvim-treesitter/fold.lua index 38e03dbe8..01a7c08e9 100644 --- a/lua/nvim-treesitter/fold.lua +++ b/lua/nvim-treesitter/fold.lua @@ -79,7 +79,7 @@ local folds_levels = tsutils.memoize_by_buf_tick(function(bufnr) -- ( \n ( \n )) \n (( \n ) \n ) -- versus -- ( \n ( \n ) \n ( \n ) \n ) - -- If it did have such a mechansim, (trimmed_level - last_trimmed_level) + -- If it did have such a mechanism, (trimmed_level - last_trimmed_level) -- would be the correct number of starts to pass on. if trimmed_level - last_trimmed_level > 0 then prefix = ">" diff --git a/lua/nvim-treesitter/locals.lua b/lua/nvim-treesitter/locals.lua index 6f167d36b..e0da2d02e 100644 --- a/lua/nvim-treesitter/locals.lua +++ b/lua/nvim-treesitter/locals.lua @@ -177,7 +177,7 @@ end) -- -- "parent": Uses the parent of the containing scope, basically, skipping a scope -- "global": Uses the top most scope --- "local": Uses the containg scope of the definition. This is the default +-- "local": Uses the containing scope of the definition. This is the default -- -- @param node: the definition node -- @param bufnr: the buffer diff --git a/lua/nvim-treesitter/query_predicates.lua b/lua/nvim-treesitter/query_predicates.lua index 20cb42743..be713304c 100644 --- a/lua/nvim-treesitter/query_predicates.lua +++ b/lua/nvim-treesitter/query_predicates.lua @@ -99,7 +99,7 @@ query.add_predicate("has-type?", function(match, pattern, bufnr, pred) return vim.tbl_contains(types, node:type()) end) --- Just avoid some anoying warnings for this directive +-- Just avoid some annoying warnings for this directive query.add_directive("make-range!", function() end) query.add_directive("downcase!", function(match, _, bufnr, pred, metadata) diff --git a/queries/clojure/highlights.scm b/queries/clojure/highlights.scm index 0fbeb0e28..e8fd61145 100644 --- a/queries/clojure/highlights.scm +++ b/queries/clojure/highlights.scm @@ -11,7 +11,7 @@ ;; have multiple highlight groups applied to them. -;; >> Litterals +;; >> Literals ( (dis_expr) @comment @@ -292,7 +292,7 @@ . (_)) -; Funciton definitions +; Function definitions (list_lit . (sym_lit) @_keyword.function diff --git a/queries/cpp/locals.scm b/queries/cpp/locals.scm index 9c3ee9862..39cc8245d 100644 --- a/queries/cpp/locals.scm +++ b/queries/cpp/locals.scm @@ -6,7 +6,7 @@ (identifier) @definition.parameter)) (optional_parameter_declaration declarator: (identifier) @definition.parameter) -;; Class / struct defintions +;; Class / struct definitions (class_specifier) @scope (reference_declarator @@ -42,7 +42,7 @@ ((namespace_identifier) @reference (set! reference.kind "namespace")) -;; Function defintions +;; Function definitions (template_function name: (identifier) @definition.function) @scope diff --git a/queries/glimmer/highlights.scm b/queries/glimmer/highlights.scm index e6ab3a60e..bcb9c8b5d 100644 --- a/queries/glimmer/highlights.scm +++ b/queries/glimmer/highlights.scm @@ -30,7 +30,7 @@ ; == Mustache Statements === -; Hightlight the whole statement, to color brackets and separators +; Highlight the whole statement, to color brackets and separators (mustache_statement) @tag.delimiter ; An identifier in a mustache expression is a variable diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm index c24bd68b4..851298439 100644 --- a/queries/julia/highlights.scm +++ b/queries/julia/highlights.scm @@ -66,7 +66,7 @@ (quote_expression (identifier)) @symbol -;; Parsing error! foo (::Type) get's parsed as two quote expressions +;; Parsing error! foo (::Type) gets parsed as two quote expressions (argument_list (quote_expression (quote_expression diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm index 4bb5a2bcf..5f587ddc6 100644 --- a/queries/python/highlights.scm +++ b/queries/python/highlights.scm @@ -4,7 +4,7 @@ ; Variables (identifier) @variable -; Reset highlighing in f-string interpolations +; Reset highlighting in f-string interpolations (interpolation) @none ;; Identifier naming conventions diff --git a/queries/python/locals.scm b/queries/python/locals.scm index f7854a06c..5cfd35435 100644 --- a/queries/python/locals.scm +++ b/queries/python/locals.scm @@ -1,4 +1,4 @@ -;;; Programm structure +;;; Program structure (module) @scope (class_definition diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm index 6f47babb3..d8b39950e 100644 --- a/queries/scala/highlights.scm +++ b/queries/scala/highlights.scm @@ -12,9 +12,9 @@ ; Assume other uppercase names constants. ; NOTE: In order to distinguish constants we highlight ; all the identifiers that are uppercased. But this solution -; is not suitable for all occurences e.g. it will highlight +; is not suitable for all occurrences e.g. it will highlight ; an uppercased method as a constant if used with no params. -; Introducing highlightning for those specific cases, is probably +; Introducing highlighting for those specific cases, is probably ; best way to resolve the issue. ((identifier) @constant (#match? @constant "^[A-Z]")) diff --git a/queries/supercollider/highlights.scm b/queries/supercollider/highlights.scm index 5e7a39e8b..c7e2cd398 100644 --- a/queries/supercollider/highlights.scm +++ b/queries/supercollider/highlights.scm @@ -83,7 +83,7 @@ "|" ] @punctuation.bracket -; Delimeters +; Delimiters [ ";" "." |