From 8c7dc6c91de87d41460a404a0251b9372291a255 Mon Sep 17 00:00:00 2001 From: DeathAxe Date: Thu, 28 May 2020 17:56:14 +0200 Subject: [PATCH 1/4] [Erlang] Rename variable.other.field to variable.other.member --- Erlang/Erlang.sublime-syntax | 4 +-- Erlang/syntax_test_erlang.erl | 46 +++++++++++++++++------------------ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Erlang/Erlang.sublime-syntax b/Erlang/Erlang.sublime-syntax index 2a3676aad9..e542c30bc0 100644 --- a/Erlang/Erlang.sublime-syntax +++ b/Erlang/Erlang.sublime-syntax @@ -1245,13 +1245,13 @@ contexts: variable-other-field: - match: '{{atom_unquoted}}' - scope: meta.atom.erlang variable.other.field.erlang + scope: meta.atom.erlang variable.other.member.erlang pop: true - match: \' scope: punctuation.definition.atom.begin.erlang set: - meta_include_prototype: false - - meta_scope: meta.atom.erlang variable.other.field.erlang + - meta_scope: meta.atom.erlang variable.other.member.erlang - include: atom-quoted-common - include: macro-pop - include: atom-expect-end diff --git a/Erlang/syntax_test_erlang.erl b/Erlang/syntax_test_erlang.erl index 8e2cbe1214..6bbdadabc9 100644 --- a/Erlang/syntax_test_erlang.erl +++ b/Erlang/syntax_test_erlang.erl @@ -1618,7 +1618,7 @@ preprocessor_define_tests() -> . % ^ punctuation.section.arguments.begin.erlang % ^^^ variable.other.erlang % ^ punctuation.accessor.dot.erlang -% ^^^ variable.other.field.erlang +% ^^^ variable.other.member.erlang % ^ punctuation.separator.arguments.erlang % ^^^^ variable.other.erlang % ^ punctuation.separator.arguments.erlang @@ -1626,7 +1626,7 @@ preprocessor_define_tests() -> . % ^^ keyword.operator.lists.erlang % ^^^ variable.other.erlang % ^ punctuation.accessor.dot.erlang -% ^^^^^^^^^ variable.other.field.erlang +% ^^^^^^^^^ variable.other.member.erlang ). % <- punctuation.section.arguments.end.erlang %^ punctuation.terminator.clause.erlang @@ -3647,7 +3647,7 @@ preprocessor_record_tests() -> . % ^ punctuation.definition.record.erlang % ^^^^^^ variable.other.record.erlang % ^ punctuation.accessor.dot.erlang -% ^^^^^ variable.other.field.erlang +% ^^^^^ variable.other.member.erlang #record.Field % ^ - meta.record @@ -3670,7 +3670,7 @@ preprocessor_record_tests() -> . % ^^^^^^ variable.other.record.erlang % ^ punctuation.accessor.dot.erlang % ^ punctuation.definition.atom.begin.erlang -% ^^^^^^^^^^^^ variable.other.field.erlang +% ^^^^^^^^^^^^ variable.other.member.erlang % ^ punctuation.definition.atom.end.erlang #'atomic-record'.'field-name' @@ -3686,7 +3686,7 @@ preprocessor_record_tests() -> . % ^ punctuation.definition.atom.end.erlang % ^ punctuation.accessor.dot.erlang % ^ punctuation.definition.atom.begin.erlang -% ^^^^^^^^^^^^ variable.other.field.erlang +% ^^^^^^^^^^^^ variable.other.member.erlang % ^ punctuation.definition.atom.end.erlang #?MACRO.field @@ -3699,7 +3699,7 @@ preprocessor_record_tests() -> . % ^ punctuation.definition.macro.erlang % ^^^^^^ constant.other.macro.erlang % ^ punctuation.accessor.dot.erlang -% ^^^^^ variable.other.field.erlang +% ^^^^^ variable.other.member.erlang #?MACRO . field % ^ - meta.record @@ -3713,7 +3713,7 @@ preprocessor_record_tests() -> . % ^ - constant - punctuation - variable % ^ punctuation.accessor.dot.erlang % ^ - constant - punctuation - variable -% ^^^^^ variable.other.field.erlang +% ^^^^^ variable.other.member.erlang #?'MACRO'.field % ^ - meta.record @@ -3725,7 +3725,7 @@ preprocessor_record_tests() -> . % ^ punctuation.definition.macro.erlang % ^^^^^^^^ constant.other.macro.erlang % ^ punctuation.accessor.dot.erlang -% ^^^^^ variable.other.field.erlang +% ^^^^^ variable.other.member.erlang #?'MACRO' . field % ^ - meta.record @@ -3738,7 +3738,7 @@ preprocessor_record_tests() -> . % ^^^^^^^^ constant.other.macro.erlang % ^ - constant - punctuation - variable % ^ punctuation.accessor.dot.erlang -% ^^^^^ variable.other.field.erlang +% ^^^^^ variable.other.member.erlang #record.?field % ^ - meta.record @@ -3801,7 +3801,7 @@ local_record_definition_tests() -> . % ^ punctuation.definition.record.erlang % ^^^^^^ variable.other.record.erlang % ^ punctuation.section.fields.begin.erlang -% ^^^^^^ variable.other.field.erlang +% ^^^^^^ variable.other.member.erlang % ^ keyword.operator.assignment.erlang % ^^^^^^ string.quoted.double.erlang % ^ punctuation.separator.expressions.erlang @@ -3809,10 +3809,10 @@ local_record_definition_tests() -> . % ^ keyword.operator.assignment.erlang % ^ constant.numeric.integer.decimal.erlang % ^ punctuation.separator.expressions.erlang -% ^^^^^^ variable.other.field.erlang +% ^^^^^^ variable.other.member.erlang % ^ punctuation.separator.expressions.erlang % ^ punctuation.definition.atom.begin.erlang -% ^^^^^^^^^ variable.other.field.erlang +% ^^^^^^^^^ variable.other.member.erlang % ^ punctuation.definition.atom.end.erlang % ^ keyword.operator.assignment.erlang % ^ meta.sequence.tuple.erlang punctuation.section.sequence.begin.erlang @@ -3836,7 +3836,7 @@ local_record_definition_tests() -> . % ^ punctuation.section.fields.begin.erlang field1 = "val1" , %^^^^^^^^^^^^^^^^^^^^^^^^ meta.record.fields.erlang -% ^^^^^^ variable.other.field.erlang +% ^^^^^^ variable.other.member.erlang % ^ keyword.operator.assignment.erlang % ^^^^^^ string.quoted.double.erlang % ^ punctuation.separator.expressions.erlang @@ -3848,7 +3848,7 @@ local_record_definition_tests() -> . % ^ punctuation.separator.expressions.erlang field3 , %^^^^^^^^^^^^^^^ meta.record.fields.erlang -% ^^^^^^ variable.other.field.erlang +% ^^^^^^ variable.other.member.erlang % ^ punctuation.separator.expressions.erlang _ = atom %^^^^^^^^^^^^^^^^ meta.record.fields.erlang @@ -3875,7 +3875,7 @@ local_record_definition_tests() -> . % ^ punctuation.definition.atom.end.erlang % ^ punctuation.section.fields.begin.erlang % ^ punctuation.definition.atom.begin.erlang -% ^^^^^^^^^^ variable.other.field.erlang +% ^^^^^^^^^^ variable.other.member.erlang % ^ punctuation.definition.atom.end.erlang % ^ keyword.operator.assignment.erlang % ^ punctuation.definition.atom.begin.erlang @@ -3883,7 +3883,7 @@ local_record_definition_tests() -> . % ^ punctuation.definition.atom.end.erlang % ^ punctuation.separator.expressions.erlang % ^ punctuation.definition.atom.begin.erlang -% ^^^^^^^^^^ variable.other.field.erlang +% ^^^^^^^^^^ variable.other.member.erlang % ^ punctuation.definition.atom.end.erlang % ^ keyword.operator.assignment.erlang % ^ punctuation.definition.string.begin.erlang @@ -3904,7 +3904,7 @@ local_record_definition_tests() -> . 'field-name' % ^^^^^^^^^^^^^^ meta.record.fields.erlang meta.field.identifier.erlang % ^ punctuation.definition.atom.begin.erlang -% ^^^^^^^^^^^^ variable.other.field.erlang +% ^^^^^^^^^^^^ variable.other.member.erlang % ^ punctuation.definition.atom.end.erlang = % ^^^ meta.record.fields.erlang @@ -3924,7 +3924,7 @@ local_record_definition_tests() -> . 'Field-name' % ^^^^^^^^^^^^^^ meta.record.fields.erlang meta.field.identifier.erlang % ^ punctuation.definition.atom.begin.erlang -% ^^^^^^^^^^^ variable.other.field.erlang +% ^^^^^^^^^^^ variable.other.member.erlang % ^ punctuation.definition.atom.end.erlang = % ^^^ meta.record.fields.erlang @@ -3960,15 +3960,15 @@ local_record_definition_tests() -> . % ^ punctuation.definition.record.erlang % ^^^^^ variable.other.record.erlang % ^ punctuation.accessor.dot.erlang -% ^^^^^ variable.other.field.erlang +% ^^^^^ variable.other.member.erlang % ^ punctuation.definition.record.erlang % ^^^^^ variable.other.record.erlang % ^ punctuation.accessor.dot.erlang -% ^^^^^ variable.other.field.erlang +% ^^^^^ variable.other.member.erlang % ^ punctuation.definition.record.erlang % ^^^^^ variable.other.record.erlang % ^ punctuation.accessor.dot.erlang -% ^^^^ variable.other.field.erlang +% ^^^^ variable.other.member.erlang % ^ punctuation.separator.expressions.erlang N0n = N2#nrec2.nrec1#nrec1.nrec0#nrec0{name = "nested0a"}, @@ -3986,11 +3986,11 @@ local_record_definition_tests() -> . % ^ punctuation.definition.record.erlang % ^^^^^ variable.other.record.erlang % ^ punctuation.accessor.dot.erlang -% ^^^^^ variable.other.field.erlang +% ^^^^^ variable.other.member.erlang % ^ punctuation.definition.record.erlang % ^^^^^ variable.other.record.erlang % ^ punctuation.accessor.dot.erlang -% ^^^^^ variable.other.field.erlang +% ^^^^^ variable.other.member.erlang % ^ punctuation.definition.record.erlang % ^^^^^ variable.other.record.erlang % ^ punctuation.section.fields.begin.erlang From 783a4764a1f72c444d4285425b9519a1e0f10823 Mon Sep 17 00:00:00 2001 From: DeathAxe Date: Thu, 28 May 2020 18:04:54 +0200 Subject: [PATCH 2/4] [Erlang] Rename entity.name.field to variable.other.member In Java, field declarations are scoped as variable.other.member as well. --- Erlang/Erlang.sublime-syntax | 12 +----------- Erlang/syntax_test_erlang.erl | 14 +++++++------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/Erlang/Erlang.sublime-syntax b/Erlang/Erlang.sublime-syntax index e542c30bc0..80911bdcd8 100644 --- a/Erlang/Erlang.sublime-syntax +++ b/Erlang/Erlang.sublime-syntax @@ -579,17 +579,7 @@ contexts: - - meta_content_scope: meta.field.identifier.erlang - include: immediatelly-pop - - include: variable-anonymous-pop - - match: '{{atom_unquoted}}' - scope: meta.atom.erlang entity.name.field.erlang - pop: true - - match: \' - scope: punctuation.definition.atom.begin.erlang - set: - - meta_include_prototype: false - - meta_scope: meta.atom.erlang entity.name.field.erlang - - include: atom-quoted-common - - include: macro-pop - - include: atom-expect-end + - include: variable-other-field - include: else-pop ###[ PREPROCESSOR SPEC ]###################################################### diff --git a/Erlang/syntax_test_erlang.erl b/Erlang/syntax_test_erlang.erl index 6bbdadabc9..f647aaeaa7 100644 --- a/Erlang/syntax_test_erlang.erl +++ b/Erlang/syntax_test_erlang.erl @@ -3520,7 +3520,7 @@ preprocessor_record_tests() -> . % ^^^^ entity.name.record.erlang % ^ punctuation.separator.arguments.erlang % ^ punctuation.section.fields.begin.erlang -% ^^^^^^ entity.name.field.erlang +% ^^^^^^ variable.other.member.erlang % ^ keyword.operator.assignment.erlang % ^^^^^^ string.quoted.double.erlang % ^ punctuation.separator.expressions.erlang @@ -3534,10 +3534,10 @@ preprocessor_record_tests() -> . % ^ punctuation.separator.sequence.erlang % ^^^^ variable.other.erlang % ^ punctuation.separator.expressions.erlang -% ^^^^^^ entity.name.field.erlang +% ^^^^^^ variable.other.member.erlang % ^ punctuation.separator.expressions.erlang % ^ punctuation.definition.atom.begin.erlang -% ^^^^^^^^^ entity.name.field.erlang +% ^^^^^^^^^ variable.other.member.erlang % ^ punctuation.definition.atom.end.erlang % ^ keyword.operator.assignment.erlang % ^ meta.sequence.tuple.erlang punctuation.section.sequence.begin.erlang @@ -3568,7 +3568,7 @@ preprocessor_record_tests() -> . { % ^ punctuation.section.fields.begin.erlang field1 -% ^^^^^^ entity.name.field.erlang +% ^^^^^^ variable.other.member.erlang = % ^ keyword.operator.assignment.erlang "val1" @@ -3588,11 +3588,11 @@ preprocessor_record_tests() -> . % ^^^^ variable.other.erlang % ^ punctuation.separator.expressions.erlang field3, -% ^^^^^^ entity.name.field.erlang +% ^^^^^^ variable.other.member.erlang % ^ punctuation.separator.expressions.erlang 'Field-4' % ^ punctuation.definition.atom.begin.erlang -% ^^^^^^^^^ entity.name.field.erlang +% ^^^^^^^^^ variable.other.member.erlang % ^ punctuation.definition.atom.end.erlang = % ^ keyword.operator.assignment.erlang @@ -3603,7 +3603,7 @@ preprocessor_record_tests() -> . , % ^ punctuation.separator.expressions.erlang field5 :: tuple() , -% ^^^^^^ entity.name.field.erlang +% ^^^^^^ variable.other.member.erlang % ^^ punctuation.separator.variable-type.erlang % ^^^^^ support.type.erlang % ^ punctuation.section.arguments.begin.erlang From fb01ed84402ba8222fa42069ceb1727f7faed4f6 Mon Sep 17 00:00:00 2001 From: DeathAxe Date: Thu, 28 May 2020 18:17:59 +0200 Subject: [PATCH 3/4] [Erlang] Rename variables to variable.other.readwrite The `readwrite` should make clear variables beginning with capital letters are meant for reading and writing values, while lower case atoms are constants. --- Erlang/Erlang.sublime-syntax | 6 +- Erlang/syntax_test_erlang.erl | 238 +++++++++++++++++----------------- 2 files changed, 122 insertions(+), 122 deletions(-) diff --git a/Erlang/Erlang.sublime-syntax b/Erlang/Erlang.sublime-syntax index 80911bdcd8..6e1db108cd 100644 --- a/Erlang/Erlang.sublime-syntax +++ b/Erlang/Erlang.sublime-syntax @@ -1169,7 +1169,7 @@ contexts: push: [record-fields, record-name, variable-other-record] # records may look like normal variables in macro definitions - match: '{{variable}}(?=\.{{ident}})' - scope: meta.record.identifier.erlang variable.other.erlang + scope: meta.record.identifier.erlang variable.other.readwrite.erlang push: record-fields record-name: @@ -1438,11 +1438,11 @@ contexts: variable-other: - match: '{{variable}}' - scope: variable.other.erlang + scope: variable.other.readwrite.erlang variable-other-pop: - match: '{{variable}}' - scope: variable.other.erlang + scope: variable.other.readwrite.erlang pop: true variable-parameter: diff --git a/Erlang/syntax_test_erlang.erl b/Erlang/syntax_test_erlang.erl index f647aaeaa7..16e989d773 100644 --- a/Erlang/syntax_test_erlang.erl +++ b/Erlang/syntax_test_erlang.erl @@ -132,7 +132,7 @@ binary_tests() -> . <> % ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.sequence.binary.erlang % ^^ punctuation.definition.sequence.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.separator.value-size.erlang % ^ constant.numeric.integer.decimal.erlang % ^ punctuation.separator.value-type.erlang @@ -148,7 +148,7 @@ binary_tests() -> . << A : 8 / unsigned - unit : 1 - integer >> % ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.sequence.binary.erlang % ^^ punctuation.definition.sequence.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.separator.value-size.erlang % ^ constant.numeric.integer.decimal.erlang % ^ punctuation.separator.value-type.erlang @@ -164,7 +164,7 @@ binary_tests() -> . << A : ?size / ?sign - ?unit : ?value - ?type >> % ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.sequence.binary.erlang % ^^ punctuation.definition.sequence.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.separator.value-size.erlang % ^^^^^ constant.other.macro.erlang % ^ punctuation.separator.value-type.erlang @@ -222,14 +222,14 @@ binary_tests() -> . % ^^ punctuation.definition.sequence.begin.erlang % ^^ punctuation.definition.sequence.begin.erlang % ^ punctuation.section.group.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ keyword.operator.arithmetic.erlang % ^ constant.numeric.integer.decimal.erlang % ^ punctuation.section.group.end.erlang % ^^ punctuation.definition.sequence.end.erlang % ^^ keyword.operator.comprehension.erlang % ^^ punctuation.definition.sequence.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^^ punctuation.definition.sequence.end.erlang % ^^ keyword.operator.generator.erlang % ^^ punctuation.definition.sequence.begin.erlang @@ -452,11 +452,11 @@ list_tests() -> . % ^ meta.sequence.list.erlang - meta.sequence.list.erlang meta.sequence.list.erlang % ^ - meta.sequence % ^ punctuation.section.sequence.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ keyword.operator.arithmetic.erlang % ^ constant.numeric.integer.decimal.erlang % ^^ keyword.operator.comprehension.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^^ keyword.operator.generator.erlang % ^ punctuation.section.sequence.begin.erlang % ^ constant.numeric.integer.decimal.erlang @@ -535,7 +535,7 @@ map_tests() -> . % ^^^^^ meta.mapping.value.erlang meta.atom.erlang % ^ meta.mapping.erlang - meta.atom % ^ - meta.mapping -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^^ punctuation.section.mapping.begin.erlang % ^^^^ constant.other.symbol.erlang % ^^ punctuation.separator.mapping.key-value.erlang @@ -1028,19 +1028,19 @@ tuple_tests() -> . variables_tests() -> . Foo -% ^^^ variable.other.erlang +% ^^^ variable.other.readwrite.erlang _foo -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang _Foo@bar_baz -% ^^^^^^^^^^^^ variable.other.erlang +% ^^^^^^^^^^^^ variable.other.readwrite.erlang _Foo -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang _@ -% ^^ variable.other.erlang +% ^^ variable.other.readwrite.erlang __ -% ^^ variable.other.erlang +% ^^ variable.other.readwrite.erlang _1 -% ^^ variable.other.erlang +% ^^ variable.other.readwrite.erlang _ % ^ variable.language.anonymous.erlang _+ @@ -1087,7 +1087,7 @@ operator_tests() -> . % ^^ keyword.operator.logical.erlang X <- [1,2,3] -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^^ keyword.operator.generator.erlang % ^ punctuation.section.sequence.begin.erlang % ^^^^^^^ meta.sequence.list.erlang @@ -1101,7 +1101,7 @@ operator_tests() -> . <> <= << 1,2,3 >> % ^^ punctuation.definition.sequence.begin.erlang % ^^^^^ meta.sequence.binary.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^^ punctuation.definition.sequence.end.erlang % ^^ keyword.operator.generator.erlang % ^^ punctuation.definition.sequence.begin.erlang @@ -1120,7 +1120,7 @@ operator_tests() -> . % ^ punctuation.separator.expressions.erlang % ^ constant.numeric.integer.decimal.erlang % ^ punctuation.separator.expressions.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang a := b % ^ meta.atom.erlang constant.other.symbol.erlang @@ -1566,11 +1566,11 @@ preprocessor_define_tests() -> . % ^ punctuation.section.sequence.begin.erlang % ^ constant.other.symbol.erlang % ^ punctuation.separator.sequence.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.separator.sequence.erlang % ^ constant.other.symbol.erlang % ^ punctuation.separator.sequence.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.sequence.end.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.terminator.clause.erlang @@ -1598,7 +1598,7 @@ preprocessor_define_tests() -> . % ^ punctuation.definition.atom.begin.erlang % ^ punctuation.definition.atom.end.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ keyword.operator.arithmetic.erlang % ^^^^^^ constant.other.symbol.erlang @@ -1616,15 +1616,15 @@ preprocessor_define_tests() -> . % ^ meta.path.erlang punctuation.accessor.double-colon.erlang % ^^^^^ meta.path.erlang meta.function-call.identifier.erlang support.function.erlang % ^ punctuation.section.arguments.begin.erlang -% ^^^ variable.other.erlang +% ^^^ variable.other.readwrite.erlang % ^ punctuation.accessor.dot.erlang % ^^^ variable.other.member.erlang % ^ punctuation.separator.arguments.erlang -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ punctuation.separator.arguments.erlang -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^^ keyword.operator.lists.erlang -% ^^^ variable.other.erlang +% ^^^ variable.other.readwrite.erlang % ^ punctuation.accessor.dot.erlang % ^^^^^^^^^ variable.other.member.erlang ). @@ -1653,9 +1653,9 @@ preprocessor_define_tests() -> . % ^^^^^^^^^^^^^^^^^ constant.other.symbol.erlang % ^ punctuation.definition.atom.end.erlang % ^ punctuation.separator.patterns.erlang -% ^^^^^^^^^^ variable.other.erlang +% ^^^^^^^^^^ variable.other.readwrite.erlang % ^^ punctuation.separator.clause-head-body.erlang -% ^^^^^^^^^^ variable.other.erlang +% ^^^^^^^^^^ variable.other.readwrite.erlang % ^^^ keyword.control.exception.end.erlang % @@ -1757,7 +1757,7 @@ preprocessor_export_tests() -> . % ^ punctuation.separator.reference.erlang % ^ invalid.illegal.expect-integer.erlang % ^ punctuation.separator.sequence.erlang -% ^^^^^^ variable.other.erlang +% ^^^^^^ variable.other.readwrite.erlang % ^ punctuation.separator.reference.erlang % ^ constant.numeric.integer.decimal.erlang % ^ punctuation.separator.sequence.erlang @@ -1853,7 +1853,7 @@ preprocessor_export_tests() -> . % ^ punctuation.separator.reference.erlang % ^ invalid.illegal.expect-integer.erlang % ^ punctuation.separator.sequence.erlang -% ^^^^^^ variable.other.erlang +% ^^^^^^ variable.other.readwrite.erlang % ^ punctuation.separator.reference.erlang % ^ constant.numeric.integer.decimal.erlang % ^ punctuation.separator.sequence.erlang @@ -2024,7 +2024,7 @@ preprocessor_import_tests() -> . % ^ punctuation.separator.reference.erlang % ^ invalid.illegal.expect-integer.erlang % ^ punctuation.separator.sequence.erlang -% ^^^^^^ variable.other.erlang +% ^^^^^^ variable.other.readwrite.erlang % ^ punctuation.separator.reference.erlang % ^ constant.numeric.integer.decimal.erlang % ^ punctuation.separator.sequence.erlang @@ -2071,7 +2071,7 @@ preprocessor_import_tests() -> . % ^ punctuation.separator.reference.erlang % ^ invalid.illegal.expect-integer.erlang % ^ punctuation.separator.sequence.erlang -% ^^^^^^ variable.other.erlang +% ^^^^^^ variable.other.readwrite.erlang % ^ punctuation.separator.reference.erlang % ^ constant.numeric.integer.decimal.erlang % ^ punctuation.separator.sequence.erlang @@ -2480,7 +2480,7 @@ preprocessor_other_tests() -> . % ^^^^^^^^^^^^^^^^^^^^^^^^ meta.preprocessor.attribute.erlang - meta.preprocessor.attribute.arguments.erlang % ^ punctuation.definition.keyword.erlang - keyword % ^^^^^ keyword.control.directive.attribute.erlang -% ^^^ variable.other.erlang +% ^^^ variable.other.readwrite.erlang % ^ keyword.operator.arithmetic.erlang % ^^^ constant.other.symbol.erlang % ^ punctuation.separator.expressions.erlang @@ -2496,7 +2496,7 @@ preprocessor_other_tests() -> . % ^ punctuation.definition.atom.begin.erlang % ^^^^^^^^^^ keyword.control.directive.attribute.erlang % ^ punctuation.definition.atom.end.erlang -% ^^^ variable.other.erlang +% ^^^ variable.other.readwrite.erlang % ^ keyword.operator.arithmetic.erlang % ^^^ constant.other.symbol.erlang % ^ punctuation.terminator.clause.erlang @@ -2588,7 +2588,7 @@ preprocessor_spec_tests() -> . % ^^^^^^^^^^ source.erlang meta.preprocessor.spec.guards.erlang - meta.preprocessor.spec.erlang - meta.preprocessor.spec.parameters - meta.preprocessor.spec.return-type % ^ source.erlang meta.preprocessor.spec.erlang - meta.preprocessor.spec.parameters - meta.preprocessor.spec.guards - meta.preprocessor.spec.return-type % ^^^^ keyword.control.conditional.when.erlang -% ^^^^^ variable.other.erlang +% ^^^^^ variable.other.readwrite.erlang % ^ punctuation.terminator.clause.erlang -spec foo(Pid) -> boolean() when Pid :: pid() | if() [term(), .... @@ -2610,7 +2610,7 @@ preprocessor_spec_tests() -> . % ^ punctuation.section.arguments.begin.erlang % ^ punctuation.section.arguments.end.erlang % ^^^^ keyword.control.conditional.when.erlang -% ^^^ variable.other.erlang +% ^^^ variable.other.readwrite.erlang % ^^ punctuation.separator.variable-type.erlang % ^^^ support.type.erlang % ^ punctuation.section.arguments.begin.erlang @@ -2804,14 +2804,14 @@ preprocessor_spec_tests() -> . % ^^^^^^^^^^^^^^^^^^ source.erlang meta.preprocessor.spec.guards.erlang % ^^^^^^ meta.type-call.identifier.erlang - meta.type-call.arguments.erlang % ^^ meta.type-call.arguments.erlang -% ^^^ variable.other.erlang +% ^^^ variable.other.readwrite.erlang % ^^ punctuation.separator.variable-type.erlang % ^^^^^^ support.type.erlang % ^ punctuation.separator.expressions.erlang Tracee :: 2..36. % ^^^^^^^^^^^^^^^^ source.erlang meta.preprocessor.spec.guards.erlang % ^ source.erlang meta.preprocessor.spec.erlang - meta.function -% ^^^^^^ variable.other.erlang +% ^^^^^^ variable.other.readwrite.erlang % ^^ punctuation.separator.variable-type.erlang % ^ constant.numeric.integer.decimal.erlang % ^^ punctuation.separator.range.erlang @@ -3076,7 +3076,7 @@ preprocessor_type_tests() -> . % ^ punctuation.section.arguments.begin.erlang % ^ punctuation.section.arguments.end.erlang % ^^ punctuation.separator.mapping.key-value.erlang -% ^^^ variable.other.erlang +% ^^^ variable.other.readwrite.erlang % ^ punctuation.section.mapping.end.erlang % ^ punctuation.terminator.clause.erlang @@ -3168,7 +3168,7 @@ preprocessor_type_tests() -> . % ^^ meta.sequence.list.erlang - meta.sequence.tuple.erlang % ^ - meta.type - meta.sequence % ^ punctuation.section.sequence.begin.erlang -% ^^^^^^^^ variable.other.erlang +% ^^^^^^^^ variable.other.readwrite.erlang % ^ punctuation.separator.sequence.erlang % ^^^^^^ support.namespace.erlang % ^ punctuation.accessor.double-colon.erlang @@ -3183,7 +3183,7 @@ preprocessor_type_tests() -> . % ^ punctuation.section.arguments.begin.erlang % ^^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.sequence.erlang -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ punctuation.section.sequence.end.erlang % ^ punctuation.section.sequence.end.erlang % ^ punctuation.terminator.clause.erlang @@ -3293,7 +3293,7 @@ preprocessor_fun_type_tests() -> . % ^ punctuation.section.arguments.end.erlang % ^ punctuation.section.parameters.end.erlang % ^^ punctuation.separator.parameters-return-type.erlang -% ^^^^^^ variable.other.erlang +% ^^^^^^ variable.other.readwrite.erlang % ^^ punctuation.separator.variable-type.erlang % ^^^^ storage.type.erlang % ^ punctuation.section.arguments.begin.erlang @@ -3532,7 +3532,7 @@ preprocessor_record_tests() -> . % ^ punctuation.section.arguments.begin.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.sequence.erlang -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ punctuation.separator.expressions.erlang % ^^^^^^ variable.other.member.erlang % ^ punctuation.separator.expressions.erlang @@ -3585,7 +3585,7 @@ preprocessor_record_tests() -> . % ^ punctuation.section.arguments.begin.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.sequence.erlang -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ punctuation.separator.expressions.erlang field3, % ^^^^^^ variable.other.member.erlang @@ -3861,7 +3861,7 @@ local_record_definition_tests() -> . % ^ - meta.record Expr#'record-name'{'field-name'='value-name','Field-name'="string"} -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^^^^^^^^^^^^^^ meta.record.identifier.erlang - meta.record.fields % ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.record.fields.erlang - meta.record.identifier % ^^^^^^^^^^^^ meta.field.identifier.erlang - meta.field.erlang - meta.field.value.erlang @@ -3892,9 +3892,9 @@ local_record_definition_tests() -> . % ^ punctuation.section.fields.end.erlang Expr#'record-name'{ -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^^^^^^^^^^^^^^ meta.record.identifier.erlang - meta.record.fields -% ^^ meta.record.fields.erlang - meta.record.identifier +% ^^ meta.record.fields.erlang - meta.record.name % ^ punctuation.definition.record.erlang % ^ punctuation.definition.atom.begin.erlang % ^^^^^^^^^^^^^ variable.other.record.erlang @@ -3956,7 +3956,7 @@ local_record_definition_tests() -> . % ^^^^^^ meta.record.identifier.erlang % ^ meta.record.erlang % ^^^^ meta.record.field.erlang -% ^^ variable.other.erlang +% ^^ variable.other.readwrite.erlang % ^ punctuation.definition.record.erlang % ^^^^^ variable.other.record.erlang % ^ punctuation.accessor.dot.erlang @@ -3982,7 +3982,7 @@ local_record_definition_tests() -> . % ^^^^^^ meta.record.identifier.erlang % ^^^^^^^^^^^^^^^^^^^ meta.record.fields.erlang % ^ - meta.record -% ^^ variable.other.erlang +% ^^ variable.other.readwrite.erlang % ^ punctuation.definition.record.erlang % ^^^^^ variable.other.record.erlang % ^ punctuation.accessor.dot.erlang @@ -4208,7 +4208,7 @@ func_name(Mod, Name, _, {Enc,Depth}, <>) -> % ^^^^^^^^^^^ meta.sequence.list % ^ meta.function-call.arguments.erlang - meta.function-call.identifier.erlang - meta.function-call.arguments.erlang meta.function-call.arguments.erlang % ^ - meta.function-call -% ^^^^^^^^^^ variable.other.erlang +% ^^^^^^^^^^ variable.other.readwrite.erlang % ^ keyword.operator.assignment.erlang % ^^^^^ variable.namespace.erlang % ^ punctuation.accessor.double-colon.erlang @@ -4243,9 +4243,9 @@ func_name(Mod, Name, _, {Enc,Depth}, <>) -> % ^ string.quoted.double.erlang punctuation.definition.string.end.erlang - constant.other.placeholder % ^ punctuation.separator.arguments.erlang % ^ punctuation.section.sequence.begin.erlang -% ^^^ variable.other.erlang - punctuation +% ^^^ variable.other.readwrite.erlang - punctuation % ^ punctuation.separator.sequence.erlang - variable -% ^^^^^^^^^^ variable.other.erlang - punctuation +% ^^^^^^^^^^ variable.other.readwrite.erlang - punctuation % ^ punctuation.section.sequence.end.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.terminator.clause.erlang @@ -4273,7 +4273,7 @@ func_name(Mod, Name, _, {Enc,Depth}, <>) -> % ^ variable.parameter.erlang % ^ punctuation.section.parameters.end.erlang % ^^^^ keyword.control.conditional.when.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ keyword.operator.logical.erlang % ^ constant.numeric.integer.decimal.erlang % ^^ punctuation.separator.clause-head-body.erlang @@ -4331,7 +4331,7 @@ case_tests() -> % ^ - meta.case % ^^^^^^^^^ meta.case.erlang % ^^^^ keyword.control.conditional.case.erlang -% ^^^ variable.other.erlang +% ^^^ variable.other.readwrite.erlang {ok, time} when is_tuple(); Bar /= false -> % ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.case.erlang % ^^^^^^^^^^ meta.sequence.tuple.erlang @@ -4343,7 +4343,7 @@ case_tests() -> % ^ punctuation.section.arguments.begin.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.clauses.erlang -% ^^^ variable.other.erlang +% ^^^ variable.other.readwrite.erlang % ^^ keyword.operator.logical.erlang % ^^^^^ constant.language.boolean.erlang % ^^ punctuation.separator.clause-head-body.erlang @@ -4400,7 +4400,7 @@ if_tests() -> % ^ punctuation.section.arguments.begin.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.clauses.erlang -% ^^^ variable.other.erlang +% ^^^ variable.other.readwrite.erlang % ^^ keyword.operator.logical.erlang % ^^^^^ constant.language.boolean.erlang % ^^ punctuation.separator.clause-head-body.erlang @@ -4444,7 +4444,7 @@ function_call_tests() -> % ^ punctuation.accessor.double-colon.erlang % ^^^ variable.function.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4459,7 +4459,7 @@ function_call_tests() -> % ^ punctuation.accessor.double-colon.erlang % ^^^ support.function.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4474,7 +4474,7 @@ function_call_tests() -> % ^^^ support.function.erlang % ^ - constant - support - variable % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4487,7 +4487,7 @@ function_call_tests() -> % ^ punctuation.accessor.double-colon.erlang % ^^^ support.function.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4500,7 +4500,7 @@ function_call_tests() -> % ^ punctuation.accessor.double-colon.erlang % ^^^ support.function.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4515,7 +4515,7 @@ function_call_tests() -> % ^^^ support.function.erlang % ^ - constant - support - variable % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4524,11 +4524,11 @@ function_call_tests() -> % ^^^ meta.path.erlang meta.function-call.identifier.erlang % ^^^ meta.function-call.arguments.erlang - meta.path % ^ - meta.path - meta.function-call -% ^^^^^^ variable.other.erlang +% ^^^^^^ variable.other.readwrite.erlang % ^ punctuation.accessor.double-colon.erlang % ^^^ support.function.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4542,7 +4542,7 @@ function_call_tests() -> % ^ punctuation.accessor.double-colon.erlang % ^^^ support.function.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4556,7 +4556,7 @@ function_call_tests() -> % ^ punctuation.accessor.double-colon.erlang % ^^^ support.function.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4573,7 +4573,7 @@ function_call_tests() -> % ^ punctuation.accessor.double-colon.erlang % ^^^ support.function.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4586,7 +4586,7 @@ function_call_tests() -> % ^ - meta.function-call - meta.path % ^^^ support.function.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4598,7 +4598,7 @@ function_call_tests() -> % ^^^ support.function.erlang % ^ - constant - support - variable % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4609,7 +4609,7 @@ function_call_tests() -> % ^ - meta.function-call - meta.path % ^^^^ variable.function.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4620,7 +4620,7 @@ function_call_tests() -> % ^ - meta.function-call - meta.path % ^^^^^^^ variable.function.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4631,7 +4631,7 @@ function_call_tests() -> % ^ - meta.function-call % ^^^^^^^ variable.function.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4644,7 +4644,7 @@ function_call_tests() -> % ^ - meta.function-call - meta.path % ^^^^^^^ variable.function.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4656,7 +4656,7 @@ function_call_tests() -> % ^^^^^^^^^ variable.function.erlang % ^ - constant - support - variable % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4669,7 +4669,7 @@ function_call_tests() -> % ^ - meta.function-call % ^^^^^^^^^^ variable.function.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4681,7 +4681,7 @@ function_call_tests() -> % ^^^^^^^^^^^^ variable.function.erlang % ^ - constant - support - variable % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4695,7 +4695,7 @@ function_call_tests() -> % ^ punctuation.definition.macro.erlang % ^^^^^ constant.other.macro.erlang - support.function % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4708,7 +4708,7 @@ function_call_tests() -> % ^^^^ constant.other.macro.erlang - support.function % ^ - constant - support - variable % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4722,7 +4722,7 @@ function_call_tests() -> % ^ punctuation.definition.atom.begin.erlang % ^ punctuation.definition.atom.end.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4737,7 +4737,7 @@ function_call_tests() -> % ^ punctuation.definition.atom.end.erlang % ^ - constant - support - variable % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4751,7 +4751,7 @@ function_call_tests() -> % ^ punctuation.definition.atom.begin.erlang % ^ punctuation.definition.atom.end.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4763,7 +4763,7 @@ function_call_tests() -> % ^^^^^^^^^^ constant.other.macro.erlang - support.function % ^ - constant - support - variable % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4774,7 +4774,7 @@ function_call_tests() -> % ^ - meta.function-call - meta.path % ^^^^^^^^^^^ constant.other.macro.erlang - support.function % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4786,7 +4786,7 @@ function_call_tests() -> % ^^^^^^^^^^^^^ constant.other.macro.erlang - support.function % ^ - constant - support - variable % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4804,7 +4804,7 @@ function_call_tests() -> % ^ punctuation.definition.atom.end.erlang % ^ punctuation.definition.macro.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^ punctuation.separator.expressions.erlang @@ -4823,9 +4823,9 @@ function_call_tests() -> % ^^^^^^^^^^^^^^ constant.language.macro.erlang % ^ - constant - support - variable % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.separator.arguments.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % fun expression tests @@ -4857,7 +4857,7 @@ fun_expression_tests() -> % ^^^^ meta.function.erlang meta.fun.erlang - meta.path % ^^^^^^^^^^^^ meta.function.erlang meta.fun.erlang meta.path.erlang % ^ - meta.fun.erlang -% ^^^ variable.other.erlang +% ^^^ variable.other.readwrite.erlang % ^ keyword.operator.assignment.erlang % ^^^ keyword.declaration.function.erlang % ^^^^^^ support.namespace.erlang @@ -4871,7 +4871,7 @@ fun_expression_tests() -> % ^^^^ meta.function.erlang meta.fun.erlang - meta.path % ^^^^^^^^^^^^ meta.function.erlang meta.fun.erlang meta.path.erlang % ^ - meta.fun.erlang -% ^^^ variable.other.erlang +% ^^^ variable.other.readwrite.erlang % ^ keyword.operator.assignment.erlang % ^^^ keyword.declaration.function.erlang % ^^^^^^ variable.namespace.erlang @@ -4885,7 +4885,7 @@ fun_expression_tests() -> % ^ - meta.fun.erlang % ^^^^^^^^^ meta.function.erlang meta.fun.erlang - meta.path % ^ - meta.fun.erlang -% ^^^ variable.other.erlang +% ^^^ variable.other.readwrite.erlang % ^ keyword.operator.assignment.erlang % ^^^ keyword.declaration.function.erlang % ^^^ support.function.erlang @@ -4896,7 +4896,7 @@ fun_expression_tests() -> % ^ - meta.fun % ^^^^^^^^^^^ meta.function.erlang meta.fun.erlang - meta.fun.identifier - meta.path % ^ - meta.fun -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ keyword.operator.assignment.erlang % ^^^ keyword.declaration.function.erlang % ^^^^ variable.function.erlang @@ -4909,7 +4909,7 @@ fun_expression_tests() -> % ^^^^ meta.function.erlang meta.fun.erlang - meta.path % ^^^^^^^^^^^^^^^ meta.function.erlang meta.fun.erlang meta.path.erlang % ^ - meta.fun -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ keyword.operator.assignment.erlang % ^^^ keyword.declaration.function.erlang % ^ punctuation.definition.macro.erlang @@ -4925,7 +4925,7 @@ fun_expression_tests() -> % ^^^^ meta.function.erlang meta.fun.erlang - meta.path % ^^^^^^^^^^^^^^^^^ meta.function.erlang meta.fun.erlang meta.path.erlang % ^ - meta.fun -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ keyword.operator.assignment.erlang % ^^^ keyword.declaration.function.erlang % ^ punctuation.definition.macro.erlang @@ -4942,14 +4942,14 @@ fun_expression_tests() -> % ^^^^ meta.function.erlang meta.fun.erlang - meta.path % ^^^^^^^^^^^^^^^ meta.function.erlang meta.fun.erlang meta.path.erlang % ^ - meta.fun -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ keyword.operator.assignment.erlang % ^^^ keyword.declaration.function.erlang % ^^^^^^ variable.namespace.erlang % ^ punctuation.accessor.double-colon.erlang % ^^^^ variable.function.erlang % ^ punctuation.separator.reference.erlang -% ^^^ variable.other.erlang +% ^^^ variable.other.readwrite.erlang % ^ punctuation.separator.expressions.erlang Fun1 = fun 'my-module':name/10, @@ -4957,7 +4957,7 @@ fun_expression_tests() -> % ^^^^ meta.function.erlang meta.fun.erlang - meta.path % ^^^^^^^^^^^^^^^^^^^ meta.function.erlang meta.fun.erlang meta.path.erlang % ^ - meta.fun -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ keyword.operator.assignment.erlang % ^^^ keyword.declaration.function.erlang % ^ punctuation.definition.atom.begin.erlang @@ -4974,7 +4974,7 @@ fun_expression_tests() -> % ^^^^ meta.function.erlang meta.fun.erlang - meta.path % ^^^^^^^^^^^^^^^^^^^ meta.function.erlang meta.fun.erlang meta.path.erlang % ^ - meta.fun -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ keyword.operator.assignment.erlang % ^^^ keyword.declaration.function.erlang % ^ punctuation.definition.atom.begin.erlang @@ -4992,7 +4992,7 @@ fun_expression_tests() -> % ^^^^ meta.function.erlang meta.fun.erlang - meta.path % ^^^^^^^^^^^^^^^^^^^^^^^^ meta.function.erlang meta.fun.erlang meta.path.erlang % ^ - meta.fun -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ keyword.operator.assignment.erlang % ^^^ keyword.declaration.function.erlang % ^ punctuation.definition.atom.begin.erlang @@ -5020,26 +5020,26 @@ fun_expression_tests() -> % ^^^^^^^^^^^^^^^ meta.function.erlang meta.fun.erlang - meta.fun meta.fun % ^^^^^^^^^ meta.function-call % ^ - meta.fun -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ keyword.operator.assignment.erlang % ^^^ keyword.declaration.function.erlang % ^^^ invalid.illegal.expect-variable.erlang % ^ punctuation.section.parameters.begin.erlang % ^ punctuation.section.parameters.end.erlang % ^^ punctuation.separator.clause-head-body.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ keyword.operator.assignment.erlang % ^^^ keyword.declaration.function.erlang % ^ punctuation.section.parameters.begin.erlang % ^ variable.parameter.erlang % ^ punctuation.section.parameters.end.erlang % ^^ punctuation.separator.clause-head-body.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ keyword.operator.arithmetic.erlang % ^ constant.numeric.integer.decimal.erlang % ^^^ keyword.declaration.end.erlang % ^ punctuation.separator.expressions.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.begin.erlang % ^^^ support.function.erlang % ^^^ keyword.declaration.end.erlang @@ -5055,14 +5055,14 @@ fun_expression_tests() -> % ^^^ meta.function.erlang meta.fun.parameters.erlang - meta.fun.erlang - meta.fun.identifier % ^^^^^^^^^^ meta.function.erlang meta.fun.erlang - meta.fun.identifier - meta.fun.parameters % ^ - meta.fun -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ keyword.operator.assignment.erlang % ^^^ keyword.declaration.function.erlang % ^ punctuation.section.parameters.begin.erlang % ^ variable.parameter.erlang % ^ punctuation.section.parameters.end.erlang % ^^^^ keyword.control.conditional.when.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^^ keyword.operator.logical.erlang % ^ constant.numeric.integer.decimal.erlang % ^^ punctuation.separator.clause-head-body.erlang @@ -5088,30 +5088,30 @@ fun_expression_tests() -> % ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function.erlang meta.fun.erlang - meta.fun.identifier - meta.fun.parameters % ^^^^^^^^^^^ meta.function-call % ^ - meta.fun -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ keyword.operator.assignment.erlang % ^^^ keyword.declaration.function.erlang -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ punctuation.section.parameters.begin.erlang % ^ constant.numeric.integer.decimal.erlang % ^ punctuation.section.parameters.end.erlang % ^^ punctuation.separator.clause-head-body.erlang % ^ constant.numeric.integer.decimal.erlang % ^ punctuation.separator.clauses.erlang -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ punctuation.section.parameters.begin.erlang % ^ variable.parameter.erlang % ^ punctuation.section.parameters.end.erlang % ^^^^ keyword.control.conditional.when.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ keyword.operator.logical.erlang % ^ constant.numeric.integer.decimal.erlang % ^^ punctuation.separator.clause-head-body.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ keyword.operator.arithmetic.erlang -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ keyword.operator.arithmetic.erlang % ^ constant.numeric.integer.decimal.erlang % ^ punctuation.section.arguments.end.erlang @@ -5121,7 +5121,7 @@ fun_expression_tests() -> Fun1 = fun % ^ - meta.fun % ^^^^ meta.function.erlang meta.fun.erlang -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ keyword.operator.assignment.erlang % ^^^ keyword.declaration.function.erlang (A, B) when A == true; is_tuple(B) -> @@ -5134,19 +5134,19 @@ fun_expression_tests() -> % ^ variable.parameter.erlang % ^ punctuation.section.parameters.end.erlang % ^^^^ keyword.control.conditional.when.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^^ keyword.operator.logical.erlang % ^^^^ constant.language.boolean.erlang % ^ punctuation.separator.clauses.erlang % ^^^^^^^^ support.function.erlang % ^ punctuation.section.arguments.begin.erlang -% ^ variable.other.erlang +% ^ variable.other.readwrite.erlang % ^ punctuation.section.arguments.end.erlang % ^^ punctuation.separator.clause-head-body.erlang Test = 40; % ^^^^^^^^^ meta.function.erlang meta.fun.erlang % ^ meta.function.erlang meta.fun.erlang -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ keyword.operator.assignment.erlang % ^^ constant.numeric.integer.decimal.erlang % ^ punctuation.separator.clauses.erlang @@ -5168,7 +5168,7 @@ fun_expression_tests() -> Test = 50; % ^^^^^^^^^^ meta.function.erlang meta.fun.erlang % ^ meta.function.erlang meta.fun.erlang -% ^^^^ variable.other.erlang +% ^^^^ variable.other.readwrite.erlang % ^ keyword.operator.assignment.erlang % ^^ constant.numeric.integer.decimal.erlang % ^ punctuation.separator.clauses.erlang @@ -5186,7 +5186,7 @@ fun_expression_tests() -> % ^ meta.function.erlang meta.fun.erlang - meta.fun.erlang meta.fun.erlang % ^^^^^^^^^^^ meta.function.erlang meta.fun.erlang meta.fun.erlang % ^ meta.function.erlang meta.fun.erlang - meta.fun.erlang meta.fun.erlang -% ^^^ variable.other.erlang +% ^^^ variable.other.readwrite.erlang % ^ keyword.operator.assignment.erlang % ^^^ keyword.declaration.function.erlang % ^^^^ variable.function.erlang @@ -5266,7 +5266,7 @@ try_catch_tests() -> % ^^^ keyword.control.exception.try.erlang Expected -> % ^^^^^^^^^^^^^ meta.exception.try.erlang -% ^^^^^^^^ variable.other.erlang +% ^^^^^^^^ variable.other.readwrite.erlang % ^^ punctuation.separator.clause-head-body.erlang ok; % ^^^^^ meta.exception.try.erlang @@ -5295,8 +5295,8 @@ try_catch_tests() -> % ^^^^ meta.path.erlang variable.function.erlang Class:Cause -> % ^^^^^^^^^^^^^^^^^ meta.exception.catch.erlang -% ^^^^^ variable.other.erlang -% ^^^^^ variable.other.erlang +% ^^^^^ variable.other.readwrite.erlang +% ^^^^^ variable.other.readwrite.erlang after % ^ meta.exception.catch.erlang % ^^^^^^ meta.exception.after.erlang From 22a271e72885c863fe93b6ed9e589725c34741e8 Mon Sep 17 00:00:00 2001 From: DeathAxe Date: Tue, 2 Jun 2020 18:09:00 +0200 Subject: [PATCH 4/4] [Erlang] Use storage.type.record The #record{field=value} term represents an instantiation of a record, which was declared by `-record(record, {field=value})` statement. Thus the #record identifier can be interpreted as storage.type. This commit uses `storage.type.record` instead of `storage.type.struct` as this scope name is used for the meta scopes as well. --- Erlang/Erlang.sublime-syntax | 4 ++-- Erlang/syntax_test_erlang.erl | 36 +++++++++++++++++------------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Erlang/Erlang.sublime-syntax b/Erlang/Erlang.sublime-syntax index 6e1db108cd..ca0d81970f 100644 --- a/Erlang/Erlang.sublime-syntax +++ b/Erlang/Erlang.sublime-syntax @@ -1178,13 +1178,13 @@ contexts: variable-other-record: - match: '{{atom_unquoted}}' - scope: meta.atom.erlang variable.other.record.erlang + scope: meta.atom.erlang storage.type.record.erlang pop: true - match: \' scope: punctuation.definition.atom.begin.erlang set: - meta_include_prototype: false - - meta_scope: meta.atom.erlang variable.other.record.erlang + - meta_scope: meta.atom.erlang storage.type.record.erlang - include: atom-quoted-common - include: macro-pop - include: atom-expect-end diff --git a/Erlang/syntax_test_erlang.erl b/Erlang/syntax_test_erlang.erl index 16e989d773..591ed2c47c 100644 --- a/Erlang/syntax_test_erlang.erl +++ b/Erlang/syntax_test_erlang.erl @@ -3628,14 +3628,14 @@ preprocessor_record_tests() -> . #record % ^ - meta.record - variable % ^ punctuation.definition.record.erlang -% ^^^^^^ meta.record.identifier.erlang variable.other.record.erlang +% ^^^^^^ meta.record.identifier.erlang storage.type.record.erlang #record. % ^^^^^^^ meta.record.identifier.erlang - meta.record.erlang - meta.record.field % ^ meta.record.erlang - meta.record.identifier - meta.record.field % ^ - meta.record % ^ punctuation.definition.record.erlang -% ^^^^^^ variable.other.record.erlang +% ^^^^^^ storage.type.record.erlang % ^ punctuation.accessor.dot.erlang #record.field @@ -3645,7 +3645,7 @@ preprocessor_record_tests() -> . % ^^^^^ meta.record.field.erlang - meta.record.erlang - meta.record.identifier % ^ - meta.record % ^ punctuation.definition.record.erlang -% ^^^^^^ variable.other.record.erlang +% ^^^^^^ storage.type.record.erlang % ^ punctuation.accessor.dot.erlang % ^^^^^ variable.other.member.erlang @@ -3656,7 +3656,7 @@ preprocessor_record_tests() -> . % ^^^^^ meta.record.field.erlang - meta.record.erlang - meta.record.identifier % ^ - meta.record % ^ punctuation.definition.record.erlang -% ^^^^^^ variable.other.record.erlang +% ^^^^^^ storage.type.record.erlang % ^ punctuation.accessor.dot.erlang % ^^^^^ invalid.illegal.expect-atom.erlang @@ -3667,7 +3667,7 @@ preprocessor_record_tests() -> . % ^^^^^^^^^^^^ meta.record.field.erlang - meta.record.erlang - meta.record.identifier % ^ - meta.record % ^ punctuation.definition.record.erlang -% ^^^^^^ variable.other.record.erlang +% ^^^^^^ storage.type.record.erlang % ^ punctuation.accessor.dot.erlang % ^ punctuation.definition.atom.begin.erlang % ^^^^^^^^^^^^ variable.other.member.erlang @@ -3681,7 +3681,7 @@ preprocessor_record_tests() -> . % ^ - meta.record % ^ punctuation.definition.record.erlang % ^ punctuation.definition.atom.begin.erlang -% ^^^^^^^^^^^^^^^ variable.other.record.erlang +% ^^^^^^^^^^^^^^^ storage.type.record.erlang % ^ - keyword - punctuation % ^ punctuation.definition.atom.end.erlang % ^ punctuation.accessor.dot.erlang @@ -3758,7 +3758,7 @@ local_record_definition_tests() -> . % ^ punctuation.definition.record.erlang % ^^^^^^^^^^^^^^^^ meta.record.identifier.erlang - meta.record.fields % ^ punctuation.definition.atom.begin.erlang -% ^^^^^^^^^^^^^^^ variable.other.record.erlang +% ^^^^^^^^^^^^^^^ storage.type.record.erlang % ^ - keyword - punctuation % ^ punctuation.definition.atom.end.erlang @@ -3767,7 +3767,7 @@ local_record_definition_tests() -> . % ^^ meta.record.fields.erlang - meta.record.identifier % ^ - meta.record % ^ punctuation.definition.record.erlang -% ^^^^^^ variable.other.record.erlang +% ^^^^^^ storage.type.record.erlang % ^ punctuation.section.fields.begin.erlang % ^ punctuation.section.fields.end.erlang @@ -3799,7 +3799,7 @@ local_record_definition_tests() -> . % ^ - meta.field % ^ - meta.record % ^ punctuation.definition.record.erlang -% ^^^^^^ variable.other.record.erlang +% ^^^^^^ storage.type.record.erlang % ^ punctuation.section.fields.begin.erlang % ^^^^^^ variable.other.member.erlang % ^ keyword.operator.assignment.erlang @@ -3832,7 +3832,7 @@ local_record_definition_tests() -> . % ^^^^^^^^ meta.record.identifier.erlang - meta.record.fields.erlang % ^^ meta.record.fields.erlang - meta.record.identifier % ^ punctuation.definition.record.erlang -% ^^^^^^ variable.other.record.erlang +% ^^^^^^ storage.type.record.erlang % ^ punctuation.section.fields.begin.erlang field1 = "val1" , %^^^^^^^^^^^^^^^^^^^^^^^^ meta.record.fields.erlang @@ -3870,7 +3870,7 @@ local_record_definition_tests() -> . % ^ - meta.record % ^ punctuation.definition.record.erlang % ^ punctuation.definition.atom.begin.erlang -% ^^^^^^^^^^^ variable.other.record.erlang +% ^^^^^^^^^^^ storage.type.record.erlang % ^ - keyword - punctuation % ^ punctuation.definition.atom.end.erlang % ^ punctuation.section.fields.begin.erlang @@ -3897,7 +3897,7 @@ local_record_definition_tests() -> . % ^^ meta.record.fields.erlang - meta.record.name % ^ punctuation.definition.record.erlang % ^ punctuation.definition.atom.begin.erlang -% ^^^^^^^^^^^^^ variable.other.record.erlang +% ^^^^^^^^^^^^^ storage.type.record.erlang % ^ - keyword - punctuation % ^ punctuation.definition.atom.end.erlang % ^ punctuation.section.fields.begin.erlang @@ -3958,15 +3958,15 @@ local_record_definition_tests() -> . % ^^^^ meta.record.field.erlang % ^^ variable.other.readwrite.erlang % ^ punctuation.definition.record.erlang -% ^^^^^ variable.other.record.erlang +% ^^^^^ storage.type.record.erlang % ^ punctuation.accessor.dot.erlang % ^^^^^ variable.other.member.erlang % ^ punctuation.definition.record.erlang -% ^^^^^ variable.other.record.erlang +% ^^^^^ storage.type.record.erlang % ^ punctuation.accessor.dot.erlang % ^^^^^ variable.other.member.erlang % ^ punctuation.definition.record.erlang -% ^^^^^ variable.other.record.erlang +% ^^^^^ storage.type.record.erlang % ^ punctuation.accessor.dot.erlang % ^^^^ variable.other.member.erlang % ^ punctuation.separator.expressions.erlang @@ -3984,15 +3984,15 @@ local_record_definition_tests() -> . % ^ - meta.record % ^^ variable.other.readwrite.erlang % ^ punctuation.definition.record.erlang -% ^^^^^ variable.other.record.erlang +% ^^^^^ storage.type.record.erlang % ^ punctuation.accessor.dot.erlang % ^^^^^ variable.other.member.erlang % ^ punctuation.definition.record.erlang -% ^^^^^ variable.other.record.erlang +% ^^^^^ storage.type.record.erlang % ^ punctuation.accessor.dot.erlang % ^^^^^ variable.other.member.erlang % ^ punctuation.definition.record.erlang -% ^^^^^ variable.other.record.erlang +% ^^^^^ storage.type.record.erlang % ^ punctuation.section.fields.begin.erlang % ^ punctuation.section.fields.end.erlang % ^ punctuation.separator.expressions.erlang