Move syntaxes, fixes #874

2025-09-01 19:02:22 +01:00 · 2020-03-21 23:16:37 +01:00
parent 0550a286bd
commit 32346612b7
87 changed files with 66 additions and 55 deletions
--- a/assets/JavaDoc.sublime-syntax.patch
+++ b/assets/JavaDoc.sublime-syntax.patch
@@ -1,7 +1,7 @@
-diff --git syntaxes/Packages/Java/JavaDoc.sublime-syntax syntaxes/Packages/Java/JavaDoc.sublime-syntax
+diff --git syntaxes/01_Packages/Java/JavaDoc.sublime-syntax syntaxes/01_Packages/Java/JavaDoc.sublime-syntax
 index 422a6a9..40a741e 100644
--- syntaxes/Packages/Java/JavaDoc.sublime-syntax
-+++ syntaxes/Packages/Java/JavaDoc.sublime-syntax
+--- syntaxes/01_Packages/Java/JavaDoc.sublime-syntax
+++ syntaxes/01_Packages/Java/JavaDoc.sublime-syntax
@@ -13,7 +13,7 @@ variables:
 contexts:
   prototype:
--- a/assets/create.sh
+++ b/assets/create.sh
@@ -44,7 +44,7 @@ bat cache --clear

 # TODO: Remove this (and the reverse part below) when
 # https://github.com/trishume/syntect/issues/222 has been fixed
-JAVADOC_FILE="${ASSET_DIR}/syntaxes/Packages/Java/JavaDoc.sublime-syntax"
+JAVADOC_FILE="${ASSET_DIR}/syntaxes/01_Packages/Java/JavaDoc.sublime-syntax"
 JAVADOC_PATCH="${ASSET_DIR}/JavaDoc.sublime-syntax.patch"
 patch "$JAVADOC_FILE" "$JAVADOC_PATCH"

