Removed separate EDN syntax, merged with main Clojure (Sublimed), detect keyword namespaces

Author: tonsky

CHANGELOG.md

@@ -15,8 +15,9 @@ Other changes:
 
 - Built-in color scheme to utilize REPL and new syntax features.
 - Allow using `cljfmt` for formatting (requires `cljfmt` binary on `$PATH`)
+- Removed separate EDN syntax, merged with main Clojure (Sublimed)
 - Settings can now be specified in main `Preferences.sublime-settings` as well. Just prepend `clojure_sublimed_` to each setting’s name.
-- Detect namespaces with meta
+- REPL can detect namespaces with meta on ns form
 
 ### 3.8.0 - Aug 8, 2024
 

Clojure (Sublimed).sublime-syntax

@@ -1,8 +1,8 @@
 %YAML 1.2
 ---
-# http://www.sublimetext.com/docs/3/syntax.html
+# https://www.sublimetext.com/docs/syntax.html
 name: Clojure (Sublimed)
-file_extensions: [clj, cljs, cljc, cljx, boot, bb]
+file_extensions: [clj, cljs, cljc, cljx, boot, bb, edn]
 scope: source.clojure
 variables:
   wsb:          '(?<=^|[\s,()\[\]{}~''`"^@]|#_)'
@@ -229,11 +229,12 @@ contexts:
       - include: forms
 
   keyword:
-    - match: '{{wsb}}(::?){{keyword}}(?:(/){{keyword}})?{{wse}}'
+    - match: '{{wsb}}(::?)(?:{{keyword}}|({{keyword}})(/){{keyword}}){{wse}}'
       scope: constant.other.keyword.clojure
       captures:
-        1: punctuation.definition.constant.begin.clojure
-        2: punctuation.definition.constant.namespace.clojure
+        1: punctuation.definition.keyword.begin.clojure
+        2: meta.namespace.keyword.clojure
+        3: punctuation.definition.namespace.clojure
       pop:   1
 
   integer:
@@ -353,7 +354,7 @@ contexts:
       scope: source.symbol.def.clojure
       captures:
         1: meta.namespace.symbol.clojure
-        2: punctuation.definition.symbol.namespace.clojure
+        2: punctuation.definition.namespace.clojure
       pop: 1
       push: list_second
 
@@ -362,7 +363,7 @@ contexts:
       scope: source.symbol.clojure entity.name.clojure
       captures:
         1: meta.namespace.symbol.clojure
-        2: punctuation.definition.symbol.namespace.clojure
+        2: punctuation.definition.namespace.clojure
       pop: 1
       push: list_rest
 
@@ -371,15 +372,15 @@ contexts:
       scope: source.symbol.unused.clojure
       captures:
         1: meta.namespace.symbol.clojure
-        2: punctuation.definition.symbol.namespace.clojure
+        2: punctuation.definition.namespace.clojure
       pop:   1
 
   symbol:
     - match: '{{wsb}}(?:{{symbol}}|({{ns_symbol}})(/){{symbol}}){{wse}}'
       scope: source.symbol.clojure
       captures:
         1: meta.namespace.symbol.clojure
-        2: punctuation.definition.symbol.namespace.clojure
+        2: punctuation.definition.namespace.clojure
       pop:   1
 
   vector:

Clojure Sublimed Dark.sublime-color-scheme

@@ -55,8 +55,8 @@
          "scope":      "entity.name - entity.name.tag - meta.metadata",
          "foreground": "var(blue)"},
 
-        {"name":       "Namespaces",
-         "scope":      "meta.namespace, punctuation.definition.symbol.namespace",
+        {"name":       "Symbol namespaces",
+         "scope":      "meta.namespace.symbol, source.symbol punctuation.definition.namespace",
          "foreground": "var(gray)"},
 
         {"name":       "Unused symbol",

Clojure Sublimed Light.sublime-color-scheme

@@ -53,8 +53,8 @@
          "scope":      "entity.name - entity.name.tag - meta.metadata",
          "background": "var(blue)"},
 
-        {"name":       "Namespaces",
-         "scope":      "meta.namespace, punctuation.definition.symbol.namespace",
+        {"name":       "Symbol namespaces",
+         "scope":      "meta.namespace.symbol, source.symbol punctuation.definition.namespace",
          "foreground": "var(gray)"},
 
         {"name":       "Unused symbol",

EDN (Sublimed).sublime-syntax

@@ -1,10 +1,13 @@
 
 ; Constants
-nil true false \c \tab 1 1.0 1/2 :a :a.b/c.d #inst "1985-01-25"
+nil true false \c \tab 1 1.0 1/2 #inst "1985-01-25"
 
 ; Symbols
 abc ab/cd _abc
 
+; Keywords
+:a :a.b/c.d ::ab ::a.b/c.d
+
 ; Strings
 "" "abc" "\" \u221e \x"