SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 20:52:56 +01:00
Code Issues Projects Releases Packages Activity

Elixir - Add support for multi-letter uppercase sigils

Browse source 
Elixir v1.15.0 has added support for multi-letter uppercase sigils

~LVN/content/
~LVN/content/m

Refs:
Proposal: https://groups.google.com/g/elixir-lang-core/c/cocMcghahs4/m/DdYRNfuYAwAJ
PR: elixir-lang/elixir#12448
Release notes: https://github.com/elixir-lang/elixir/releases/tag/v1.15.0
This commit is contained in:
Leandro Pereira 2023-06-24 09:07:36 -04:00
parent 84d1bed101
commit 2df7a51aa1
No known key found for this signature in database
GPG key ID: D4AB0498F59DEADE
2 changed files with 43 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/basic-languages/elixir/elixir.test.ts
View file

@ -303,6 +303,17 @@ testTokenization('elixir', [
] ]
} }
], ],
// Sigils (multi-letter uppercase)
[
{
line: '~DX/foo/',
tokens: [
{ startIndex: 0, type: 'sigil.delimiter.elixir' },
{ startIndex: 4, type: 'sigil.elixir' },
{ startIndex: 7, type: 'sigil.delimiter.elixir' }
]
}
],
// Sigils (no interpolation) // Sigils (no interpolation)
[ [
{ {
@ -314,6 +325,17 @@ testTokenization('elixir', [
] ]
} }
], ],
// Sigils (multi-letter uppercase no interpolation)
[
{
line: '~WW/foo#{1}/',
tokens: [
{ startIndex: 0, type: 'sigil.delimiter.elixir' },
{ startIndex: 4, type: 'sigil.elixir' },
{ startIndex: 11, type: 'sigil.delimiter.elixir' }
]
}
],
// Sigils (modifiers) // Sigils (modifiers)
[ [
{ {
@ -325,6 +347,17 @@ testTokenization('elixir', [
] ]
} }
], ],
// Sigils (multi-letter uppercase with modifiers)
[
{
line: '~DX/custom/az09',
tokens: [
{ startIndex: 0, type: 'sigil.delimiter.elixir' },
{ startIndex: 4, type: 'sigil.elixir' },
{ startIndex: 10, type: 'sigil.delimiter.elixir' }
]
}
],
// Module attributes // Module attributes
[ [
{ {

19
src/basic-languages/elixir/elixir.ts
View file

@ -333,7 +333,8 @@ export const language = <languages.IMonarchLanguage>{
// See https://elixir-lang.org/getting-started/sigils.html // See https://elixir-lang.org/getting-started/sigils.html
// Sigils allow for typing values using their textual representation. // Sigils allow for typing values using their textual representation.
// All sigils start with ~ followed by a letter indicating sigil type // All sigils start with ~ followed by a letter or
// multi-letter uppercase starting at Elixir v1.15.0, indicating sigil type
// and then a delimiter pair enclosing the textual representation. // and then a delimiter pair enclosing the textual representation.
// Optional modifiers are allowed after the closing delimiter. // Optional modifiers are allowed after the closing delimiter.
// For instance a regular expressions can be written as: // For instance a regular expressions can be written as:
@ -353,16 +354,16 @@ export const language = <languages.IMonarchLanguage>{
sigils: [ sigils: [
[/~[a-z]@sigilStartDelimiter/, { token: '@rematch', next: '@sigil.interpol' }], [/~[a-z]@sigilStartDelimiter/, { token: '@rematch', next: '@sigil.interpol' }],
[/~[A-Z]@sigilStartDelimiter/, { token: '@rematch', next: '@sigil.noInterpol' }] [/~([A-Z]+)@sigilStartDelimiter/, { token: '@rematch', next: '@sigil.noInterpol' }]
], ],
sigil: [ sigil: [
[/~([a-zA-Z])\{/, { token: '@rematch', switchTo: '@sigilStart.$S2.$1.{.}' }], [/~([a-z]|[A-Z]+)\{/, { token: '@rematch', switchTo: '@sigilStart.$S2.$1.{.}' }],
[/~([a-zA-Z])\[/, { token: '@rematch', switchTo: '@sigilStart.$S2.$1.[.]' }], [/~([a-z]|[A-Z]+)\[/, { token: '@rematch', switchTo: '@sigilStart.$S2.$1.[.]' }],
[/~([a-zA-Z])\(/, { token: '@rematch', switchTo: '@sigilStart.$S2.$1.(.)' }], [/~([a-z]|[A-Z]+)\(/, { token: '@rematch', switchTo: '@sigilStart.$S2.$1.(.)' }],
[/~([a-zA-Z])\</, { token: '@rematch', switchTo: '@sigilStart.$S2.$1.<.>' }], [/~([a-z]|[A-Z]+)\</, { token: '@rematch', switchTo: '@sigilStart.$S2.$1.<.>' }],
[ [
/~([a-zA-Z])(@sigilSymmetricDelimiter)/, /~([a-z]|[A-Z]+)(@sigilSymmetricDelimiter)/,
{ token: '@rematch', switchTo: '@sigilStart.$S2.$1.$2.$2' } { token: '@rematch', switchTo: '@sigilStart.$S2.$1.$2.$2' }
] ]
], ],
@ -475,7 +476,7 @@ export const language = <languages.IMonarchLanguage>{
// Fallback to the generic sigil by default // Fallback to the generic sigil by default
'sigilStart.interpol': [ 'sigilStart.interpol': [
[ [
/~([a-zA-Z])@sigilStartDelimiter/, /~([a-z]|[A-Z]+)@sigilStartDelimiter/,
{ {
token: 'sigil.delimiter', token: 'sigil.delimiter',
switchTo: '@sigilContinue.$S2.$S3.$S4.$S5' switchTo: '@sigilContinue.$S2.$S3.$S4.$S5'
@ -498,7 +499,7 @@ export const language = <languages.IMonarchLanguage>{
'sigilStart.noInterpol': [ 'sigilStart.noInterpol': [
[ [
/~([a-zA-Z])@sigilStartDelimiter/, /~([a-z]|[A-Z]+)@sigilStartDelimiter/,
{ {
token: 'sigil.delimiter', token: 'sigil.delimiter',
switchTo: '@sigilContinue.$S2.$S3.$S4.$S5' switchTo: '@sigilContinue.$S2.$S3.$S4.$S5'