improve typing further

jeff-hykin · Aug 9, 2023 · 8c056a1 · 8c056a1
1 parent 401d7c2
commit 8c056a1
Show file tree

Hide file tree

Showing 27 changed files with 2,249 additions and 966 deletions.
diff --git a/autogenerated/cpp.embedded.macro.tmLanguage.json b/autogenerated/cpp.embedded.macro.tmLanguage.json
diff --git a/autogenerated/cpp.tmLanguage.json b/autogenerated/cpp.tmLanguage.json
diff --git a/language_examples/#030.spec.yaml b/language_examples/#030.spec.yaml
@@ -119,9 +119,12 @@
     - storage.modifier.specifier.const
 - source: bool
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' isPoint '
+- source: isPoint
+  scopes:
+    - variable.other.assignment
 - source: '='
   scopes:
     - keyword.operator.assignment
@@ -632,9 +635,12 @@
     - storage.modifier.specifier.const
 - source: bool
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' isPoint '
+- source: isPoint
+  scopes:
+    - variable.other.assignment
 - source: '='
   scopes:
     - keyword.operator.assignment
@@ -696,9 +702,12 @@
     - storage.modifier.specifier.const
 - source: bool
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' value '
+- source: value
+  scopes:
+    - variable.other.assignment
 - source: '='
   scopes:
     - keyword.operator.assignment
@@ -760,9 +769,12 @@
     - storage.modifier.specifier.const
 - source: bool
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' value '
+- source: value
+  scopes:
+    - variable.other.assignment
 - source: '='
   scopes:
     - keyword.operator.assignment

diff --git a/language_examples/#071.spec.yaml b/language_examples/#071.spec.yaml
@@ -15,21 +15,33 @@
   scopesBegin:
     - meta.body.struct
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' a'
+- source: a
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement
 - source: int
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' b'
+- source: b
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement
-- source: '    usertype user_value'
+- source: usertype
+  scopes:
+    - meta.qualified_type
+    - entity.name.type
+- source: user_value
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement
@@ -95,25 +107,41 @@
   scopes:
     - punctuation.terminator.statement
 - source: scoped
+  scopesBegin:
+    - meta.qualified_type
   scopes:
     - entity.name.scope-resolution
 - source: '::'
   scopes:
     - punctuation.separator.namespace.access
     - punctuation.separator.scope-resolution
 - source: templated
+  scopes:
+    - entity.name.type
 - source: <
+  scopesBegin:
+    - meta.template.call
   scopes:
-    - keyword.operator.comparison
+    - punctuation.section.angle-brackets.begin.template.call
 - source: type
+  scopes:
+    - meta.qualified_type
+    - entity.name.type
 - source: '>'
   scopes:
-    - keyword.operator.comparison
-- source: ' value'
+    - punctuation.section.angle-brackets.end.template.call
+  scopesEnd:
+    - meta.qualified_type
+    - meta.template.call
+- source: value
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement
 - source: compound
+  scopesBegin:
+    - meta.qualified_type
   scopes:
     - entity.name.scope-resolution
 - source: <
@@ -152,7 +180,14 @@
   scopes:
     - punctuation.separator.namespace.access
     - punctuation.separator.scope-resolution
-- source: type value
+- source: type
+  scopes:
+    - entity.name.type
+  scopesEnd:
+    - meta.qualified_type
+- source: value
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement

diff --git a/language_examples/#088.spec.yaml b/language_examples/#088.spec.yaml
@@ -62,9 +62,12 @@
   scopesBegin:
     - meta.body.struct
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' Brightness'
+- source: Brightness
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement

diff --git a/language_examples/#204.spec.yaml b/language_examples/#204.spec.yaml
@@ -62,9 +62,12 @@
   scopesBegin:
     - meta.body.function.definition
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' a'
+- source: a
+  scopes:
+    - variable.other.object.declare
 - source: ','
   scopes:
     - punctuation.separator.delimiter.comma

diff --git a/language_examples/#249.spec.yaml b/language_examples/#249.spec.yaml
@@ -79,9 +79,12 @@
     - storage.type.modifier.access.control.public
 - source: int
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' a'
+- source: a
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement
@@ -115,9 +118,12 @@
     - storage.type.modifier.access.control.public
 - source: int
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' a'
+- source: a
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement

diff --git a/language_examples/#305.spec.yaml b/language_examples/#305.spec.yaml
@@ -141,41 +141,56 @@
     - meta.function.definition.special.constructor
 - source: bool
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' someMember'
+- source: someMember
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement
 - source: bool
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' anotherOne'
+- source: anotherOne
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement
 - source: bool
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' quiteALotOfMembers'
+- source: quiteALotOfMembers
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement
 - source: bool
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' soManyThatTheConstructorIsLong'
+- source: soManyThatTheConstructorIsLong
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement
 - source: bool
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' iMeanReallyLong'
+- source: iMeanReallyLong
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement

diff --git a/language_examples/#307.spec.yaml b/language_examples/#307.spec.yaml
@@ -130,9 +130,12 @@
     - meta.function.definition.special.constructor
 - source: bool
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' m_one'
+- source: m_one
+  scopes:
+    - variable.other.object.declare
 - source: ','
   scopes:
     - punctuation.separator.delimiter.comma
@@ -369,41 +372,56 @@
     - meta.body.function.definition.special.constructor
 - source: bool
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' someMember'
+- source: someMember
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement
 - source: bool
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' anotherOne'
+- source: anotherOne
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement
 - source: bool
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' quiteALotOfMembers'
+- source: quiteALotOfMembers
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement
 - source: bool
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' soManyThatTheConstructorIsLong'
+- source: soManyThatTheConstructorIsLong
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement
 - source: bool
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' iMeanReallyLong'
+- source: iMeanReallyLong
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement

diff --git a/language_examples/#372.spec.yaml b/language_examples/#372.spec.yaml
@@ -43,9 +43,12 @@
     - storage.modifier.specifier.const
 - source: int
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' count '
+- source: count
+  scopes:
+    - variable.other.assignment
 - source: '='
   scopes:
     - keyword.operator.assignment

diff --git a/language_examples/#386.spec.yaml b/language_examples/#386.spec.yaml
@@ -22,12 +22,15 @@
     - storage.type.modifier.access.control.private
 - source: double
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
 - source: '*'
   scopes:
-    - keyword.operator.arithmetic
-- source: ' elem'
+    - storage.modifier.pointer
+- source: elem
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement
@@ -41,9 +44,12 @@
     - comment.line.double-slash
 - source: int
   scopes:
+    - meta.qualified_type
     - storage.type.primitive
     - storage.type.built-in.primitive
-- source: ' sz'
+- source: sz
+  scopes:
+    - variable.other.object.declare
 - source: ;
   scopes:
     - punctuation.terminator.statement