Merge pull request #608 from j-cortial/cpp/fix/#432

Cpp/fix/#432

Author: jeff-hykin

autogenerated/cpp.embedded.macro.tmLanguage.json

@@ -245,6 +245,7 @@ meta.tail.switch.cpp
 meta.tail.union.cpp
 meta.template.call.cpp
 meta.template.definition.cpp
+meta.template.explicit-instantiation.cpp
 meta.toc-list.banner.block.cpp
 meta.toc-list.banner.double-slash.cpp
 meta.using-namespace.cpp
@@ -402,6 +403,7 @@ storage.modifier.lambda.$0.cpp
 storage.modifier.pointer.cpp
 storage.modifier.reference.cpp
 storage.modifier.specifier.$3.cpp
+storage.modifier.specifier.extern.cpp
 storage.modifier.specifier.functional.post-parameters.$5.cpp
 storage.modifier.specifier.functional.pre-parameters.$0.cpp
 storage.modifier.specifier.parameter.cpp

autogenerated/cpp.tmLanguage.json

@@ -1,4 +1,7 @@
-- source: 'template '
+- source: template
+  scopes:
+    - meta.template.explicit-instantiation
+    - storage.type.template
 - source: class
   scopesBegin:
     - meta.block.class
@@ -36,9 +39,12 @@
   scopesEnd:
     - meta.block.class
 - source: template
+  scopes:
+    - meta.template.explicit-instantiation
+    - storage.type.template
 - source: MyStack
   scopes:
-    - entity.name.scope-resolution
+    - entity.name.scope-resolution.function.call
 - source: <
   scopesBegin:
     - meta.template.call
@@ -64,7 +70,7 @@
 - source: '::'
   scopes:
     - punctuation.separator.namespace.access
-    - punctuation.separator.scope-resolution
+    - punctuation.separator.scope-resolution.function.call
 - source: MyStack
   scopes:
     - entity.name.function.call
@@ -82,9 +88,15 @@
   scopes:
     - punctuation.terminator.statement
 - source: extern
+  scopesBegin:
+    - meta.template.explicit-instantiation
   scopes:
     - storage.modifier.specifier.extern
-- source: ' template '
+- source: template
+  scopes:
+    - storage.type.template
+  scopesEnd:
+    - meta.template.explicit-instantiation
 - source: class
   scopesBegin:
     - meta.block.class
@@ -122,12 +134,18 @@
   scopesEnd:
     - meta.block.class
 - source: extern
+  scopesBegin:
+    - meta.template.explicit-instantiation
   scopes:
     - storage.modifier.specifier.extern
-- source: ' template'
+- source: template
+  scopes:
+    - storage.type.template
+  scopesEnd:
+    - meta.template.explicit-instantiation
 - source: MyStack
   scopes:
-    - entity.name.scope-resolution
+    - entity.name.scope-resolution.function.call
 - source: <
   scopesBegin:
     - meta.template.call
@@ -153,7 +171,7 @@
 - source: '::'
   scopes:
     - punctuation.separator.namespace.access
-    - punctuation.separator.scope-resolution
+    - punctuation.separator.scope-resolution.function.call
 - source: MyStack
   scopes:
     - entity.name.function.call

autogenerated/cpp_scopes.txt

@@ -46,9 +46,12 @@
     - punctuation.section.block.begin.bracket.curly.namespace
   scopesEnd:
     - meta.head.namespace
-- source: 'template '
+- source: template
   scopesBegin:
     - meta.body.namespace
+  scopes:
+    - meta.template.explicit-instantiation
+    - storage.type.template
 - source: class
   scopesBegin:
     - meta.block.class
@@ -79,7 +82,10 @@
     - punctuation.terminator.statement
   scopesEnd:
     - meta.block.class
-- source: 'template '
+- source: template
+  scopes:
+    - meta.template.explicit-instantiation
+    - storage.type.template
 - source: class
   scopesBegin:
     - meta.block.class
@@ -110,7 +116,10 @@
     - punctuation.terminator.statement
   scopesEnd:
     - meta.block.class
-- source: 'template '
+- source: template
+  scopes:
+    - meta.template.explicit-instantiation
+    - storage.type.template
 - source: class
   scopesBegin:
     - meta.block.class
@@ -141,7 +150,10 @@
     - punctuation.terminator.statement
   scopesEnd:
     - meta.block.class
-- source: 'template '
+- source: template
+  scopes:
+    - meta.template.explicit-instantiation
+    - storage.type.template
 - source: class
   scopesBegin:
     - meta.block.class
@@ -173,6 +185,9 @@
   scopesEnd:
     - meta.block.class
 - source: template
+  scopes:
+    - meta.template.explicit-instantiation
+    - storage.type.template
 - source: '::'
   scopesBegin:
     - meta.function.definition.special.operator-overload
@@ -253,6 +268,9 @@
   scopes:
     - punctuation.terminator.statement
 - source: template
+  scopes:
+    - meta.template.explicit-instantiation
+    - storage.type.template
 - source: '::'
   scopesBegin:
     - meta.function.definition.special.operator-overload
@@ -333,6 +351,9 @@
   scopes:
     - punctuation.terminator.statement
 - source: template
+  scopes:
+    - meta.template.explicit-instantiation
+    - storage.type.template
 - source: '::'
   scopesBegin:
     - meta.function.definition.special.operator-overload
@@ -416,6 +437,9 @@
   scopes:
     - punctuation.terminator.statement
 - source: template
+  scopes:
+    - meta.template.explicit-instantiation
+    - storage.type.template
 - source: '::'
   scopesBegin:
     - meta.function.definition.special.operator-overload

language_examples/#079.spec.yaml

@@ -0,0 +1,16 @@
+template <class T> struct Explicit {
+  T t;
+};
+
+template<> struct Explicit<void> {};
+
+extern template struct Explicit<int>;
+
+extern
+template
+struct Explicit<unsigned>;
+
+template struct Explicit<int>;
+
+template
+struct Explicit<unsigned>;