Skip to content

Commit 24e00f4

Browse files
wherewherewherewhere
committed
Fix missing 'U8'
1 parent 3aec1cc commit 24e00f4

5 files changed

Lines changed: 40 additions & 37 deletions

File tree

‎dev/index.html‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
4-
<meta charset="UTF-8" />
5-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6-
<title>Vite App</title>
7-
</head>
8-
<body class="replit-ui-theme-root dark">
9-
<div id="editor"></div>
10-
<script type="module" src="./index.ts"></script>
11-
</body>
12-
</html>
3+
4+
<head>
5+
<meta charset="UTF-8" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7+
<title>Vite App</title>
8+
</head>
9+
10+
<body class="replit-ui-theme-root dark">
11+
<div id="editor"></div>
12+
<script type="module" src="./index.ts"></script>
13+
</body>
14+
15+
</html>

‎dev/print-lezer-tree.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Text } from "@codemirror/state"
44
import { Input, NodeType, SyntaxNode, Tree, TreeCursor } from "@lezer/common"
55

66
class StringInput implements Input {
7-
constructor(private readonly input: string) {}
7+
constructor(private readonly input: string) { }
88

99
get length() {
1010
return this.input.length
@@ -66,7 +66,7 @@ export function traverseTree(
6666
}: TreeTraversalOptions,
6767
): void {
6868
if (!(cursor instanceof TreeCursor)) cursor = cursor.cursor()
69-
for (;;) {
69+
for (; ;) {
7070
let node = cursorNode(cursor)
7171
let leave = false
7272
if (node.from <= to && node.to >= from) {
@@ -79,7 +79,7 @@ export function traverseTree(
7979
}
8080
if (!node.isLeaf) continue
8181
}
82-
for (;;) {
82+
for (; ;) {
8383
node = cursorNode(cursor, node.isLeaf)
8484
if (leave && onLeave) if (onLeave(node) === false) return
8585
leave = cursor.type.isAnonymous
@@ -196,10 +196,10 @@ export function printTree(
196196
" " +
197197
(hasRange
198198
? "[" +
199-
colorize(locAt(text, start + node.from), Color.Yellow) +
200-
".." +
201-
colorize(locAt(text, start + node.to), Color.Yellow) +
202-
"]"
199+
colorize(locAt(text, start + node.from), Color.Yellow) +
200+
".." +
201+
colorize(locAt(text, start + node.to), Color.Yellow) +
202+
"]"
203203
: colorize(locAt(text, start + node.from), Color.Yellow))
204204
if (hasRange && node.isLeaf) {
205205
state.output += ": " + colorize(JSON.stringify(inp.read(node.from, node.to)), Color.Green)

‎dev/watch.cjs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const {watch} = require("@marijn/buildtool")
2-
const {resolve} = require("path")
3-
const {options} = require("@codemirror/buildhelper/src/options")
1+
const { watch } = require("@marijn/buildtool")
2+
const { resolve } = require("path")
3+
const { options } = require("@codemirror/buildhelper/src/options")
44

55
let args = process.argv.slice(2)
66

‎src/syntax.grammar‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
| verbatimString
155155
}
156156

157-
regularString { '"' regularStringCharacter* '"' 'u8'? }
157+
regularString { '"' regularStringCharacter* '"' ('U8' | 'u8')? }
158158

159159
regularStringCharacter
160160
{ singleRegularStringCharacter
@@ -165,7 +165,7 @@
165165

166166
singleRegularStringCharacter { !["\\\r\n\u0085\u2028\u2029] }
167167

168-
verbatimString { '@"' verbatimStringCharacter* '"' 'u8'? }
168+
verbatimString { '@"' verbatimStringCharacter* '"' ('U8' | 'u8')? }
169169

170170
verbatimStringCharacter
171171
{ !["]

‎src/tokens.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,31 @@ const
1515
braceR = 125;
1616

1717
export const interpString = new ExternalTokenizer((input) => {
18-
for(let i = 0; ; i++) {
19-
switch(input.next) {
18+
for (let i = 0; ; i++) {
19+
switch (input.next) {
2020
case -1:
21-
if(i > 0) input.acceptToken(interpStringContent);
21+
if (i > 0) input.acceptToken(interpStringContent);
2222
return;
2323

2424
case quote:
25-
if(i > 0) input.acceptToken(interpStringContent);
25+
if (i > 0) input.acceptToken(interpStringContent);
2626
else input.acceptToken(interpStringEnd, 1);
2727
return;
2828

2929
case braceL:
30-
if(input.peek(1) === braceL) input.acceptToken(interpStringContent, 2)
30+
if (input.peek(1) === braceL) input.acceptToken(interpStringContent, 2)
3131
else input.acceptToken(interpStringBrace);
3232
return;
3333

3434
case braceR:
35-
if(input.peek(1) === braceR) input.acceptToken(interpStringContent, 2)
35+
if (input.peek(1) === braceR) input.acceptToken(interpStringContent, 2)
3636
return;
3737

3838
case backslash:
3939
const next = input.peek(1);
40-
if(next === braceL || next === braceR) return;
40+
if (next === braceL || next === braceR) return;
4141
input.advance();
42-
// FALLTHROUGH
42+
// FALLTHROUGH
4343

4444
default:
4545
input.advance();
@@ -48,25 +48,25 @@ export const interpString = new ExternalTokenizer((input) => {
4848
});
4949

5050
export const interpVString = new ExternalTokenizer((input) => {
51-
for(let i = 0; ; i++) {
52-
switch(input.next) {
51+
for (let i = 0; ; i++) {
52+
switch (input.next) {
5353
case -1:
54-
if(i > 0) input.acceptToken(interpVStringContent);
54+
if (i > 0) input.acceptToken(interpVStringContent);
5555
return;
5656

5757
case quote:
58-
if(input.peek(1) === quote) input.acceptToken(interpVStringContent, 2)
59-
else if(i > 0) input.acceptToken(interpVStringContent)
58+
if (input.peek(1) === quote) input.acceptToken(interpVStringContent, 2)
59+
else if (i > 0) input.acceptToken(interpVStringContent)
6060
else input.acceptToken(interpVStringEnd, 1);
6161
return;
6262

6363
case braceL:
64-
if(input.peek(1) === braceL) input.acceptToken(interpVStringContent, 2)
64+
if (input.peek(1) === braceL) input.acceptToken(interpVStringContent, 2)
6565
else input.acceptToken(interpVStringBrace);
6666
return;
6767

6868
case braceR:
69-
if(input.peek(1) === braceR) input.acceptToken(interpVStringContent, 2)
69+
if (input.peek(1) === braceR) input.acceptToken(interpVStringContent, 2)
7070
return;
7171

7272
default:

0 commit comments

Comments
 (0)