--- a/assets/syntaxes.bin
+++ b/assets/syntaxes.bin
--- a/assets/syntaxes/01_Packages
+++ b/assets/syntaxes/01_Packages
--- a/assets/syntaxes/02_Extra/AWK
+++ b/assets/syntaxes/02_Extra/AWK
--- a/assets/syntaxes/02_Extra/AsciiDoc
+++ b/assets/syntaxes/02_Extra/AsciiDoc
--- a/assets/syntaxes/02_Extra/AsciiDoc.sublime-syntax
+++ b/assets/syntaxes/02_Extra/AsciiDoc.sublime-syntax
--- a/assets/syntaxes/02_Extra/Assembly
+++ b/assets/syntaxes/02_Extra/Assembly
--- a/assets/syntaxes/02_Extra/Assembly
+++ b/assets/syntaxes/02_Extra/Assembly
--- a/assets/syntaxes/02_Extra/Assembly
+++ b/assets/syntaxes/02_Extra/Assembly
--- a/assets/syntaxes/02_Extra/CMake
+++ b/assets/syntaxes/02_Extra/CMake
--- a/assets/syntaxes/02_Extra/CSV
+++ b/assets/syntaxes/02_Extra/CSV
--- a/assets/syntaxes/02_Extra/CSV.sublime-syntax
+++ b/assets/syntaxes/02_Extra/CSV.sublime-syntax
--- a/assets/syntaxes/02_Extra/Cabal
+++ b/assets/syntaxes/02_Extra/Cabal
--- a/assets/syntaxes/02_Extra/Cabal.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Cabal.sublime-syntax
--- a/assets/syntaxes/02_Extra/CoffeeScript
+++ b/assets/syntaxes/02_Extra/CoffeeScript
--- a/assets/syntaxes/02_Extra/CoffeeScript.sublime-syntax
+++ b/assets/syntaxes/02_Extra/CoffeeScript.sublime-syntax
--- a/assets/syntaxes/02_Extra/CpuInfo.sublime-syntax
+++ b/assets/syntaxes/02_Extra/CpuInfo.sublime-syntax
--- a/assets/syntaxes/02_Extra/Crystal
+++ b/assets/syntaxes/02_Extra/Crystal
--- a/assets/syntaxes/02_Extra/Crystal.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Crystal.sublime-syntax
--- a/assets/syntaxes/02_Extra/Dart
+++ b/assets/syntaxes/02_Extra/Dart
--- a/assets/syntaxes/02_Extra/Dart.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Dart.sublime-syntax
--- a/assets/syntaxes/02_Extra/Docker
+++ b/assets/syntaxes/02_Extra/Docker
--- a/assets/syntaxes/02_Extra/DotENV
+++ b/assets/syntaxes/02_Extra/DotENV
--- a/assets/syntaxes/02_Extra/DotENV.sublime-syntax
+++ b/assets/syntaxes/02_Extra/DotENV.sublime-syntax
--- a/assets/syntaxes/02_Extra/Elixir
+++ b/assets/syntaxes/02_Extra/Elixir
--- a/assets/syntaxes/02_Extra/Elm
+++ b/assets/syntaxes/02_Extra/Elm
--- a/assets/syntaxes/02_Extra/FSharp
+++ b/assets/syntaxes/02_Extra/FSharp
--- a/assets/syntaxes/02_Extra/Fish
+++ b/assets/syntaxes/02_Extra/Fish
--- a/assets/syntaxes/02_Extra/Fstab.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Fstab.sublime-syntax
--- a/assets/syntaxes/02_Extra/GraphQL
+++ b/assets/syntaxes/02_Extra/GraphQL
--- a/assets/syntaxes/02_Extra/Group.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Group.sublime-syntax
--- a/assets/syntaxes/02_Extra/HTML
+++ b/assets/syntaxes/02_Extra/HTML
--- a/assets/syntaxes/02_Extra/HTML
+++ b/assets/syntaxes/02_Extra/HTML
--- a/assets/syntaxes/02_Extra/Hosts.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Hosts.sublime-syntax
--- a/assets/syntaxes/02_Extra/INI
+++ b/assets/syntaxes/02_Extra/INI
--- a/assets/syntaxes/02_Extra/INI.sublime-syntax
+++ b/assets/syntaxes/02_Extra/INI.sublime-syntax
--- a/assets/syntaxes/02_Extra/JavaScript
+++ b/assets/syntaxes/02_Extra/JavaScript
--- a/assets/syntaxes/02_Extra/JavaScript
+++ b/assets/syntaxes/02_Extra/JavaScript
--- a/assets/syntaxes/02_Extra/Jinja2
+++ b/assets/syntaxes/02_Extra/Jinja2
--- a/assets/syntaxes/02_Extra/Jsonnet
+++ b/assets/syntaxes/02_Extra/Jsonnet
--- a/assets/syntaxes/02_Extra/Julia
+++ b/assets/syntaxes/02_Extra/Julia
--- a/assets/syntaxes/02_Extra/Kotlin
+++ b/assets/syntaxes/02_Extra/Kotlin
--- a/assets/syntaxes/02_Extra/Kotlin.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Kotlin.sublime-syntax
--- a/assets/syntaxes/02_Extra/LESS
+++ b/assets/syntaxes/02_Extra/LESS
--- a/assets/syntaxes/02_Extra/Manpage.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Manpage.sublime-syntax
--- a/assets/syntaxes/02_Extra/MemInfo.sublime-syntax
+++ b/assets/syntaxes/02_Extra/MemInfo.sublime-syntax
--- a/assets/syntaxes/02_Extra/Nim.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Nim.sublime-syntax
--- a/assets/syntaxes/02_Extra/Nix
+++ b/assets/syntaxes/02_Extra/Nix
--- a/assets/syntaxes/02_Extra/Nix.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Nix.sublime-syntax
--- a/assets/syntaxes/02_Extra/Org
+++ b/assets/syntaxes/02_Extra/Org
--- a/assets/syntaxes/02_Extra/Org
+++ b/assets/syntaxes/02_Extra/Org
--- a/assets/syntaxes/02_Extra/Passwd.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Passwd.sublime-syntax
--- a/assets/syntaxes/02_Extra/PowerShell
+++ b/assets/syntaxes/02_Extra/PowerShell
--- a/assets/syntaxes/02_Extra/PowerShell.sublime-syntax
+++ b/assets/syntaxes/02_Extra/PowerShell.sublime-syntax
--- a/assets/syntaxes/02_Extra/Protobuf
+++ b/assets/syntaxes/02_Extra/Protobuf
--- a/assets/syntaxes/02_Extra/Puppet
+++ b/assets/syntaxes/02_Extra/Puppet
--- a/assets/syntaxes/02_Extra/PureScript
+++ b/assets/syntaxes/02_Extra/PureScript
--- a/assets/syntaxes/02_Extra/Resolv.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Resolv.sublime-syntax
--- a/assets/syntaxes/02_Extra/Robot
+++ b/assets/syntaxes/02_Extra/Robot
--- a/assets/syntaxes/02_Extra/Robot.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Robot.sublime-syntax
--- a/assets/syntaxes/02_Extra/SCSS_Sass
+++ b/assets/syntaxes/02_Extra/SCSS_Sass
--- a/assets/syntaxes/02_Extra/SLS
+++ b/assets/syntaxes/02_Extra/SLS
--- a/assets/syntaxes/02_Extra/Strace
+++ b/assets/syntaxes/02_Extra/Strace
--- a/assets/syntaxes/02_Extra/Swift
+++ b/assets/syntaxes/02_Extra/Swift
--- a/assets/syntaxes/02_Extra/Swift.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Swift.sublime-syntax
--- a/assets/syntaxes/02_Extra/Syslog
+++ b/assets/syntaxes/02_Extra/Syslog
--- a/assets/syntaxes/02_Extra/TOML
+++ b/assets/syntaxes/02_Extra/TOML
--- a/assets/syntaxes/02_Extra/Terraform
+++ b/assets/syntaxes/02_Extra/Terraform
--- a/assets/syntaxes/02_Extra/TypeScript
+++ b/assets/syntaxes/02_Extra/TypeScript
--- a/assets/syntaxes/02_Extra/TypeScript.sublime-syntax
+++ b/assets/syntaxes/02_Extra/TypeScript.sublime-syntax
--- a/assets/syntaxes/02_Extra/TypsecriptReact.sublime-syntax
+++ b/assets/syntaxes/02_Extra/TypsecriptReact.sublime-syntax
--- a/assets/syntaxes/02_Extra/Verilog
+++ b/assets/syntaxes/02_Extra/Verilog
--- a/assets/syntaxes/02_Extra/Verilog.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Verilog.sublime-syntax
--- a/assets/syntaxes/02_Extra/VimL
+++ b/assets/syntaxes/02_Extra/VimL
--- a/assets/syntaxes/02_Extra/VimL.sublime-syntax
+++ b/assets/syntaxes/02_Extra/VimL.sublime-syntax
--- a/assets/syntaxes/02_Extra/Vue
+++ b/assets/syntaxes/02_Extra/Vue
--- a/assets/syntaxes/02_Extra/hosts
+++ b/assets/syntaxes/02_Extra/hosts
--- a/assets/syntaxes/02_Extra/requirementstxt
+++ b/assets/syntaxes/02_Extra/requirementstxt
--- a/assets/syntaxes/02_Extra/requirementstxt.sublime-syntax
+++ b/assets/syntaxes/02_Extra/requirementstxt.sublime-syntax
--- a/assets/syntaxes/02_Extra/show-nonprintable.sublime-syntax
+++ b/assets/syntaxes/02_Extra/show-nonprintable.sublime-syntax
--- a/assets/syntaxes/02_Extra/ssh-config
+++ b/assets/syntaxes/02_Extra/ssh-config
--- a/assets/syntaxes/02_Extra/varlink
+++ b/assets/syntaxes/02_Extra/varlink
--- a/assets/syntaxes/Packages/Java/JavaDoc.sublime-syntax.orig
+++ b/assets/syntaxes/Packages/Java/JavaDoc.sublime-syntax.orig
--- a/assets/syntaxes/Packages/Java/JavaDoc.sublime-syntax.rej
+++ b/assets/syntaxes/Packages/Java/JavaDoc.sublime-syntax.rej
@@ -0,0 +1,11 @@
+--- JavaDoc.sublime-syntax
+++ JavaDoc.sublime-syntax
+@@ -13,7 +13,7 @@ variables:
+ contexts:
+   prototype:
+     # https://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#leadingasterisks
+-    - match: ^\s*(\*)\s*(?!\s*@)
+    - match: ^\s*(\*)(?!/)\s*(?!\s*@)
+       captures:
+         1: punctuation.definition.comment.javadoc
+