Fix "Top-level statements"

Add pp_ignored and pp_shebang

Author: wherewhere

.github/workflows/build-and-publish.yml

@@ -40,7 +40,7 @@ jobs:
           registry: https://www.myget.org/F/where/npm
 
       - name: Upload Pages artifact
-        uses: actions/upload-pages-artifact@v4
+        uses: actions/upload-pages-artifact@v5
         with:
           path: dev/dist
 

dev/index.ts

@@ -6,8 +6,16 @@ import { indentWithTab } from '@codemirror/commands';
 import { csharp, parser } from '../dist/';
 import { printTree } from './print-lezer-tree';
 import { oneDark } from '@codemirror/theme-one-dark';
+import { compressToEncodedURIComponent, decompressFromEncodedURIComponent } from 'lz-string';
 
-const doc = /*`using System;
+function getCodeFromHash() {
+    const hash = location.hash.substring(1);
+    if (hash) {
+        return decompressFromEncodedURIComponent(hash);
+    }
+}
+
+const doc = getCodeFromHash() || /*`using System;
 using System.Reflection;
 
 public sealed class InterrogateHelpUrls
@@ -236,24 +244,56 @@ namespace osu.Game.Rulesets
 const syntax = document.createElement('pre');
 syntax.className = 'ͼo';
 document.getElementById('syntax')!.appendChild(syntax);
+function setTimeoutAsync(timeout?: number) {
+    return new Promise<void>(resolve => setTimeout(resolve, timeout));
+}
 
-new EditorView({
+let count = -1;
+let hashChanged = false;
+const editor = new EditorView({
     state: EditorState.create({
-        doc,
+        doc: doc,
         extensions: [
             basicSetup,
             csharp(),
             oneDark,
             keymap.of([indentWithTab]),
             indentUnit.of('    '),
-            EditorView.updateListener.of(e => {
+            EditorView.updateListener.of(async e => {
                 if (e.docChanged) {
-                    const doc = e.state.doc.toString();
-                    syntax.textContent = printTree(parser.parse(doc), doc);
+                    try {
+                        count++;
+                        const doc = e.state.doc.toString();
+                        syntax.textContent = printTree(parser.parse(doc), doc);
+                        await setTimeoutAsync(500);
+                        if (count != 0) { return; }
+                        location.hash = compressToEncodedURIComponent(doc);
+                        hashChanged = true;
+                    }
+                    finally {
+                        count--;
+                    }
                 }
-            })],
+            })
+        ],
     }),
     parent: document.querySelector('#editor')!,
 });
 
 syntax.textContent = printTree(parser.parse(doc), doc);
+addEventListener('hashchange', () => {
+    if (hashChanged) {
+        hashChanged = false;
+        return;
+    }
+    const code = getCodeFromHash();
+    if (code) {
+        editor.dispatch({
+            changes: {
+                from: 0,
+                to: editor.state.doc.length,
+                insert: code
+            }
+        });
+    }
+});

dev/print-lezer-tree.ts

@@ -183,11 +183,11 @@ export function printTree(
       if (hasPrefix) {
         state.output += (!isTop ? "\n" : "") + state.prefixes.join("")
         if (state.hasNextSibling) {
-          state.output += " ├─ "
-          state.prefixes.push(" │  ")
+          state.output += " ├ "
+          state.prefixes.push(" │")
         } else {
-          state.output += " └─ "
-          state.prefixes.push("    ")
+          state.output += " └ "
+          state.prefixes.push("  ")
         }
       }
       const hasRange = node.from !== node.to

package.json

@@ -46,6 +46,7 @@
     "@lezer/highlight": "^1.0.0",
     "@lezer/lr": "^1.0.0",
     "codemirror": "^6.0.0",
+    "lz-string": "^1.0.0",
     "npm-run-all": "^4.0.0",
     "vite": "^8.0.0"
   },

src/syntax.grammar

@@ -33,6 +33,8 @@
 	nullcoal @right,
 	ternary @right,
 	params,
+	anonMethod,
+	topLevelLocalFunc,
 	arrow @right,
 	assign @right,
 	throw @left,
@@ -198,7 +200,9 @@
 		| pp_conditional
 		| pp_line
 		| pp_diagnostic
+		| pp_ignored
 		| pp_region
+		| pp_shebang
 		| pp_pragma
 		| pp_load
 		| pp_nullable
@@ -223,12 +227,19 @@
 		| 'warning' (whitespace+ ![\n]+)?
 	}
 
+	pp_ignored {
+		':' ![\n]+
+	}
 
 	pp_region {
 		'region' (whitespace+ ![\n]+)?
 		| 'endregion' (whitespace+ ![\n]+)?
 	}
 
+	pp_shebang {
+		'!' ![\n]*
+	}
+
 	pp_line { 'line' whitespace+ ![\n]+ }
 
 	pp_pragma { 'pragma' (whitespace+ ![\n]+)? }
@@ -303,7 +314,7 @@ namespaceOrTypeName {
 
 
 type {
-	(typeName | SimpleType | tupleType) (!typeUnary2 ~elementAccess rankSpecifier+ nullOrPtr? | nullOrPtr)
+	(typeName | SimpleType | tupleType) (!typeUnary2 ~elementAccess rankSpecifier+ nullOrPtr? | nullOrPtr)?
 }
 
 nonArrayType {
@@ -312,8 +323,7 @@ nonArrayType {
 
 nullOrPtr {
 	!typeUnary '*'+
-	|
-	!typeUnary '?'
+	| !typeUnary '?'
 }
 
 arrayType { nonArrayType !typeUnary2 rankSpecifier+ }
@@ -721,7 +731,7 @@ LambdaExpr[@dynamicPrecedence=1] {
 }
 
 anonMethodExpr {
-	kw<"async">? kw<"delegate"> explicitAnonFuncSignature? block
+	kw<"async">? !anonMethod kw<"delegate"> explicitAnonFuncSignature? block
 }
 
 anonFuncSignature {
@@ -913,6 +923,12 @@ stmt {
 	| embeddedStmt
 }
 
+topLevelStmt {
+	topLevelLabeledStmt
+	| topLevelDeclStmt
+	| embeddedStmt
+}
+
 embeddedStmt {
 	block
 	| emptyStmt
@@ -950,6 +966,8 @@ emptyStmt { ';' }
 
 labeledStmt { identifier ':' stmt }
 
+topLevelLabeledStmt { identifier ':' topLevelStmt }
+
 
 // Declaration statement
 
@@ -959,6 +977,12 @@ declStmt {
 	| LocalFuncDecl
 }
 
+topLevelDeclStmt {
+	TopLevelVarDecl
+	| LocalConstDecl
+	| TopLevelLocalFuncDecl
+}
+
 
 // Local variable declaration
 
@@ -972,6 +996,12 @@ LocalVarDecl {
 	| type !varDecl csep1<varDeclarator>
 }
 
+TopLevelVarDecl {
+	kw<"var"> varDesignation !assign '=' expr
+	| kw<"var"> csep1<varDeclarator>
+	| type !varDecl csep1<varDeclarator>
+}
+
 varRefModifier {
 	scoped refReadonly?
 	| refReadonly
@@ -1023,6 +1053,33 @@ localFuncBody {
 	| '=>' ref? expr ';'
 }
 
+TopLevelLocalFuncDecl { attrs? topLevelLocalFuncHeader localFuncBody }
+
+topLevelLocalFuncHeader {
+	topLevelLocalFuncModifiers?
+	(ref ~ref)? type MethodName
+	(!typeParams typeParamList)? !params formalParams
+	typeParamConstraintsClause*
+}
+
+topLevelLocalFuncModifiers {
+	topLevelLocalFuncModifierHead topLevelLocalFuncModifier*
+}
+
+topLevelLocalFuncModifierHead {
+	kw<"async"> !topLevelLocalFunc
+	| kw<"unsafe"> !topLevelLocalFunc
+	| kw<"static"> !topLevelLocalFunc
+	| kw<"extern"> !topLevelLocalFunc
+}
+
+topLevelLocalFuncModifier {
+	kw<"async">
+	| kw<"unsafe">
+	| kw<"static">
+	| kw<"extern">
+}
+
 
 // Expression statement
 
@@ -1211,7 +1268,7 @@ fixedPtrDeclarator { identifier '=' expr }
 // Compilation unit
 
 compilationUnit {
-	externAliasDirective* usingDirective* /*globalAttrs?*/ block* namespaceMemberDecl*
+	externAliasDirective* usingDirective* globalAttrs? topLevelStmt* namespaceMemberDecl*
 }
 
 
@@ -1761,15 +1818,15 @@ fixedSizeBufferDeclarator { identifier delim<'[' expr ']'> }
 
 // Attributes
 
-/*globalAttrs { globalAttrSection+ }
+globalAttrs { globalAttrSection+ }
 
 globalAttrSection {
-	'[' globalAttrTargetSpecifier csep1<attr> ','? ']'
+	delim<'[' globalAttrTargetSpecifier csep1<attr> ','? ']'>
 }
 
 globalAttrTargetSpecifier { globalAttrTarget ':' }
 
-globalAttrTarget { identifier }*/
+globalAttrTarget { kw<"assembly"> | kw<"module"> }
 
 attrs { attrSection+ }
 

yarn.lock

@@ -1544,6 +1544,11 @@ log-symbols@^4.1.0:
     chalk "^4.1.0"
     is-unicode-supported "^0.1.0"
 
+lz-string@^1.0.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941"
+  integrity sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==
+
 magic-string@^0.30.21:
   version "0.30.21"
   resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz"