Skip to content

Added Curved Quotation handling to scanner and Monaco Static Resource #218

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added Curved Quotation handling to scanner and Monaco Static Resource #218

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
22 changes: 20 additions & 2 deletions expression-src/main/editor/staticresources/monaco/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@
[/(^#.*$)/, 'comment'],

// strings
[/"/, 'string', '@string_double']
[/"/, 'string', '@string_double'],
[/“/, 'string', '@string_curved_left'],
[/”/, 'string', '@string_curved_right']
],

string_double: [
Expand All @@ -122,6 +124,22 @@
[/"/, 'string', '@pop']
],

string_curved_left: [
[/\$\{/, { token: 'delimiter.bracket', next: '@bracketCounting' }],
[/[^\\"$]+/, 'string'],
[/@escapes/, 'string.escape'],
[/\\./, 'string.escape.invalid'],
[/“/, 'string', '@pop']
],

string_curved_right: [
[/\$\{/, { token: 'delimiter.bracket', next: '@bracketCounting' }],
[/[^\\"$]+/, 'string'],
[/@escapes/, 'string.escape'],
[/\\./, 'string.escape.invalid'],
[/”/, 'string', '@pop']
],

bracketCounting: [
[/\{/, 'delimiter.bracket', '@bracketCounting'],
[/\}/, 'delimiter.bracket', '@pop'],
Expand Down Expand Up @@ -202,4 +220,4 @@
}
</script>
</body>
</html>
</html>
7 changes: 6 additions & 1 deletion expression-src/main/src/interpreter/Scanner.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ public with sharing class Scanner {
}

public Scanner(String source) {
this.source = source;
this.source = normalizeCurvedQuotes(source);
}

private String normalizeCurvedQuotes(String input) {
if (input == null) return null;
return input.replace('“', '"').replace('”', '"');
}

public List<Token> scanTokens() {
Expand Down