Skip to content

Commit 093114b

Browse files
committed
Support Clojure 1.12 array type annotations
1 parent 6b572bc commit 093114b

File tree

4 files changed

+29
-9
lines changed

4 files changed

+29
-9
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### WIP
2+
3+
- Support Clojure 1.12 array type annotations
4+
15
### 4.1.0 - Aug 30, 2024
26

37
- Eval previous form at current level #118

Clojure (Sublimed).sublime-syntax

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ contexts:
271271
push: list_second
272272

273273
symbol_name:
274-
- match: '{{wsb}}(?:{{symbol}}|({{ns_symbol}})(/){{symbol}}){{wse}}'
274+
- match: '{{wsb}}(?:{{symbol}}|({{ns_symbol}})(/)(?:/|{{sym_body}}+)){{wse}}'
275275
scope: source.symbol.clojure entity.name.clojure
276276
captures:
277277
1: meta.namespace.symbol.clojure
@@ -288,7 +288,7 @@ contexts:
288288
pop: 1
289289

290290
symbol:
291-
- match: '{{wsb}}(?:{{symbol}}|({{ns_symbol}})(/){{symbol}}){{wse}}'
291+
- match: '{{wsb}}(?:{{symbol}}|({{ns_symbol}})(/)(?:/|{{sym_body}}+)){{wse}}'
292292
scope: source.symbol.clojure
293293
captures:
294294
1: meta.namespace.symbol.clojure

Clojure Sublimed Light.sublime-color-scheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"foreground": "var(fg)",
2121
"background": "var(bg)",
2222
"caret": "var(active)",
23-
"line_highlight": "#00000010",
23+
"line_highlight": "#00000008",
2424
"misspelling": "#f00",
2525
"selection": "#B4D8FD",
2626
"inactive_selection": "#E0E0E0",

test_syntax/syntax_test_clojure.cljc

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ string"
288288
; ^^ source.symbol
289289
; ^^ source.symbol
290290
; ^^^^ source.symbol
291-
a/b a1/b2 абв/где abc.def/uvw.xyz clojure.core//
291+
a/b a1/b2 абв/где abc.def/uvw.xyz
292292
; ^^^ source.symbol
293293
; ^ meta.namespace.symbol
294294
; ^ punctuation.definition.namespace
@@ -301,9 +301,22 @@ string"
301301
; ^^^^^^^^^^^^^^^ source.symbol
302302
; ^^^^^^^ meta.namespace.symbol
303303
; ^ punctuation.definition.namespace
304-
; ^^^^^^^^^^^^^^ source.symbol
305-
; ^^^^^^^^^^^^ meta.namespace.symbol
306-
; ^ punctuation.definition.namespace
304+
abc.def// abc.def/+ abc.def/+' abc.def/1
305+
; ^^^^^^^^^ source.symbol
306+
; ^^^^^^^ meta.namespace.symbol
307+
; ^ punctuation.definition.namespace
308+
; ^ - source.symbol
309+
; ^^^^^^^^^ source.symbol
310+
; ^^^^^^^ meta.namespace.symbol
311+
; ^ punctuation.definition.namespace
312+
; ^ - source.symbol
313+
; ^^^^^^^^^^ source.symbol
314+
; ^^^^^^^ meta.namespace.symbol
315+
; ^ punctuation.definition.namespace
316+
; ^ - source.symbol
317+
; ^^^^^^^^^ source.symbol
318+
; ^^^^^^^ meta.namespace.symbol
319+
; ^ punctuation.definition.namespace
307320
_ _a _abc x/_a
308321
; ^ source.symbol.unused
309322
; ^^ source.symbol.unused
@@ -680,7 +693,7 @@ string"
680693

681694
;;;;;;;;;; METADATA ;;;;;;;;;;
682695

683-
^{:a 1 :b 2} ^String ^"String" ^:dynamic x
696+
^{:a 1 :b 2} ^String ^"String" ^double/1 ^:dynamic x
684697
; ^ punctuation.definition.metadata
685698
; ^^^^^^^^^^^^ meta.metadata
686699
; ^ - meta.metadata
@@ -691,8 +704,11 @@ string"
691704
; ^^^^^^^^^ meta.metadata
692705
; ^ - meta.metadata
693706
; ^ punctuation.definition.metadata
694-
; ^^^^^^^^ meta.metadata
707+
; ^^^^^^^^^ meta.metadata
695708
; ^ - meta.metadata
709+
; ^ punctuation.definition.metadata
710+
; ^^^^^^^^ meta.metadata
711+
; ^ - meta.metadata
696712
^ , :dynamic x
697713
; ^^^^^^^^^^^^ meta.metadata
698714
; ^^ - meta.metadata

0 commit comments

Comments
 (0)