Skip to content

Commit f29bf23

Browse files
committed
Fix forward compatibility for rewritten C#
caused by sublimehq/Packages@927bcbe
1 parent 2ecae8f commit f29bf23

2 files changed

Lines changed: 23 additions & 7 deletions

File tree

syntax/embed/C# (for PowerShell).sublime-syntax

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,35 @@ contexts:
2626
inside-triple-quoted-raw-string-syntax:
2727
# required for sublimehq/Packages/pull/4547
2828
- meta_include_prototype: false
29-
- include: immediately-pop
29+
- meta_scope: meta.string.cs string.quoted.double.block.cs
30+
- include: inside-triple-quoted-raw-string-plain
31+
32+
inside-triple-quoted-raw-string-sql: []
33+
34+
inside-triple-quoted-raw-string-plain:
35+
- meta_prepend: true
3036

3137
inside-verbatim-string-syntax:
3238
# required for sublimehq/Packages/pull/4547
3339
- meta_include_prototype: false
34-
- include: immediately-pop
40+
- meta_scope: meta.string.cs string.quoted.double.verbatim.cs
41+
- include: inside-verbatim-string-plain
42+
43+
inside-verbatim-string-sql: []
44+
45+
inside-verbatim-string-plain:
46+
- meta_prepend: true
3547

3648
inside-verbatim-format-string-syntax:
3749
# required for sublimehq/Packages/pull/4547
3850
- meta_include_prototype: false
39-
- include: immediately-pop
51+
- meta_scope: meta.string.interpolated.cs string.quoted.double.verbatim.cs
52+
- include: inside-verbatim-format-string-plain
53+
54+
inside-verbatim-format-string-sql: []
55+
56+
inside-verbatim-format-string-plain:
57+
- meta_prepend: true
4058

4159
immediately-pop:
4260
# required before sublimehq/Packages/pull/4547

tests/syntax_test_strings.ps1

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@
6060
@'
6161
using System;
6262
#^^^^^^^^^^^^^^^^ meta.string.powershell string.quoted.single.heredoc.powershell source.cs
63-
# ^^^^^ keyword.control.import.cs
64-
# ^^^^^^ meta.path.cs
63+
# ^^^^^ keyword
6564
# ^ punctuation.terminator
6665
'@
6766

@@ -232,8 +231,7 @@
232231
@"
233232
using System;
234233
#^^^^^^^^^^^^^^^^ meta.string.interpolated.powershell string.quoted.double.heredoc.powershell source.cs
235-
# ^^^^^ keyword.control.import.cs
236-
# ^^^^^^ meta.path.cs
234+
# ^^^^^ keyword
237235
# ^ punctuation.terminator
238236
"@
239237

0 commit comments

Comments
 (0)