Merge branch 'master' into @__temp__/pull_request

Author: jeff-hykin

.gitignore

@@ -1,9 +1,7 @@
 # 
 # Custom
 # 
-\.idea
-**/*.dont-sync
-**/*.dont-sync.*
+*.vsix
 
 
 # 

autogenerated/cpp.embedded.macro.tmLanguage.json

@@ -86,6 +86,9 @@
     {
       "include": "#template_definition"
     },
+    {
+      "include": "#template_explicit_instantiation"
+    },
     {
       "include": "#access_control_keywords"
     },
@@ -13797,6 +13800,18 @@
         }
       ]
     },
+    "template_explicit_instantiation": {
+      "match": "(?<!\\w)(?:(extern)(?:\\s)+)?(template)(?:\\s)+",
+      "captures": {
+        "1": {
+          "name": "storage.modifier.specifier.extern.cpp"
+        },
+        "2": {
+          "name": "storage.type.template.cpp"
+        }
+      },
+      "name": "meta.template.explicit-instantiation.cpp"
+    },
     "template_isolated_definition": {
       "match": "(?<!\\w)(template)(?:(?:\\s)+)?(<)(.*)(>)(?:(?:\\s)+)?$",
       "captures": {

autogenerated/cpp.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_scopes.txt

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 vsce publish --pat "$1" && echo "published on VSCE"
-ovsx publish -p "$2" && echo "published on OVSX"
+ovsx publish -p "$2" && echo "published on OVSX"

commands/project/publish

@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p bash_5 -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/a7ecde854aee5c4c7cd6177f54a99d2c1ff28a31.tar.gz
+#! nix-shell -i bash -p bash_5 -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/ce6aa13369b667ac2542593170993504932eb836.tar.gz
 
 # the comments above^ are special
 #   they tell the system to process this using nix-shell
@@ -85,9 +85,9 @@ if [[ -n "$FORNIX_ARGS" ]]
 then
     # FIXME: I think the single quotes need to be escaped from the arguments (need to iterate over them, escape each one with single quotes)
     # run single command
-    HOME="$FORNIX_HOME" nix-shell --pure --show-trace --run "zsh -c '$FORNIX_ARGS'" "$__temp_var__nix_shell_file"
+    HOME="$FORNIX_HOME" nix-shell --pure --show-trace --run "zsh -c '$FORNIX_ARGS'" "$__temp_var__nix_shell_file" -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/a7ecde854aee5c4c7cd6177f54a99d2c1ff28a31.tar.gz --keep __FORNIX_NIX_SETTINGS_PATH --keep __FORNIX_NIX_MAIN_CODE_PATH --keep __FORNIX_NIX_PACKAGES_FILE_PATH --keep __FORNIX_NIX_PATH_EXPORT_FILE --keep __FORNIX_NIX_COMMANDS --keep FORNIX_FOLDER
 else
-    HOME="$FORNIX_HOME" nix-shell --pure --show-trace --command "zsh" "$__temp_var__nix_shell_file"
+    HOME="$FORNIX_HOME" nix-shell --pure --show-trace --command "zsh" "$__temp_var__nix_shell_file" -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/a7ecde854aee5c4c7cd6177f54a99d2c1ff28a31.tar.gz --keep __FORNIX_NIX_SETTINGS_PATH --keep __FORNIX_NIX_MAIN_CODE_PATH --keep __FORNIX_NIX_PACKAGES_FILE_PATH --keep __FORNIX_NIX_PATH_EXPORT_FILE --keep __FORNIX_NIX_COMMANDS --keep FORNIX_FOLDER
 fi
 if [ "$FORNIX_DEBUG" = "true" ]; then
     echo "exited the nix-shell environment"

commands/shell

@@ -5,7 +5,7 @@
 - (Don't git clone)
 - Run this: `repo=https://github.com/jeff-hykin/better-cpp-syntax setup_or_copy=setup branch=master eval "$(curl -fsSL git.io/JE2Zm || wget -qO- git.io/JE2Zm)"`
 - If you're on Windows, run it inside WSL (Ubuntu 20.04 preferably)
-- If you're a responsible human being and therefore don't want run a sketchy internet script, props to you 👍. Take a look at the explaination below and you'll be able to run the commands yourself.
+- If you're a responsible human being and therefore don't want run a sketchy internet script, props to you 👍. Take a look at the "What is that `eval` command doing?" section at the bottom and you'll be able to run the commands yourself.
 
 ### If the above instructions didn't make sense
 
@@ -20,13 +20,13 @@
 - Windows users
     - Get [WSL](https://youtu.be/av0UQy6g2FA?t=91) (Windows Subsystem for Linux) or [WSL2](https://www.omgubuntu.co.uk/how-to-install-wsl2-on-windows-10)<br>
         - If you're not familiar with WSL, I'd recommend [watching a quick thing on it like this one](https://youtu.be/av0UQy6g2FA?t=91)
-        - Ubuntu 20.04 for WSL is preferred (same as in that linked video), but Ubuntu 21.04 or similar should work.
-        - [WSL2](https://www.omgubuntu.co.uk/how-to-install-wsl2-on-windows-10) (released August 2020) is needed if you want to use your GPU.<br>
+        - Ubuntu 20.04 for WSL is preferred (same as in that linked video), but Ubuntu 22.04 or similar should work.
+        - [WSL2](https://www.omgubuntu.co.uk/how-to-install-wsl2-on-windows-10) (just released August 2020) is needed if you want to use your GPU.<br>
     - Once WSL is installed (and you have a terminal logged into WSL) follow the Mac/Linux instructions.
     - (tip: when accessing WSL, you probably want to use the VS Code terminal, or the [open source windows terminal](https://github.com/microsoft/terminal) instead of CMD)
 
 After you've finished working and close the terminal, you can always return to project environment by doing
-- `cd wherever-you-put-the-project`
+- `cd WHEREVER_YOU_PUT_THE_PROJECT`
 - `commands/start`
 
 <!-- 
@@ -51,7 +51,7 @@ Altertive instructions if GUI is needed (matplotlib, tkinter, qt, etc)
 
 ### What is that `eval` command doing?
 
-1. Installing nix [manual install instructions here](https://nixos.org/guides/install-nix.html)
+1. Installing nix [manual install instructions here](https://nixos.org/download.html)
 2. Installing `git` (using nix) if you don't already have git
 3. It clones the repository
 4. It `cd`'s inside of the repo

documentation/SETUP.md

@@ -5,7 +5,7 @@
 - (Don't git clone)
 - Run this: `repo=https://github.com/jeff-hykin/better-cpp-syntax setup_or_copy=setup branch=master eval "$(curl -fsSL git.io/JE2Zm || wget -qO- git.io/JE2Zm)"`
 - If you're on Windows, run it inside WSL (Ubuntu 20.04 preferably)
-- If you're a responsible human being and therefore don't want run a sketchy internet script, props to you 👍. Take a look at the explaination below and you'll be able to run the commands yourself.
+- If you're a responsible human being and therefore don't want run a sketchy internet script, props to you 👍. Take a look at the "What is that `eval` command doing?" section at the bottom and you'll be able to run the commands yourself.
 
 ### If the above instructions didn't make sense
 
@@ -20,13 +20,13 @@
 - Windows users
     - Get [WSL](https://youtu.be/av0UQy6g2FA?t=91) (Windows Subsystem for Linux) or [WSL2](https://www.omgubuntu.co.uk/how-to-install-wsl2-on-windows-10)<br>
         - If you're not familiar with WSL, I'd recommend [watching a quick thing on it like this one](https://youtu.be/av0UQy6g2FA?t=91)
-        - Ubuntu 20.04 for WSL is preferred (same as in that linked video), but Ubuntu 21.04 or similar should work.
-        - [WSL2](https://www.omgubuntu.co.uk/how-to-install-wsl2-on-windows-10) (released August 2020) is needed if you want to use your GPU.<br>
+        - Ubuntu 20.04 for WSL is preferred (same as in that linked video), but Ubuntu 22.04 or similar should work.
+        - [WSL2](https://www.omgubuntu.co.uk/how-to-install-wsl2-on-windows-10) (just released August 2020) is needed if you want to use your GPU.<br>
     - Once WSL is installed (and you have a terminal logged into WSL) follow the Mac/Linux instructions.
     - (tip: when accessing WSL, you probably want to use the VS Code terminal, or the [open source windows terminal](https://github.com/microsoft/terminal) instead of CMD)
 
 After you've finished working and close the terminal, you can always return to project environment by doing
-- `cd wherever-you-put-the-project`
+- `cd WHEREVER_YOU_PUT_THE_PROJECT`
 - `commands/start`
 
 <!-- 
@@ -51,7 +51,7 @@ Altertive instructions if GUI is needed (matplotlib, tkinter, qt, etc)
 
 ### What is that `eval` command doing?
 
-1. Installing nix [manual install instructions here](https://nixos.org/guides/install-nix.html)
+1. Installing nix [manual install instructions here](https://nixos.org/download.html)
 2. Installing `git` (using nix) if you don't already have git
 3. It clones the repository
 4. It `cd`'s inside of the repo

documentation/setup.md

@@ -30,4 +30,4 @@
     };
     version = "1.0.1";
   };
-}
+}

gemset.nix

@@ -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

language_examples/#079.spec.yaml

@@ -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/#207.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>;