Autocomplete, and more CM stuff!

src-web/components/Editor/url/extension.ts

@@ -1,43 +1,16 @@
-import { parser } from './url';
-// import { foldNodeProp, foldInside, indentNodeProp } from '@codemirror/language';
-import { styleTags, tags as t } from '@lezer/highlight';
-import { LanguageSupport, LRLanguage } from '@codemirror/language';
 import { completeFromList } from '@codemirror/autocomplete';
-
-const parserWithMetadata = parser.configure({
-  props: [
-    styleTags({
-      Protocol: t.comment,
-      Port: t.attributeName,
-      Host: t.variableName,
-      PathSegment: t.bool,
-      Slash: t.bool,
-      Question: t.attributeName,
-      QueryName: t.attributeName,
-      QueryValue: t.attributeName,
-      Amp: t.comment,
-      Equal: t.comment,
-    }),
-    // indentNodeProp.add({
-    //   Application: (context) => context.column(context.node.from) + context.unit,
-    // }),
-    // foldNodeProp.add({
-    //   Application: foldInside,
-    // }),
-  ],
-});
+import { LanguageSupport, LRLanguage } from '@codemirror/language';
+import { parser } from './url';
 
 const urlLanguage = LRLanguage.define({
-  parser: parserWithMetadata,
-  languageData: {
-    // commentTokens: {line: ";"}
-  },
+  parser,
+  languageData: {},
 });
 
 const exampleCompletion = urlLanguage.data.of({
   autocomplete: completeFromList([
-    { label: 'http://', type: 'keyword' },
-    { label: 'https://', type: 'keyword' },
+    { label: 'http://', type: 'constant' },
+    { label: 'https://', type: 'constant' },
   ]),
 });
 

src-web/components/Editor/url/highlight.ts

@@ -0,0 +1,9 @@
+import { styleTags, tags as t } from '@lezer/highlight';
+
+export const highlight = styleTags({
+  Protocol: t.comment,
+  Port: t.attributeName,
+  Host: t.variableName,
+  Path: t.bool,
+  Query: t.string,
+});

src-web/components/Editor/url/url.grammar

@@ -1,29 +1,18 @@
-@top url { Protocol Host Port? Path Query }
-
-Protocol {
-    "http://" | "https://"
-}
-
-Path {
-  (Slash PathSegment)*
-}
+@top url { Protocol? Host Port? Path? Query? }
 
 Query {
-  Question (QueryPair)*
-}
-
-QueryPair {
-  Amp? QueryName Equal QueryValue
+    "?" queryPair ("&" queryPair)*
 }
 
 @tokens {
+  Protocol { $[a-zA-Z]+ "://" }
+  Path { ("/" $[a-zA-Z0-9\-_.]*)+ }
+  queryPair { ($[a-zA-Z0-9]+ ("=" $[a-zA-Z0-9]*)?) }
   Port { ":" $[0-9]+ }
   Host { $[a-zA-Z0-9-_.]+ }
-  QueryName { $[a-zA-Z0-9-_.]+ }
-  QueryValue { $[a-zA-Z0-9-_./]+ }
-  PathSegment { $[a-zA-Z0-9-_.]+ }
-  Slash { "/" }
-  Question { "?" }
-  Equal { "=" }
-  Amp { "&" }
+
+  // Protocol/host overlaps, so give proto explicit precedence
+  @precedence { Protocol, Host }
 }
+
+@external propSource highlight from "./highlight"

src-web/components/Editor/url/url.terms.ts

@@ -5,12 +5,4 @@ export const
   Host = 3,
   Port = 4,
   Path = 5,
-  Slash = 6,
-  PathSegment = 7,
-  Query = 8,
-  Question = 9,
-  QueryPair = 10,
-  Amp = 11,
-  QueryName = 12,
-  Equal = 13,
-  QueryValue = 14
+  Query = 6

src-web/components/Editor/url/url.ts

@@ -1,16 +1,18 @@
 // This file was generated by lezer-generator. You probably shouldn't edit it.
 import {LRParser} from "@lezer/lr"
