diff --git a/ASP/ASP.sublime-syntax b/ASP/ASP.sublime-syntax index 271d9bb0bd..dbcf26203b 100644 --- a/ASP/ASP.sublime-syntax +++ b/ASP/ASP.sublime-syntax @@ -470,7 +470,7 @@ contexts: - match: '{{constants}}' scope: support.type.vb.asp # maybe this should be constant.language.asp - match: '{{functions}}' - scope: support.function.vb.asp # TODO: scope opening and closing parens i.e. LBound(var_name) but needs to handle (ignore) nested parens LBound((var_name)). Will also apply to things like Response.Write below. Note that parens are optional (when return value is not used) i.e. on it's own line, `LBound var_name` is valid. In other cases the parens can't be accurately scoped, because we don't know if they are for array access or method params + scope: support.function.vb.asp # TODO: scope opening and closing parens i.e. LBound(var_name) but needs to handle (ignore) nested parens LBound((var_name)). Will also apply to things like Response.Write below. Note that parens are optional (when return value is not used) i.e. on its own line, `LBound var_name` is valid. In other cases the parens can't be accurately scoped, because we don't know if they are for array access or method params - match: '{{keywords}}' scope: storage.type.asp - include: operators diff --git a/Batch File/Batch File.sublime-syntax b/Batch File/Batch File.sublime-syntax index d714d9ffe2..c55854e558 100644 --- a/Batch File/Batch File.sublime-syntax +++ b/Batch File/Batch File.sublime-syntax @@ -1098,7 +1098,7 @@ contexts: # b) command terminations via `&` or `|` # and those which don't. # - # The challange here is to correctly switch contexts to maintain both + # The challenge here is to correctly switch contexts to maintain both # "quoted" and "grouped" states at the same time. # # Variables may not contain whitespace nor any kind of operator char. @@ -1888,7 +1888,7 @@ contexts: - match: = scope: meta.interpolation.substitution.dosbatch - keyword.operator.asignment.dosbatch + keyword.operator.assignment.dosbatch set: variable-expansion-substitution-replacement - match: '[^=%!]+' scope: string.unquoted.dosbatch @@ -1946,7 +1946,7 @@ contexts: - match: = scope: meta.interpolation.substitution.dosbatch - keyword.operator.asignment.dosbatch + keyword.operator.assignment.dosbatch set: variable-delayed-substitution-replacement - match: '[^=%!]+' scope: string.unquoted.dosbatch @@ -2026,7 +2026,7 @@ contexts: line-continuation-body: - meta_include_prototype: false - # The first linefeed diretly following a continuation is treated literal. + # The first linefeed directly following a continuation is treated literal. # Note: Must consume \n to work. - match: ^\n set: bol-pop diff --git a/Batch File/Completions/Builtin Commands.sublime-completions b/Batch File/Completions/Builtin Commands.sublime-completions index 7dde59797f..c3d2061267 100644 --- a/Batch File/Completions/Builtin Commands.sublime-completions +++ b/Batch File/Completions/Builtin Commands.sublime-completions @@ -164,7 +164,7 @@ { "trigger": "title", "kind": "function", - "details": "Change terminal window's tilte" + "details": "Change terminal window's title" }, { "trigger": "type", diff --git a/Batch File/tests/syntax_test_batch_file.bat b/Batch File/tests/syntax_test_batch_file.bat index 7e80f97086..cc071a47ea 100644 --- a/Batch File/tests/syntax_test_batch_file.bat +++ b/Batch File/tests/syntax_test_batch_file.bat @@ -114,7 +114,7 @@ not a comment :: <- - comment :: ^^^^^^^^^^ - comment -::: Test Case : continuation with only litaral caret, no recursive continuation +::: Test Case : continuation with only literal caret, no recursive continuation REM Line^ ^ @@ -2597,13 +2597,13 @@ put arg1 arg2 :: ^^ keyword.operator.assignment.redirection.dosbatch :: ^^^ constant.language.null.dosbatch - ECHO f.txt 2>&1 /b :: ^^^^^^^^^^^^^^^^^^^ meta.function-call @@ -2954,11 +2954,11 @@ put arg1 arg2 :: ^^^^^ - support.function ECHO " -:: ^ meta.string.dosbatch string.unquoted.dosbatch - constant - puntuation +:: ^ meta.string.dosbatch string.unquoted.dosbatch - constant - punctuation :: ^ - meta.string - string ECHO "^ -:: ^^ meta.string.dosbatch string.unquoted.dosbatch - constant - puntuation +:: ^^ meta.string.dosbatch string.unquoted.dosbatch - constant - punctuation :: ^ - meta.string - string ECHO "^ @@ -2989,22 +2989,22 @@ put arg1 arg2 :: ^ - meta.command - meta.string - string ECHO "foo" -:: ^^^^^ string.unquoted.dosbatch - constant - puntuation +:: ^^^^^ string.unquoted.dosbatch - constant - punctuation :: ^ - meta.command - meta.string - string ECHO "foo"bar"baz" :: ^ - meta.string - string -:: ^^^^^^^^^^^^^ meta.string.dosbatch string.unquoted.dosbatch - constant - puntuation +:: ^^^^^^^^^^^^^ meta.string.dosbatch string.unquoted.dosbatch - constant - punctuation :: ^ - meta.string - string ECHO foo"bar>nul && echo baz :: ^ - meta.string - string -:: ^^^^^^^^^^^^^^^^^^^^^^^ meta.string.dosbatch string.unquoted.dosbatch - constant - puntuation +:: ^^^^^^^^^^^^^^^^^^^^^^^ meta.string.dosbatch string.unquoted.dosbatch - constant - punctuation :: ^ - meta.string - string ECHO foo"bar">nul && echo baz :: ^ - meta.string - string -:: ^^^^^^^^ meta.string.dosbatch string.unquoted.dosbatch - constant - puntuation +:: ^^^^^^^^ meta.string.dosbatch string.unquoted.dosbatch - constant - punctuation :: ^ keyword.operator.assignment.redirection.dosbatch :: ^^^ constant.language.null.dosbatch :: ^^ keyword.operator.logical.dosbatch @@ -3219,14 +3219,14 @@ no continuation :: ^^^ variable.other.readwrite.dosbatch :: ^ punctuation.separator.dosbatch :: ^^^^ string.unquoted.dosbatch -:: ^ keyword.operator.asignment.dosbatch +:: ^ keyword.operator.assignment.dosbatch :: ^^^^ string.unquoted.dosbatch :: ^ punctuation.section.interpolation.end.dosbatch :: ^ punctuation.section.interpolation.begin.dosbatch :: ^^^ variable.other.readwrite.dosbatch :: ^ punctuation.separator.dosbatch :: ^^^^ string.unquoted.dosbatch -:: ^ keyword.operator.asignment.dosbatch +:: ^ keyword.operator.assignment.dosbatch :: ^^^^ string.unquoted.dosbatch :: ^ punctuation.section.interpolation.end.dosbatch @@ -3324,7 +3324,7 @@ no continuation :: ^ punctuation.separator.dosbatch :: ^ punctuation.section.interpolation.begin.dosbatch :: ^ punctuation.section.interpolation.end.dosbatch -:: ^ keyword.operator.asignment.dosbatch +:: ^ keyword.operator.assignment.dosbatch :: ^ punctuation.section.interpolation.begin.dosbatch :: ^^^ variable.other.readwrite.dosbatch :: ^^ punctuation.separator.dosbatch @@ -3350,7 +3350,7 @@ no continuation :: ^ punctuation.separator.dosbatch :: ^ punctuation.section.interpolation.begin.dosbatch :: ^ punctuation.section.interpolation.end.dosbatch -:: ^ keyword.operator.asignment.dosbatch +:: ^ keyword.operator.assignment.dosbatch :: ^ punctuation.section.interpolation.begin.dosbatch :: ^^^ variable.other.readwrite.dosbatch :: ^^ punctuation.separator.dosbatch @@ -3927,7 +3927,7 @@ no continuation :: ^ punctuation.section.interpolation.begin.dosbatch :: ^^^^ variable.other.readwrite.dosbatch :: ^ punctuation.separator.dosbatch -:: ^ keyword.operator.asignment.dosbatch +:: ^ keyword.operator.assignment.dosbatch :: ^ string.unquoted.dosbatch :: ^ punctuation.section.interpolation.end.dosbatch @@ -4731,7 +4731,7 @@ no continuation :: ^^^^ support.function.builtin.dosbatch :: even number of quotes in l-value - :: quoted value with missing end quotation markd + :: quoted value with missing end quotation mark set /p today="enter %date%: not a comment & echo done :: ^^^^^^^ meta.command.set.dosbatch - meta.string :: ^^^^^^ meta.command.set.dosbatch meta.prompt.dosbatch - meta.string @@ -4765,7 +4765,7 @@ no continuation :: ^^^^ support.function.builtin.dosbatch :: even number of quotes in l-value - :: quoted value with even number of quotes, & ignoredd within quotes + :: quoted value with even number of quotes, & ignored within quotes set /p today="enter %date%: not a comment & echo done" ignored :: ^^^^^^^ meta.command.set.dosbatch - meta.string :: ^^^^^^ meta.command.set.dosbatch meta.prompt.dosbatch - meta.string @@ -4868,7 +4868,7 @@ no continuation :: ^ - punctuation :: odd number of quotes in l-value - :: quoted value with missing end quotation markd + :: quoted value with missing end quotation mark set /p today"="enter %date%: not a comment & echo done :: ^^^^^^^ meta.command.set.dosbatch - meta.string :: ^^^^^^^ meta.command.set.dosbatch meta.prompt.dosbatch - meta.string @@ -4903,7 +4903,7 @@ no continuation :: ^^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.ignored.dosbatch :: odd number of quotes in l-value - :: quoted value with even number of quotes, & ignoredd within quotes + :: quoted value with even number of quotes, & ignored within quotes set /p today"="enter %date%: not a comment & echo done" text :: ^^^^^^^ meta.command.set.dosbatch - meta.string :: ^^^^^^^ meta.command.set.dosbatch meta.prompt.dosbatch - meta.string @@ -5190,7 +5190,7 @@ no continuation :: ^^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.ignored.dosbatch :: quoted prompt, even number of quotes in l-value - :: quoted value with even number of quotes, & ignoredd within quotes + :: quoted value with even number of quotes, & ignored within quotes set /p "today="enter %date%: ignored content & echo done" end :: ^^^^^^^ meta.command.set.dosbatch - meta.string :: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.command.set.dosbatch meta.prompt.dosbatch - meta.string @@ -5292,7 +5292,7 @@ no continuation :: ^^^^ support.function.builtin.dosbatch :: quoted prompt, odd number of quotes in l-value - :: quoted value with missing end quotation markd + :: quoted value with missing end quotation mark set /p "today"="enter %date%: not a comment & echo done :: ^^^^^^^ meta.command.set.dosbatch - meta.string :: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.command.set.dosbatch meta.prompt.dosbatch - meta.string @@ -5322,7 +5322,7 @@ no continuation :: ^^^^ support.function.builtin.dosbatch :: quoted prompt, odd number of quotes in l-value - :: quoted value with even number of quotes, & ignoredd within quotes + :: quoted value with even number of quotes, & ignored within quotes set /p "today"="enter %date%: not a comment & echo done" text :: ^^^^^^^ meta.command.set.dosbatch - meta.string :: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.command.set.dosbatch meta.prompt.dosbatch - meta.string diff --git a/C#/tests/syntax_test_Comments.cs b/C#/tests/syntax_test_Comments.cs index 49cfc4a8ef..636a34c3c8 100755 --- a/C#/tests/syntax_test_Comments.cs +++ b/C#/tests/syntax_test_Comments.cs @@ -43,7 +43,7 @@ class Hello void dcscmm(Transpose TransA, int m, int n, int k, double alpha, double[] val, int offsetval, - int[] indx, int offsetindx, + int[] idx, int offsetidx, int[] pntrb, int offsetpntrb, //int[] pntre, int offsetpntre, double[] b, int offsetb, int ldb, diff --git a/C#/tests/syntax_test_Using.cs b/C#/tests/syntax_test_Using.cs index b3a73df8f2..1635c03c27 100755 --- a/C#/tests/syntax_test_Using.cs +++ b/C#/tests/syntax_test_Using.cs @@ -97,7 +97,7 @@ static void UsingFont([Usage("help text")] string x) /// ^ meta.method meta.block meta.block punctuation.section.block.end } - public void dcsrmm(double[] val, int offsetval, int[] indx, int offsetindx, int[] pntrb, int offsetpntrb, double[] b, int offsetb, int ldb, double beta, double[] c, int offsetc, int ldc) + public void dcsrmm(double[] val, int offsetval, int[] idx, int offsetidx, int[] pntrb, int offsetpntrb, double[] b, int offsetb, int ldb, double beta, double[] c, int offsetc, int ldc) { fixed (Double* bp = &b[offsetb]) /// ^ keyword.control.other.fixed @@ -122,7 +122,7 @@ public void dcsrmm(double[] val, int offsetval, int[] indx, int offsetindx, int[ /// ^ punctuation.separator.variables /// ^ punctuation.section.group.end { - cblas_dcsrmm(valp, indxp, pntrbp, bp, ldb, beta, cp, ldc); + cblas_dcsrmm(valp, idxp, pntrbp, bp, ldb, beta, cp, ldc); } } } diff --git a/C#/tests/syntax_test_indentation.cs b/C#/tests/syntax_test_indentation.cs index 3b5d8baa47..953f49d2a1 100644 --- a/C#/tests/syntax_test_indentation.cs +++ b/C#/tests/syntax_test_indentation.cs @@ -20,7 +20,7 @@ void IndentationTest (int arg1) { default: Console.WriteLine("More than 10"); break; - // NOTE (continutation)... because they can only unindent one level at a time and here would need 2 levels + // NOTE (continuation)... because they can only unindent one level at a time and here would need 2 levels } var myValue = (args.Length > 0) switch { true => int.Parse(args[0]), _ => 4 }; diff --git a/C++/C++ Standard Includes.sublime-completions b/C++/C++ Standard Includes.sublime-completions index d082468377..150c5a6c02 100644 --- a/C++/C++ Standard Includes.sublime-completions +++ b/C++/C++ Standard Includes.sublime-completions @@ -69,7 +69,7 @@ "kind": ["namespace", "h", "Header"] }, { - // C-style time/date utilites + // C-style time/date utilities "trigger": "ctime", "contents": "ctime", "kind": ["namespace", "h", "Header"] @@ -123,7 +123,7 @@ "kind": ["namespace", "h", "Header"] }, - // Dynmamic memory management utilities + // Dynamic memory management utilities { // Low-level memory management utilities "trigger": "new", diff --git a/C++/C++.sublime-syntax b/C++/C++.sublime-syntax index b40646af36..524e5ff129 100644 --- a/C++/C++.sublime-syntax +++ b/C++/C++.sublime-syntax @@ -94,7 +94,7 @@ contexts: # Reusable contexts # # The follow contexts are currently constructed to be reused in the - # Objetive-C++ syntax. They are specifically constructed to not push into + # Objective-C++ syntax. They are specifically constructed to not push into # sub-contexts, which ensures that Objective-C++ code isn't accidentally # lexed as plain C++. # diff --git a/C++/syntax_test_c.c b/C++/syntax_test_c.c index de451da8fb..ec3bd38270 100644 --- a/C++/syntax_test_c.c +++ b/C++/syntax_test_c.c @@ -313,7 +313,7 @@ int f(int x, \ /* <- keyword.control.import */ \ /* ^ string.unquoted */ \ be splitted into two lines to prevent large lines. // comment -#error "Eplicitly quoted string wrapped, \ +#error "Explicitly quoted string wrapped, \ ensuring that the string quoting stops at some point \ " #warning This is a short warning diff --git a/C++/syntax_test_cpp.cpp b/C++/syntax_test_cpp.cpp index b6799fe796..d0552e9c91 100644 --- a/C++/syntax_test_cpp.cpp +++ b/C++/syntax_test_cpp.cpp @@ -814,7 +814,7 @@ A> f(std::function>()> g) { } int main() { std::function foo1; - /* ^ - variabe.function */ + /* ^ - variable.function */ std::function()> foo2; /* ^ - variable.function */ auto f = [](std::function>()> g) { return g(); }; diff --git a/CSS/CSS.sublime-syntax b/CSS/CSS.sublime-syntax index 2fde038242..1d5f27a5ee 100644 --- a/CSS/CSS.sublime-syntax +++ b/CSS/CSS.sublime-syntax @@ -85,7 +85,7 @@ variables: logical_operators: (?i:and|or|not|only) - # Block punctuations + # Block punctuation # Provides an easy and safe interface for template syntaxes to override # block punctuation patterns to prevent ambiguities with interpolations. # It helps to correctly highlight {{ tag }} { {{prop}}: {{value}} } @@ -1235,7 +1235,7 @@ contexts: - meta_scope: entity.other.attribute-name.class.css - include: identifier-content - # Id Selectors + # ID Selectors # https://drafts.csswg.org/selectors-4/#id-selectors selector-ids: - match: \# @@ -2425,10 +2425,10 @@ contexts: - match: \b(?i:(?:repeating-)?linear-gradient)(?=\() scope: meta.function-call.identifier.css support.function.gradient.css push: - - linear-gradient-function-argurments-list-body + - linear-gradient-function-arguments-list-body - function-arguments-list-begin - linear-gradient-function-argurments-list-body: + linear-gradient-function-arguments-list-body: - meta_content_scope: meta.function-call.arguments.css meta.group.css - include: function-arguments-prototype - include: comma-delimiters diff --git a/CSS/Default.sublime-keymap b/CSS/Default.sublime-keymap index ca7d479131..d5ca21859e 100644 --- a/CSS/Default.sublime-keymap +++ b/CSS/Default.sublime-keymap @@ -30,7 +30,7 @@ ] }, // Move the caret to the next line and leave the terminating semicolon untouched. - // This is to not bother with semicolons even though completions end up with the caret directy in front of it. + // This is to not bother with semicolons even though completions end up with the caret directly in front of it. { "keys": ["enter"], "command": "run_macro_file", "args": {"file": "res://Packages/Default/Add Line.sublime-macro", "hide_from_menu": true} , "context": [ { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true }, diff --git a/CSS/Indentation Rules.tmPreferences b/CSS/Indentation Rules.tmPreferences index 0a7db87cc2..c1a306ae81 100644 --- a/CSS/Indentation Rules.tmPreferences +++ b/CSS/Indentation Rules.tmPreferences @@ -11,7 +11,7 @@ diff --git a/CSS/syntax_test_css.css b/CSS/syntax_test_css.css index 031f534c2c..a2153b2907 100644 --- a/CSS/syntax_test_css.css +++ b/CSS/syntax_test_css.css @@ -716,7 +716,7 @@ .test-nested-container { @container name { table {}; > span { font-size: 1.25rem; }; color: red } } /* ^^ meta.property-list.css meta.block.css - meta.at-rule */ /* ^^^^^^^^^^^^^^^^ meta.property-list.css meta.block.css meta.at-rule.container.css - meta.group - meta.block meta.block */ -/* ^^ meta.property-list.css meta.block.css meta.at-rule.container.css meta.block.css - meta.block.css meta.block.css meta.block.css - meta.sepector */ +/* ^^ meta.property-list.css meta.block.css meta.at-rule.container.css meta.block.css - meta.block.css meta.block.css meta.block.css - meta.selector */ /* ^^^^^^ meta.property-list.css meta.block.css meta.at-rule.container.css meta.property-list.css meta.block.css meta.selector.css */ /* ^^ meta.property-list.css meta.block.css meta.at-rule.container.css meta.property-list.css meta.block.css meta.property-list.css meta.block.css */ /* ^^ meta.property-list.css meta.block.css meta.at-rule.container.css meta.property-list.css meta.block.css - meta.selector */ @@ -974,7 +974,7 @@ /* ^^^^^^^ meta.property-list.css meta.block.css meta.at-rule.media.css - meta.group - meta.block meta.block */ /* ^^^^^^^^^^^^^^^^^ meta.property-list.css meta.block.css meta.at-rule.media.css meta.group.css */ /* ^ meta.property-list.css meta.block.css meta.at-rule.media.css - meta.group - meta.block meta.block */ -/* ^^ meta.property-list.css meta.block.css meta.at-rule.media.css meta.block.css - meta.block.css meta.block.css meta.block.css - meta.sepector */ +/* ^^ meta.property-list.css meta.block.css meta.at-rule.media.css meta.block.css - meta.block.css meta.block.css meta.block.css - meta.selector */ /* ^^^^^^ meta.property-list.css meta.block.css meta.at-rule.media.css meta.property-list.css meta.block.css meta.selector.css */ /* ^^ meta.property-list.css meta.block.css meta.at-rule.media.css meta.property-list.css meta.block.css meta.property-list.css meta.block.css */ /* ^^ meta.property-list.css meta.block.css meta.at-rule.media.css meta.property-list.css meta.block.css - meta.selector */ @@ -1783,7 +1783,7 @@ .test-nested-supports { @supports { table {}; > span { font-size: 1.25rem; }; color: red } } /* ^^ meta.property-list.css meta.block.css - meta.at-rule */ /* ^^^^^^^^^^ meta.property-list.css meta.block.css meta.at-rule.supports.css - meta.group - meta.block meta.block */ -/* ^^ meta.property-list.css meta.block.css meta.at-rule.supports.css meta.block.css - meta.block.css meta.block.css meta.block.css - meta.sepector */ +/* ^^ meta.property-list.css meta.block.css meta.at-rule.supports.css meta.block.css - meta.block.css meta.block.css meta.block.css - meta.selector */ /* ^^^^^^ meta.property-list.css meta.block.css meta.at-rule.supports.css meta.property-list.css meta.block.css meta.selector.css */ /* ^^ meta.property-list.css meta.block.css meta.at-rule.supports.css meta.property-list.css meta.block.css meta.property-list.css meta.block.css */ /* ^^ meta.property-list.css meta.block.css meta.at-rule.supports.css meta.property-list.css meta.block.css - meta.selector */ @@ -2282,7 +2282,7 @@ /* ^^^^^^^^^ support.type.property-name.css */ /* ^^^^ meta.property-list.css meta.block.css meta.property-value.css constant.language.null.css */ - --custon-prop-name: value; + --custom-prop-name: value; /* ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.property-list.css meta.block.css */ /* ^^^^^^^^^^^^^^^^^^ meta.property-name.css entity.other.custom-property.css */ /* ^ punctuation.separator.key-value.css */ @@ -4479,7 +4479,7 @@ img{ /* ^ variable.language.parent.css */ /* & is not a string value, but an object in CSS */ - .foo { &bar { /* is not not .foobar! */ } + .foo { &bar { /* is not .foobar! */ } /* ^ variable.language.parent.css */ /* ^^^ entity.name.tag.other.css*/ diff --git a/D/Completion Rules.tmPreferences b/D/Completion Rules.tmPreferences index 33f93cb542..e2900f4504 100644 --- a/D/Completion Rules.tmPreferences +++ b/D/Completion Rules.tmPreferences @@ -6,7 +6,7 @@ settings cancelCompletion - ^\s*(\}?\s*(else|try|do|finally|synchonized|struct|union|unittest|debug)|(class|struct|interface|union)\s*[a-zA-Z_0-9]+*)$ + ^\s*(\}?\s*(else|try|do|finally|synchronized|struct|union|unittest|debug)|(class|struct|interface|union)\s*[a-zA-Z_0-9]+*)$ diff --git a/D/D.sublime-syntax b/D/D.sublime-syntax index 286037d032..131614e892 100644 --- a/D/D.sublime-syntax +++ b/D/D.sublime-syntax @@ -71,7 +71,7 @@ variables: operator_overloads: 'opNeg|opCom|opPostInc|opPostDec|opCast|opAdd|opSub|opSub_r|opMul|opDiv|opDiv_r|opMod|opMod_r|opAnd|opOr|opXor|opShl|opShl_r|opShr|opShr_r|opUShr|opUShr_r|opCat|opCat_r|opEquals|opEquals|opCmp|opCmp|opCmp|opCmp|opAddAssign|opSubAssign|opMulAssign|opDivAssign|opModAssign|opAndAssign|opOrAssign|opXorAssign|opShlAssign|opShrAssign|opUShrAssign|opCatAssign|opIndex|opIndexAssign|opCall|opSlice|opSliceAssign|opPos|opAdd_r|opMul_r|opAnd_r|opOr_r|opXor_r' - block_statement_loohahead: '(?={)' + block_statement_lookahead: '(?={)' exclamation_mark: '!(?!=|in\b|is\b)' @@ -155,7 +155,7 @@ contexts: - include: value-or-declaration-in block-statement-in: - - match: '{{block_statement_loohahead}}' + - match: '{{block_statement_lookahead}}' push: block-statement block-statement: - match: '{' @@ -168,7 +168,7 @@ contexts: - include: statement-list-in - include: not-whitespace-illegal-pop optional-block-statement: - - match: '{{block_statement_loohahead}}' + - match: '{{block_statement_lookahead}}' set: block-statement - match: '(?=\S)' pop: true @@ -435,23 +435,23 @@ contexts: scope: constant.character.escape.d - match: '\S' scope: invalid.illegal.unknown-escape.d - # Deliminated string with custom identifier + # Delimited string with custom identifier - match: '(q)(")({{name}})(.*)$' captures: 1: storage.modifier.string.d 2: punctuation.definition.string.begin.d - 3: constant.other.delimeter.d + 3: constant.other.delimiter.d 4: invalid.illegal.d set: - meta_include_prototype: false - meta_scope: meta.string.d string.quoted.double.raw.d - match: '(^\3)(")({{string_postfix}})' captures: - 1: constant.other.delimeter.d + 1: constant.other.delimiter.d 2: punctuation.definition.string.end.d 3: storage.type.string.d pop: true - # Nested Deliminated string + # Nested Delimited string - match: (q)("\[) captures: 1: storage.modifier.string.d @@ -500,18 +500,18 @@ contexts: 1: punctuation.definition.string.end.d 2: storage.type.string.d pop: true - # Other deliminated string + # Other delimited string - match: '(q)(")(.)' captures: 1: storage.modifier.string.d 2: punctuation.definition.string.begin.d - 3: constant.other.delimeter.d + 3: constant.other.delimiter.d set: - meta_include_prototype: false - meta_scope: meta.string.d string.quoted.double.raw.d - match: '(\3)(?:(")|(.))({{string_postfix}})' captures: - 1: constant.other.delimeter.d + 1: constant.other.delimiter.d 2: punctuation.definition.string.end.d 3: invalid.illegal.d 4: storage.type.string.d @@ -634,7 +634,7 @@ contexts: scope: punctuation.separator.d pop: true - include: end-of-line - - match: '{{block_statement_loohahead}}' + - match: '{{block_statement_lookahead}}' set: block-statement - match: '{{attribute_lookahead}}' push: attribute @@ -934,7 +934,7 @@ contexts: pop: true # Function type arguments are slightly different to regular function - # arguments. With regular arguments a standalone "name" is asssumed to be a + # arguments. With regular arguments a standalone "name" is assumed to be a # template argument, but with function types they must be a type. function-type-argument-definition-list: - match: '\(' @@ -1020,7 +1020,7 @@ contexts: set: - match: '(?=\()' set: [function-definition-after-condition, assert-arguments] - - match: '{{block_statement_loohahead}}' + - match: '{{block_statement_lookahead}}' set: [function-definition-after-condition, block-statement] - include: not-whitespace-illegal-pop - match: '\bout\b' @@ -1032,7 +1032,7 @@ contexts: - match: '=>' scope: keyword.declaration.function.d set: [expect-end-of-line, value] - - match: '{{block_statement_loohahead}}' + - match: '{{block_statement_lookahead}}' set: block-statement - include: expect-end-of-line function-out-contract: @@ -1051,7 +1051,7 @@ contexts: scope: punctuation.separator.sequence.d set: [function-out-contract-after, value-list] - include: not-whitespace-illegal-pop - - match: '{{block_statement_loohahead}}' + - match: '{{block_statement_lookahead}}' set: block-statement - include: not-whitespace-illegal-pop function-out-contract-after: @@ -1107,7 +1107,7 @@ contexts: - include: not-whitespace-illegal-pop optional-template-body-block: - - match: '{{block_statement_loohahead}}' + - match: '{{block_statement_lookahead}}' set: block-statement - match: '\bif\b' scope: keyword.control.conditional.d diff --git a/D/tests/syntax_test_d.d b/D/tests/syntax_test_d.d index e059939669..9484316e7f 100644 --- a/D/tests/syntax_test_d.d +++ b/D/tests/syntax_test_d.d @@ -138,47 +138,47 @@ auto hexString = x"00 ba // ^^^ string.quoted.double.raw.d constant.character.escape.d // ^ string.quoted.double.raw.d invalid.illegal.unknown-escape.d // ^ string.quoted.double.raw.d punctuation.definition.string.end.d -auto deliminated = q"SQL_1 -// ^^^^^^^^ meta.string.d string.quoted.double.raw.d -// ^ storage.modifier.string.d -// ^ punctuation.definition.string.begin.d -// ^^^^^ constant.other.delimeter.d +auto delimited = q"SQL_1 +// ^^^^^^^^ meta.string.d string.quoted.double.raw.d +// ^ storage.modifier.string.d +// ^ punctuation.definition.string.begin.d +// ^^^^^ constant.other.delimiter.d select foo \n // ^^^^^^^^^^^^^^ meta.string.d string.quoted.double.raw.d SQL_1"; -// <- meta.string.d string.quoted.double.raw.d constant.other.delimeter.d +// <- meta.string.d string.quoted.double.raw.d constant.other.delimiter.d //^^^^ meta.string.d string.quoted.double.raw.d -// ^^ constant.other.delimeter.d +// ^^ constant.other.delimiter.d // ^ punctuation.definition.string.end.d // ^ punctuation.terminator.d // - meta.string.d -auto deliminatedBad = q"SQL\ -// ^ meta.string.d string.quoted.double.raw.d invalid.illegal.d +auto delimitedBad = q"SQL\ +// ^ meta.string.d string.quoted.double.raw.d invalid.illegal.d SQL"; -auto deliminatedNested = q"(f("))" + q"{f{"}}" + q"[f["]]" + q">"; -// ^^^^^^^^^ meta.string.d string.quoted.double.raw.d -// ^ storage.modifier.string.d -// ^^ punctuation.definition.string.begin.d -// ^^ punctuation.definition.string.end.d -// ^^^^^^^^^ meta.string.d string.quoted.double.raw.d -// ^ storage.modifier.string.d -// ^^ punctuation.definition.string.begin.d -// ^^ punctuation.definition.string.end.d -// ^^^^^^^^^ meta.string.d string.quoted.double.raw.d -// ^ storage.modifier.string.d -// ^^ punctuation.definition.string.begin.d -// ^^ punctuation.definition.string.end.d -// ^^^^^^^^^ meta.string.d string.quoted.double.raw.d -// ^ storage.modifier.string.d -// ^^ punctuation.definition.string.begin.d -// ^^ punctuation.definition.string.end.d -auto deliminatedAny = q"/foo(xxx)/"; -// ^^^^^^^^^^^^^ meta.string.d string.quoted.double.raw.d -// ^ storage.modifier.string.d -// ^ punctuation.definition.string.begin.d -// ^ constant.other.delimeter.d -// ^ constant.other.delimeter.d -// ^ punctuation.definition.string.end.d +auto delimitedNested = q"(f("))" + q"{f{"}}" + q"[f["]]" + q">"; +// ^^^^^^^^^ meta.string.d string.quoted.double.raw.d +// ^ storage.modifier.string.d +// ^^ punctuation.definition.string.begin.d +// ^^ punctuation.definition.string.end.d +// ^^^^^^^^^ meta.string.d string.quoted.double.raw.d +// ^ storage.modifier.string.d +// ^^ punctuation.definition.string.begin.d +// ^^ punctuation.definition.string.end.d +// ^^^^^^^^^ meta.string.d string.quoted.double.raw.d +// ^ storage.modifier.string.d +// ^^ punctuation.definition.string.begin.d +// ^^ punctuation.definition.string.end.d +// ^^^^^^^^^ meta.string.d string.quoted.double.raw.d +// ^ storage.modifier.string.d +// ^^ punctuation.definition.string.begin.d +// ^^ punctuation.definition.string.end.d +auto delimitedAny = q"/foo(xxx)/"; +// ^^^^^^^^^^^^^ meta.string.d string.quoted.double.raw.d +// ^ storage.modifier.string.d +// ^ punctuation.definition.string.begin.d +// ^ constant.other.delimiter.d +// ^ constant.other.delimiter.d +// ^ punctuation.definition.string.end.d auto stringPostfix = ``c + ""w + q"//"d; // ^ meta.string.d string.quoted.double.raw.backtick.d storage.type.string.d // ^ meta.string.d string.quoted.double.d storage.type.string.d diff --git a/Erlang/Erlang.sublime-syntax b/Erlang/Erlang.sublime-syntax index 59d5af2aa0..5a13350f62 100644 --- a/Erlang/Erlang.sublime-syntax +++ b/Erlang/Erlang.sublime-syntax @@ -34,13 +34,13 @@ variables: # an identifier can contain lowercase, uppercase, digits, underscore and @ ident_char: '[_A-Za-z\d@]' # the character which identifies the end of an identifier - # Note: need the character as embedded positvie lookaheads don't work + # Note: need the character as embedded positive lookaheads don't work ident_break_char: '[^{{ident_char}}]' # end of identifier lookahead # Note: avoid negative lookahead as it is 6-8% slower ident_break: (?={{ident_break_char}}) # a quoted identifier with possibly escaped single quote - # preceeded by an arbitary number of excaped backslashes + # preceded by an arbitrary number of escaped backslashes ident_quoted: \'((?:\\\\)*\\\'|[^''])*\' # an identifier can be an atom or a variable ident_unquoted: '[_A-Za-z]{{ident_char}}*' @@ -268,8 +268,8 @@ contexts: # https://www.erlang.org/doc/reference_manual/macros.html#flow-control-in-macros # Note: # The `-` is scoped as `punctuation.definition` because: - # 1. derectives are most likely one-liners (with exceptions!) - # 2. the hyphon is compared to the hash-tag in C/C++ preprocessors + # 1. directives are most likely one-liners (with exceptions!) + # 2. the hyphen is compared to the hash-tag in C/C++ preprocessors # 3. the `.` is meant to share the scope `punctuation.terminator.clause` # with clauses/functions as it has the same meaning. - match: (-)\s*(ifdef|ifndef){{ident_break}} @@ -886,7 +886,7 @@ contexts: expr-fun-meta: - meta_scope: meta.fun.erlang - - include: immediatelly-pop + - include: immediately-pop expr-fun-type-decider: # function reference (e.g.: FuncName = fun module:name/arity) @@ -1268,7 +1268,7 @@ contexts: record-field-access-meta: - meta_content_scope: meta.record.field.erlang - - include: immediatelly-pop + - include: immediately-pop record-field-access-name: - include: variable-other-field @@ -1303,7 +1303,7 @@ contexts: record-field-identifier-meta: - meta_content_scope: meta.field.identifier.erlang - - include: immediatelly-pop + - include: immediately-pop record-field-identifier: - include: variable-anonymous-pop @@ -1448,7 +1448,7 @@ contexts: namespace-meta: - meta_scope: meta.path.erlang - - include: immediatelly-pop + - include: immediately-pop namespace-member-other: - include: reference-pop @@ -1456,7 +1456,7 @@ contexts: - include: atom-pop - include: macro-pop - include: variable-other-pop - - include: immediatelly-pop + - include: immediately-pop namespace-accessor: - match: ':' @@ -1500,7 +1500,7 @@ contexts: reference-arity-meta: - meta_content_scope: meta.reference.function.arity.erlang - - include: immediatelly-pop + - include: immediately-pop reference-arity-body: - match: \d+ @@ -2134,7 +2134,7 @@ contexts: - match: (?=->|when{{ident_break_char}}) pop: 1 - immediatelly-pop: + immediately-pop: - match: '' pop: 1 @@ -2189,7 +2189,7 @@ contexts: - include: illegal-group-body illegal-group-body: - # consume numbers to prevent matching decimal separater as clause-end + # consume numbers to prevent matching decimal separator as clause-end - match: \d+\.\d*|\.\d+ - include: clause-end-pop - match: \( diff --git a/Erlang/syntax_test_erlang.erl b/Erlang/syntax_test_erlang.erl index 4e3c7a6e51..15263eb3c5 100644 --- a/Erlang/syntax_test_erlang.erl +++ b/Erlang/syntax_test_erlang.erl @@ -4555,7 +4555,7 @@ function_call_tests() -> % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang -% match builtin functions without respect of preceeded namespace +% match builtin functions without respect of preceded namespace erlang:abs(X), % ^^^^^^^ meta.path.erlang - meta.function-call @@ -4684,7 +4684,7 @@ function_call_tests() -> % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang -% builtins don't need the namespace preceeded +% builtins don't need the namespace preceded abs(X), % ^ - meta.function-call - meta.path @@ -4792,7 +4792,7 @@ function_call_tests() -> % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang -% don't match macro names as builin functions +% don't match macro names as builtin functions ?FUNC(X), % ^ - meta.function-call - meta.path diff --git a/Git Formats/Completions/Git Attributes - Encoding.sublime-completions b/Git Formats/Completions/Git Attributes - Encoding.sublime-completions index 949e54ae11..492f2d08bd 100644 --- a/Git Formats/Completions/Git Attributes - Encoding.sublime-completions +++ b/Git Formats/Completions/Git Attributes - Encoding.sublime-completions @@ -171,7 +171,7 @@ }, { "trigger": "big5", - "annotation": "Chineese Traditional", + "annotation": "Chinese Traditional", "contents": "gb2312", "kind": ["variable", "e", "Encoding"] }, @@ -183,7 +183,7 @@ }, { "trigger": "euc_jp", - "annotation": "Japaneese", + "annotation": "Japanese", "contents": "euc_jp", "kind": ["variable", "e", "Encoding"] }, @@ -195,7 +195,7 @@ }, { "trigger": "gb2312", - "annotation": "Chineese Simplified", + "annotation": "Chinese Simplified", "contents": "gb2312", "kind": ["variable", "e", "Encoding"] }, @@ -219,7 +219,7 @@ }, { "trigger": "Shift_JIS", - "annotation": "Japaneese", + "annotation": "Japanese", "contents": "Shift_JIS", "kind": ["variable", "e", "Encoding"] }, diff --git a/Git Formats/Git Attributes.sublime-syntax b/Git Formats/Git Attributes.sublime-syntax index 210e718cfb..062eea7663 100644 --- a/Git Formats/Git Attributes.sublime-syntax +++ b/Git Formats/Git Attributes.sublime-syntax @@ -75,7 +75,7 @@ contexts: attributes-list: - meta_content_scope: meta.attributes-list.git.attributes - # attriubte list ends with line + # attribute list ends with line - match: $\n? scope: meta.attributes-list.git.attributes pop: 1 diff --git a/Git Formats/Git Common.sublime-syntax b/Git Formats/Git Common.sublime-syntax index dbf6950b76..3a514e855b 100644 --- a/Git Formats/Git Common.sublime-syntax +++ b/Git Formats/Git Common.sublime-syntax @@ -171,7 +171,7 @@ contexts: # any other directory pattern - include: fnmatch-dir-pattern - # In order to use fnmatch by other syntaxes, it is importand to use + # In order to use fnmatch by other syntaxes, it is important to use # fnmatch-body as include in a scope, which defines the desired meta # and the required bail-out scopes as they might be different and # therefore are not part of the following section. diff --git a/Git Formats/Git Rebase.sublime-syntax b/Git Formats/Git Rebase.sublime-syntax index ff6078e242..4210c0f04f 100644 --- a/Git Formats/Git Rebase.sublime-syntax +++ b/Git Formats/Git Rebase.sublime-syntax @@ -283,7 +283,7 @@ contexts: commit-subject: - meta_scope: meta.commit.git.rebase - include: line-end - - match: (?=\S) # subject beginns with first none whitespece + - match: (?=\S) # subject begins with first none whitespace set: commit-subject-content commit-subject-content: diff --git a/Git Formats/tests/syntax_test_git_commit b/Git Formats/tests/syntax_test_git_commit index d20c08ee8d..564d9bc43d 100644 --- a/Git Formats/tests/syntax_test_git_commit +++ b/Git Formats/tests/syntax_test_git_commit @@ -53,7 +53,7 @@ Issue repo-with/many-hyphen_and_underscores#1 closed yet. # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constant.other.reference.issue.git # ^ punctuation.separator.reference.issue.git # ^ punctuation.definition.reference.issue.git -Issue -user-/-repo-#230 starting and ending with hyphons. +Issue -user-/-repo-#230 starting and ending with hyphens. # <- meta.message.git.commit #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.message.git.commit # ^^^^^^^^^^^^^^^^^ constant.other.reference.issue.git diff --git a/Git Formats/tests/syntax_test_git_commit_message b/Git Formats/tests/syntax_test_git_commit_message index 2fbfe737dc..e7e63bf096 100644 --- a/Git Formats/tests/syntax_test_git_commit_message +++ b/Git Formats/tests/syntax_test_git_commit_message @@ -47,7 +47,7 @@ Issue repo-with/many-hyphen_and_underscores#1 closed yet. # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constant.other.reference.issue.git # ^ punctuation.separator.reference.issue.git # ^ punctuation.definition.reference.issue.git -Issue -user-/-repo-#230 starting and ending with hyphons. +Issue -user-/-repo-#230 starting and ending with hyphens. # <- meta.message.git.commit #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.message.git.commit # ^^^^^^^^^^^^^^^^^ constant.other.reference.issue.git diff --git a/Go/Go.sublime-syntax b/Go/Go.sublime-syntax index 2809169e19..fb501d4627 100644 --- a/Go/Go.sublime-syntax +++ b/Go/Go.sublime-syntax @@ -805,7 +805,7 @@ contexts: match-string-templates: # This context is used for interpolation within quoted or unquoted strings. - # Matchs only if closing `}}` is found on same line to avoid false positives. + # Matches only if closing `}}` is found on same line to avoid false positives. # It clears the `string` scope of the owning context. - match: ({{)(-?)(?=.*?}}) captures: diff --git a/Go/Template.tmPreferences b/Go/Template.tmPreferences index 7f99049d08..ceed42e233 100644 --- a/Go/Template.tmPreferences +++ b/Go/Template.tmPreferences @@ -5,7 +5,7 @@ Template begin and end punctuation to wrap snippets into, when expanding within plain HTML, Markdown, CSS, JavaScript or Go strings. - These variables are used to share snippets accross + These variables are used to share snippets across plain text and template source code and to be able to adjust whether templates are wrapped with whitespace. --> diff --git a/HTML/HTML.sublime-syntax b/HTML/HTML.sublime-syntax index 855f3c1e95..78e249fbd5 100644 --- a/HTML/HTML.sublime-syntax +++ b/HTML/HTML.sublime-syntax @@ -143,7 +143,7 @@ variables: script_content_begin: |- (?x: # whitespace followed by opening html comment begin punctuation, - # optionally followed by whitespeace until end of line + # optionally followed by whitespace until end of line \s*( + int i = (1 >< 5); // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - meta.tag.jsp meta.tag.jsp // ^^^^^^^^^^^^^^^ meta.tag.jsp.scriptlet.begin.html diff --git a/JavaScript/Indentation Rules.tmPreferences b/JavaScript/Indentation Rules.tmPreferences index 82068e1709..b534d0d127 100644 --- a/JavaScript/Indentation Rules.tmPreferences +++ b/JavaScript/Indentation Rules.tmPreferences @@ -3,7 +3,7 @@ @@ -217,7 +217,7 @@ --> @@ -304,7 +304,7 @@ --> @@ -573,23 +573,23 @@ ## ^^^^^^ keyword.declaration.entity ## ^ punctuation.definition.entity - + ## ^ meta.tag.sgml.entity invalid.illegal.missing-tag-end -## ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.tag.sgml.entity -## ^ - meta.tag.sgml.entity +## ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.tag.sgml.entity +## ^ - meta.tag.sgml.entity ## ^^ punctuation.definition.tag.begin ## ^^^^^^ keyword.declaration.entity ## ^ punctuation.definition.entity -## ^^^^^^^^^^ variable.other.entity -## ^^^^^^ storage.type.external-content -## ^^^^^ meta.string string.quoted.double -## ^^^^^ meta.string string.quoted.double -## ^^^^^ storage.type.ndata -## ^^^^ meta.string string.unquoted -## ^ punctuation.definition.tag.end +## ^^^^^^^^^^^ variable.other.entity +## ^^^^^^ storage.type.external-content +## ^^^^^ meta.string string.quoted.double +## ^^^^^ meta.string string.quoted.double +## ^^^^^ storage.type.ndata +## ^^^^ meta.string string.unquoted +## ^ punctuation.definition.tag.end