Skip to content

Commit d60cbc0

Browse files
committed
Merge branch 'master' into pr/javascript/fix-indentation
2 parents eec9dc7 + ac567af commit d60cbc0

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ jobs:
4646

4747
# latest stable build
4848
# https://www.sublimetext.com/download
49-
- sublime-channel: stable
50-
sublime-build: 4169
51-
optional: true
49+
# - sublime-channel: stable
50+
# sublime-build: 4169
51+
# optional: true
5252

5353
# latest dev build
5454
# https://www.sublimetext.com/dev

Go/Go.sublime-syntax

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1331,6 +1331,7 @@ contexts:
13311331

13321332
pop-now-clear-scope:
13331333
- clear_scopes: 1
1334+
- meta_include_prototype: false
13341335
- include: pop-now
13351336

13361337
pop-now:

Go/tests/syntax_test_template.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,3 +202,9 @@ <h2>{{ .Title }}</h2>
202202
| ^ punctuation.accessor.dot.go
203203
| ^^^^^ variable.other.member.go
204204
| ^^ punctuation.section.interpolation.end.go
205+
206+
<img src="https://{{server}}/*">
207+
| ^^^^^^^^^^^^^^^^^^^^^^ meta.attribute-with-value.href.html meta.string.html - comment
208+
| ^^^^^^^^^ string.quoted.double.html
209+
| ^^^^^^^^^^ meta.interpolation.go - string
210+
| ^^^ string.quoted.double.html

Go/tests/syntax_test_template.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,8 @@ key: {{ /*comment*/ }}
107107
#^ punctuation.section.interpolation.begin.go
108108
# ^^^^^ meta.string.yaml meta.interpolation.go source.go.template
109109
# ^^ punctuation.section.interpolation.end.go
110+
111+
path: /{{.Values.ingress.path}}/*
112+
# ^ meta.string.yaml string.unquoted.plain.out.yaml
113+
# ^^^^^^^^^^^^^^^^^^^^^^^^ meta.string.yaml meta.interpolation.go
114+
# ^^ meta.string.yaml string.unquoted.plain.out.yaml - comment

0 commit comments

Comments
 (0)