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

Merge pull request #2806 from jonatanklosko/jk-elixir-sigils

Browse source 
Update Elixir tokenization of sigil modifiers
This commit is contained in:
Henning Dieterichs 2021-12-08 13:10:13 +01:00 • committed by GitHub
commit 86cff74999
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -314,6 +314,17 @@ testTokenization('elixir', [
] ]
} }
], ],
// Sigils (modifiers)
[
{
line: '~X/custom/az09',
tokens: [
{ startIndex: 0, type: 'sigil.delimiter.elixir' },
{ startIndex: 3, type: 'sigil.elixir' },
{ startIndex: 9, type: 'sigil.delimiter.elixir' }
]
}
],
// Module attributes // Module attributes
[ [
{ {

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

@ -109,7 +109,7 @@ export const language = <languages.IMonarchLanguage>{
// Matches any of the operator names: // Matches any of the operator names:
// <<< >>> ||| &&& ^^^ ~~~ === !== ~>> <~> |~> <|> == != <= >= && || \\ <> ++ -- |> =~ -> <- ~> <~ :: .. = < > + - * / | . ^ & ! // <<< >>> ||| &&& ^^^ ~~~ === !== ~>> <~> |~> <|> == != <= >= && || \\ <> ++ -- |> =~ -> <- ~> <~ :: .. = < > + - * / | . ^ & !
operator: operator:
/-[->]?|!={0,2}|\*|\/|\\\\|&{1,3}|\.\.?|\^(?:\^\^)?|\+\+?|<(?:-|<<|=|>|\|>|~>?)?|=~|={1,3}|>(?:=|>>)?|\|~>|\|>|\|{1,3}|~>>?|~~~|::/, /-[->]?|!={0,2}|\*{1,2}|\/|\\\\|&{1,3}|\.\.?|\^(?:\^\^)?|\+\+?|<(?:-|<<|=|>|\|>|~>?)?|=~|={1,3}|>(?:=|>>)?|\|~>|\|>|\|{1,3}|~>>?|~~~|::/,
// See https://hexdocs.pm/elixir/syntax-reference.html#variables // See https://hexdocs.pm/elixir/syntax-reference.html#variables
variableName: /[a-z_][a-zA-Z0-9_]*[?!]?/, variableName: /[a-z_][a-zA-Z0-9_]*[?!]?/,
@ -125,6 +125,7 @@ export const language = <languages.IMonarchLanguage>{
sigilSymmetricDelimiter: /"""|'''|"|'|\/|\|/, sigilSymmetricDelimiter: /"""|'''|"|'|\/|\|/,
sigilStartDelimiter: /@sigilSymmetricDelimiter|<|\{|\[|\(/, sigilStartDelimiter: /@sigilSymmetricDelimiter|<|\{|\[|\(/,
sigilEndDelimiter: /@sigilSymmetricDelimiter|>|\}|\]|\)/, sigilEndDelimiter: /@sigilSymmetricDelimiter|>|\}|\]|\)/,
sigilModifiers: /[a-zA-Z0-9]*/,
decimal: /\d(?:_?\d)*/, decimal: /\d(?:_?\d)*/,
hex: /[0-9a-fA-F](_?[0-9a-fA-F])*/, hex: /[0-9a-fA-F](_?[0-9a-fA-F])*/,
@ -387,7 +388,7 @@ export const language = <languages.IMonarchLanguage>{
'sigilContinue.interpol.s': [ 'sigilContinue.interpol.s': [
[ [
/(@sigilEndDelimiter)[a-zA-Z]*/, /(@sigilEndDelimiter)@sigilModifiers/,
{ {
cases: { cases: {
'$1==$S5': { token: 'string.delimiter', next: '@pop' }, '$1==$S5': { token: 'string.delimiter', next: '@pop' },
@ -412,7 +413,7 @@ export const language = <languages.IMonarchLanguage>{
// Ignore escaped sigil end // Ignore escaped sigil end
[/(^|[^\\])\\@sigilEndDelimiter/, 'string'], [/(^|[^\\])\\@sigilEndDelimiter/, 'string'],
[ [
/(@sigilEndDelimiter)[a-zA-Z]*/, /(@sigilEndDelimiter)@sigilModifiers/,
{ {
cases: { cases: {
'$1==$S5': { token: 'string.delimiter', next: '@pop' }, '$1==$S5': { token: 'string.delimiter', next: '@pop' },
@ -435,7 +436,7 @@ export const language = <languages.IMonarchLanguage>{
'sigilContinue.interpol.r': [ 'sigilContinue.interpol.r': [
[ [
/(@sigilEndDelimiter)[a-zA-Z]*/, /(@sigilEndDelimiter)@sigilModifiers/,
{ {
cases: { cases: {
'$1==$S5': { token: 'regexp.delimiter', next: '@pop' }, '$1==$S5': { token: 'regexp.delimiter', next: '@pop' },
@ -460,7 +461,7 @@ export const language = <languages.IMonarchLanguage>{
// Ignore escaped sigil end // Ignore escaped sigil end
[/(^|[^\\])\\@sigilEndDelimiter/, 'regexp'], [/(^|[^\\])\\@sigilEndDelimiter/, 'regexp'],
[ [
/(@sigilEndDelimiter)[a-zA-Z]*/, /(@sigilEndDelimiter)@sigilModifiers/,
{ {
cases: { cases: {
'$1==$S5': { token: 'regexp.delimiter', next: '@pop' }, '$1==$S5': { token: 'regexp.delimiter', next: '@pop' },
@ -484,7 +485,7 @@ export const language = <languages.IMonarchLanguage>{
'sigilContinue.interpol': [ 'sigilContinue.interpol': [
[ [
/(@sigilEndDelimiter)[a-zA-Z]*/, /(@sigilEndDelimiter)@sigilModifiers/,
{ {
cases: { cases: {
'$1==$S5': { token: 'sigil.delimiter', next: '@pop' }, '$1==$S5': { token: 'sigil.delimiter', next: '@pop' },
@ -509,7 +510,7 @@ export const language = <languages.IMonarchLanguage>{
// Ignore escaped sigil end // Ignore escaped sigil end
[/(^|[^\\])\\@sigilEndDelimiter/, 'sigil'], [/(^|[^\\])\\@sigilEndDelimiter/, 'sigil'],
[ [
/(@sigilEndDelimiter)[a-zA-Z]*/, /(@sigilEndDelimiter)@sigilModifiers/,
{ {
cases: { cases: {
'$1==$S5': { token: 'sigil.delimiter', next: '@pop' }, '$1==$S5': { token: 'sigil.delimiter', next: '@pop' },