+import {highlight} from "./highlight"
 export const parser = LRParser.deserialize({
   version: 14,
-  states: "#xOQOPOOOOOO'#C^'#C^OYOQOOO_OPOOOjOSO'#CkOoOPO'#CaOwOPOOObOPOOOOOO,59V,59VOOOO-E6i-E6iO|OWO'#CdQOOOOOO!XOPO'#CfO!^OWO'#CfOOOO'#Cl'#ClO!cOWO,59OO!nO`O,59QO!sOPO,59QOOOO-E6j-E6jOOOO1G.l1G.lO!xO`O1G.lOOOO7+$W7+$W",
-  stateData: "!}~ObPOcPO~ORRO~OSVOUSOXTP~OVWO~OUSOXTX~OXYO~OZ]O[[OaWX~O]`O~O[aO~OZ]O[[OaWa~O^cO~O]dO~O^eO~O",
-  goto: "}aPPbPPePPiPlPPPPpwRQOTURVRZUT^Y_STRVRXTQ_YRb_",
-  nodeNames: "⚠ url Protocol Host Port Path Slash PathSegment Query Question QueryPair Amp QueryName Equal QueryValue",
-  maxTerm: 19,
+  states: "!jOQOPOOQYOPOOOTOPOOOeOQO'#CbQOOOOOQ`OPOOQ]OPOOOjOPO,58|OrOQO'#CcOwOPO1G.hOOOO,58},58}OOOO-E6a-E6a",
+  stateData: "!S~OQQORPO~OSUOTTOXRO~OYVO~OZWOWUa~OYYO~OZWOWUi~OQR~",
+  goto: "dWPPPPPPX^VSPTUQXVRZX",
+  nodeNames: "⚠ url Protocol Host Port Path Query",
+  maxTerm: 11,
+  propSources: [highlight],
   skippedNodes: [0],
-  repeatNodeCount: 2,
-  tokenData: ")]~R]vwz}!O!P!O!P!P!P!Q#]!Q![!P![!]#y!_!`$X!a!b$^!c!}!P#R#S!P#T#[!P#[#]$c#]#o!P~!POZ~n![VRQVS[W^`}!O!P!O!P!P!P!Q!q!Q![!P!c!}!P#R#S!P#T#o!P`!vV^`}!O!q!O!P!q!P!Q!q!Q![!q!c!}!q#R#S!q#T#o!qa#dV^`UP}!O!q!O!P!q!P!Q!q!Q![!q!c!}!q#R#S!q#T#o!q~#|P!Q![$P~$UPS~!Q![$P~$^O]~~$cOX~o$nXRQVS[W^`}!O!P!O!P!P!P!Q!q!Q![!P!c!}!P#R#S!P#T#h!P#h#i%Z#i#o!Po%fXRQVS[W^`}!O!P!O!P!P!P!Q!q!Q![!P!c!}!P#R#S!P#T#h!P#h#i&R#i#o!Po&^XRQVS[W^`}!O!P!O!P!P!P!Q!q!Q![!P!c!}!P#R#S!P#T#d!P#d#e&y#e#o!Po'UYRQVS[W^`}!O!P!O!P!P!P!Q!q!Q![!P![!]'t!c!}!P#R#S!P#T#g!P#g#h(V#h#o!PP'wP!P!Q'zP'}P!P!Q(QP(VObPo(bWRQVS[W^`}!O!P!O!P!P!P!Q!q!Q![!P![!](z!c!}!P#R#S!P#T#o!PP(}P!P!Q)QP)TP!P!Q)WP)]OcP",
-  tokenizers: [0, 1, 2, 3, 4],
+  repeatNodeCount: 1,
+  tokenData: "%[~RYvwq}!Ov!O!Pv!P!Q!_!Q![!y![!]#u!a!b$T!c!}$Y#R#Sv#T#o$Y~vOZ~P{URP}!Ov!O!Pv!Q![v!c!}v#R#Sv#T#ov~!dVT~}!O!_!O!P!_!P!Q!_!Q![!_!c!}!_#R#S!_#T#o!_R#QVYQRP}!Ov!O!Pv!Q![!y!_!`#g!c!}!y#R#Sv#T#o!yQ#lRYQ!Q![#g!c!}#g#T#o#g~#xP!Q![#{~$QPS~!Q![#{~$YOX~R$aWYQRP}!Ov!O!Pv!Q![!y![!]$y!_!`#g!c!}$Y#R#Sv#T#o$YP$|P!P!Q%PP%SP!P!Q%VP%[OQP",
+  tokenizers: [0, 1],
   topRules: {"url":[0,1]},
-  tokenPrec: 0
+  tokenPrec: 47
 })