Merge remote-tracking branch 'upstream/master' into fix-1830

.github/ISSUE_TEMPLATE/01-bug-syntax-highlighting.md

@@ -0,0 +1,25 @@
+---
+name: Syntax Highlighting problem
+about: Create a bug report for mis-highlighted code in one of the default languages.
+
+---
+
+<!--
+    Please search existing issues to avoid creating duplicates. Also, if you
+    are able, follow the directions at https://github.com/sublimehq/Packages#installation
+    to check the latest version of this language highlighting.
+
+    If the problem persists, please begin the issue title with the language in
+    square brackets, e.g. "[XML] Tags with underscores"
+-->
+
+- Sublime Version:
+- OS Version:
+
+<!-- Replace 'lang' below with the GitHub language identifier for your problem (e.g. 'html' or 'java') -->
+
+``` lang
+# Minimum code snippet to demonstrate the issue
+```
+
+<!-- If you believe it is helpful, include a screenshot of the code in your Sublime Text window. -->

.github/ISSUE_TEMPLATE/02-bug-file-indexing.md

@@ -0,0 +1,26 @@
+---
+name: Go to Symbol problem
+about: Create a bug report for file indexing in one of the default languages.
+
+---
+
+<!--
+    Please search existing issues to avoid creating duplicates. Also, if you
+    are able, follow the directions at https://github.com/sublimehq/Packages#installation
+    to check the latest version of this language's behavior.
+
+    If the problem persists, please begin the issue title with the language in
+    square brackets, e.g. "[Java] Can't go-to-symbol on classes"
+-->
+
+- Sublime Version:
+- OS Version:
+
+## Expected behavior
+
+## Actual behavior
+
+## Steps to reproduce
+
+1. 
+2. 

.github/ISSUE_TEMPLATE/03-supporting-files.md

@@ -0,0 +1,26 @@
+---
+name: Snippet, Completion, Indentation, or Build problem
+about: Suggest improvements for one of the default language support files.
+
+---
+
+<!--
+    Please search existing issues to avoid creating duplicates. Also, if you
+    are able, follow the directions at https://github.com/sublimehq/Packages#installation
+    to check the latest version of this language highlighting.
+
+    If the problem persists, please begin the issue title with the language in
+    square brackets, e.g. "[PHP] Snippet for echo includes the wrong tab stops"
+-->
+
+- Sublime Version:
+- OS Version:
+
+## Expected behavior
+
+## Actual behavior
+
+## Steps to reproduce
+
+1. 
+2. 

.github/PULL_REQUEST_TEMPLATE/01-syntax-update-small.md

@@ -0,0 +1,11 @@
+---
+name: Small update to Syntax definition
+about: I have made easily-reviewable changes to a `.sublime-syntax` file.
+title: [PackageName] update_summary
+
+---
+
+- [ ] My commit messages start with the package name in square brackets, e.g. `[XML]`.
+- [ ] I have included new or enhanced [syntax tests][] to cover the changes.
+
+[syntax tests]: https://www.sublimetext.com/docs/3/syntax.html#testing

.github/PULL_REQUEST_TEMPLATE/02-syntax-update-significant.md

@@ -0,0 +1,33 @@
+---
+name: Large update to Syntax definition
+about: I have made significant changes to a `.sublime-syntax` file.
+title: [PackageName] update_summary
+
+---
+
+- [ ] My commit messages start with the package name in square brackets, e.g. `[XML]`.
+- [ ] I have included new or enhanced [syntax tests][] to cover the changes.
+- [ ] I have included a performance comparison below:
+
+
+## Performance
+<!--
+    Run "Tools > Build With... > Syntax Tests - Performance" and put the
+    relevant output in the blocks below, both with and without your changes.
+-->
+
+### Before changes
+
+```
+Syntax "Packages/PackageName/lang.sublime-syntax" took an average of 10.0ms over 10 runs
+Syntax "Packages/PackageName/lang-types.sublime-syntax" took an average of 2.0ms over 10 runs
+```
+
+### After changes
+
+```
+Syntax "Packages/PackageName/lang.sublime-syntax" took an average of 10.2ms over 10 runs
+Syntax "Packages/PackageName/lang-types.sublime-syntax" took an average of 2.0ms over 10 runs
+```
+
+[syntax tests]: https://www.sublimetext.com/docs/3/syntax.html#testing

.github/PULL_REQUEST_TEMPLATE/03-supporting-files.md

@@ -0,0 +1,8 @@
+---
+name: Update to supporting files
+about: My changes do not include any `.sublime-syntax` file.
+title: [PackageName] update_summary
+
+---
+
+- [ ] My commit messages start with the package name in square brackets, e.g. `[XML]`.

.travis.yml

@@ -1,13 +1,17 @@
+dist: bionic
 sudo: false
 language: c
 branches:
   except:
     - /^v[0-9]{4}$/
+before_install:
+  - sudo apt-get -y install libgl1-mesa-glx
+  - sudo apt-get -y install libglu1-mesa
 install:
