Skip to content

fix: adjust scope created within multiline string W-21968889 #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peternhale merged 1 commit into from
Apr 10, 2026
Merged

fix: adjust scope created within multiline string W-21968889 #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions grammars/apex.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2921,6 +2921,10 @@
<dict>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#multiline-string-literal</string>
</dict>
<dict>
<key>include</key>
<string>#string-literal</string>
Expand All @@ -2941,6 +2945,10 @@
<dict>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#multiline-string-literal</string>
</dict>
<dict>
<key>include</key>
<string>#string-literal</string>
Expand Down Expand Up @@ -3686,9 +3694,9 @@
<key>multiline-string-literal</key>
<dict>
<key>name</key>
<string>string.quoted.single.multiline.apex</string>
<string>string.quoted.single.apex string.quoted.single.multiline.apex</string>
<key>begin</key>
<string>'''</string>
<string>'''(?=$)</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
Expand All @@ -3713,10 +3721,6 @@
<key>include</key>
<string>#string-character-escape</string>
</dict>
<dict>
<key>include</key>
<string>#string-template-expression</string>
</dict>
</array>
</dict>
<key>string-literal</key>
Expand Down Expand Up @@ -3772,7 +3776,7 @@
<key>name</key>
<string>meta.template-expression.apex</string>
<key>begin</key>
<string>\$\{</string>
<string>(?&lt;!\\)\$\{</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
Expand All @@ -3797,7 +3801,7 @@
<key>name</key>
<string>variable.other.readwrite.apex</string>
<key>match</key>
<string>@?[_[:alpha:]][_[:alnum:]]*</string>
<string>\G@?[A-Za-z_][A-Za-z0-9_]*(?:\.[A-Za-z_][A-Za-z0-9_]*)*</string>
</dict>
</array>
</dict>
Expand Down
17 changes: 10 additions & 7 deletions grammars/apex.tmLanguage.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1720,6 +1720,9 @@ repository:
name: 'keyword.control.switch.when.apex'
'2':
patterns: [
{
include: '#multiline-string-literal'
}
{
include: '#string-literal'
}
Expand All @@ -1732,6 +1735,9 @@ repository:
]
'5':
patterns: [
{
include: '#multiline-string-literal'
}
{
include: '#string-literal'
}
Expand Down Expand Up @@ -2178,8 +2184,8 @@ repository:
}
]
'multiline-string-literal':
name: 'string.quoted.single.multiline.apex'
begin: "'''"
name: 'string.quoted.single.apex string.quoted.single.multiline.apex'
begin: "'''(?=$)"
beginCaptures:
'0':
name: 'punctuation.definition.string.begin.apex'
Expand All @@ -2191,9 +2197,6 @@ repository:
{
include: '#string-character-escape'
}
{
include: '#string-template-expression'
}
]
'string-literal':
name: 'string.quoted.single.apex'
Expand All @@ -2220,7 +2223,7 @@ repository:
match: '\\\\.'
'string-template-expression':
name: 'meta.template-expression.apex'
begin: '\\$\\{'
begin: '(?<!\\\\)\\$\\{'
beginCaptures:
'0':
name: 'punctuation.definition.template-expression.begin.apex'
Expand All @@ -2231,7 +2234,7 @@ repository:
patterns: [
{
name: 'variable.other.readwrite.apex'
match: '@?[_[:alpha:]][_[:alnum:]]*'
match: '\\G@?[A-Za-z_][A-Za-z0-9_]*(?:\\.[A-Za-z_][A-Za-z0-9_]*)*'
}
]
'expression-operators':
Expand Down
20 changes: 12 additions & 8 deletions grammars/soql.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2903,6 +2903,10 @@
<dict>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#multiline-string-literal</string>
</dict>
<dict>
<key>include</key>
<string>#string-literal</string>
Expand All @@ -2923,6 +2927,10 @@
<dict>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#multiline-string-literal</string>
</dict>
<dict>
<key>include</key>
<string>#string-literal</string>
Expand Down Expand Up @@ -3668,9 +3676,9 @@
<key>multiline-string-literal</key>
<dict>
<key>name</key>
<string>string.quoted.single.multiline.apex</string>
<string>string.quoted.single.apex string.quoted.single.multiline.apex</string>
<key>begin</key>
<string>'''</string>
<string>'''(?=$)</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
Expand All @@ -3695,10 +3703,6 @@
<key>include</key>
<string>#string-character-escape</string>
</dict>
<dict>
<key>include</key>
<string>#string-template-expression</string>
</dict>
</array>
</dict>
<key>string-literal</key>
Expand Down Expand Up @@ -3754,7 +3758,7 @@
<key>name</key>
<string>meta.template-expression.apex</string>
<key>begin</key>
<string>\$\{</string>
<string>(?&lt;!\\)\$\{</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
Expand All @@ -3779,7 +3783,7 @@
<key>name</key>
<string>variable.other.readwrite.apex</string>
<key>match</key>
<string>@?[_[:alpha:]][_[:alnum:]]*</string>
<string>\G@?[A-Za-z_][A-Za-z0-9_]*(?:\.[A-Za-z_][A-Za-z0-9_]*)*</string>
</dict>
</array>
</dict>
Expand Down
11 changes: 6 additions & 5 deletions src/apex.tmLanguage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,12 +996,14 @@ repository:
'1': { name: keyword.control.switch.when.apex }
'2':
patterns:
- include: '#multiline-string-literal'
- include: '#string-literal'
'4':
patterns:
- include: '#punctuation-comma'
'5':
patterns:
- include: '#multiline-string-literal'
- include: '#string-literal'
end: (?=\})|(?=when\b)
patterns:
Expand Down Expand Up @@ -1299,16 +1301,15 @@ repository:
match: \b[0-9_]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\b

multiline-string-literal:
name: string.quoted.single.multiline.apex
begin: "'''"
name: string.quoted.single.apex string.quoted.single.multiline.apex
begin: "'''(?=$)"
beginCaptures:
'0': { name: punctuation.definition.string.begin.apex }
end: "'''"
endCaptures:
'0': { name: punctuation.definition.string.end.apex }
patterns:
- include: '#string-character-escape'
- include: '#string-template-expression'

string-literal:
name: string.quoted.single.apex
Expand All @@ -1329,15 +1330,15 @@ repository:

string-template-expression:
name: meta.template-expression.apex
begin: \$\{
begin: "(?<!\\\\)\\$\\{"
beginCaptures:
'0': { name: punctuation.definition.template-expression.begin.apex }
end: \}
endCaptures:
'0': { name: punctuation.definition.template-expression.end.apex }
patterns:
- name: variable.other.readwrite.apex
match: '@?[_[:alpha:]][_[:alnum:]]*'
match: '\G@?[A-Za-z_][A-Za-z0-9_]*(?:\.[A-Za-z_][A-Za-z0-9_]*)*'

expression-operators:
patterns:
Expand Down
Loading
Loading