-  - wget --content-disposition https://download.sublimetext.com/latest/dev/linux/x64/syntax_tests
-  - tar xf "$(ls st3_syntax_tests_build_*_x64.tar.bz2)"
-  - mv st3_syntax_tests/syntax_tests ./
-  - rm -R st3_syntax_tests*
+  - wget --content-disposition https://download.sublimetext.com/st_syntax_tests_build_4052_x64.tar.bz2
+  - tar xf "$(ls st_syntax_tests_build_*_x64.tar.bz2)"
+  - mv st_syntax_tests/syntax_tests ./
+  - rm -R st_syntax_tests*
 before_script:
   - mkdir -p Data/Packages/
   - find . -maxdepth 1 -mindepth 1 -type d -not -name 'Data' -exec mv '{}' Data/Packages/ \;

ActionScript/ActionScript.sublime-syntax

@@ -54,6 +54,9 @@ contexts:
           captures:
             0: punctuation.definition.comment.actionscript.2
           pop: true
+        - match: ^\s*(\*)(?!/)
+          captures:
+            1: punctuation.definition.comment.actionscript.2
     - match: (//).*$\n?
       scope: comment.line.double-slash.actionscript.2
       captures:

ActionScript/syntax_test_as.as

@@ -0,0 +1,5 @@
+/* SYNTAX TEST "Packages/ActionScript/ActionScript.sublime-syntax" */
+
+/**
+    *
+/*  ^ comment.block.actionscript.2 punctuation.definition.comment.actionscript.2 */

Batch File/Batch File.sublime-syntax

@@ -27,8 +27,14 @@ contexts:
     - include: escaped_characters
     - include: variables
     - include: commands
-    - match: \b(?i)(?:goto|call|exit)\b
+    - match: \b(?i)exit\b
       scope: keyword.control.statement.dosbatch
+    - match: \b(?i)(goto|call)\b(?:\s*(:)?(?:(eof)|(\w+)))?
+      captures:
+        1: keyword.control.statement.dosbatch
+        2: punctuation.separator.dosbatch
+        3: keyword.control.flow.return.dosbatch
+        4: meta.function-call.dosbatch variable.function.dosbatch
     - match: \b(?i)(if)\s+(?:(not)\s+)?(exist|defined|errorlevel|cmdextversion)\b
       captures:
         1: keyword.control.conditional.dosbatch
@@ -232,6 +238,11 @@ contexts:
       scope: variable.parameter.dosbatch
       captures:
         1: punctuation.definition.variable.dosbatch
+    - match: (?i)(%)errorlevel(%)
+      scope: variable.language.dosbatch
+      captures:
+        1: punctuation.definition.variable.begin.dosbatch
+        2: punctuation.definition.variable.end.dosbatch
     - include: variable
     - include: variable_delayed_expansion
 

Batch File/Symbol List.tmPreferences

@@ -4,11 +4,13 @@
 	<key>name</key>
 	<string>Symbol List</string>
 	<key>scope</key>
-	<string>source.dosbatch entity.name.label.dosbatch</string>
+	<string>source.dosbatch entity.name.label - meta.function-call</string>
 	<key>settings</key>
 	<dict>
 		<key>showInSymbolList</key>
 		<integer>1</integer>
+		<key>showInIndexedSymbolList</key>
+		<integer>1</integer>
 	</dict>
 </dict>
 </plist>

Batch File/syntax_test_batch_file.bat

@@ -67,6 +67,18 @@ ECHO "
 
    GOTO:EOF
 :: ^^^^ keyword.control.statement.dosbatch
+::     ^ punctuation.separator.dosbatch
+::      ^^^ keyword.control.flow.return.dosbatch
+
+   GOTO :End
+:: ^^^^ keyword.control.statement.dosbatch
+::      ^ punctuation.separator.dosbatch
+::       ^^^ meta.function-call.dosbatch variable.function.dosbatch
+
+   GOTO:End
+:: ^^^^ keyword.control.statement.dosbatch
+::     ^ punctuation.separator.dosbatch
+::      ^^^ meta.function-call.dosbatch variable.function.dosbatch
 
 :: Redirection
    ECHO Hello World! > hello.txt
@@ -96,6 +108,13 @@ ECHO "
 ::    ^^^         keyword.operator.logical.dosbatch
 ::            ^^^ keyword.operator.comparison.dosbatch
 
+
+   IF %ERRORLEVEL% NEQ 0 EXIT /B 1
+:: ^^              keyword.control.conditional.dosbatch
+::    ^^^^^^^^^^^^ variable.language.dosbatch
+::    ^ punctuation.definition.variable.begin.dosbatch
+::               ^ variable.language.dosbatch punctuation.definition.variable.end.dosbatch
+
    IF foo == bar
 :: ^^         keyword.control.conditional.dosbatch
 ::        ^^  keyword.operator.comparison.dosbatch