minor

client/src/ui/lib/editAutomapper.svelte

@@ -2,21 +2,15 @@
   import { onMount } from "svelte"
   import { automappers, server } from "../global"
   import { TrashCan as TrashIcon, Add as AddIcon } from "carbon-icons-svelte"
-  import { showError, showInfo, showWarning } from "./dialog"
-  import { Button } from 'carbon-components-svelte'
+  import { clearDialog, showError, showInfo, showWarning } from "./dialog"
+  import { Button, TextInput } from 'carbon-components-svelte'
   import { createEventDispatcher } from 'svelte'
 
   import { basicSetup } from "codemirror"
   import { EditorState } from "@codemirror/state"
   import { EditorView } from "@codemirror/view"
   import { DDNetRules } from './lang-ddnet_rules/index'
-
-  import {
-    lint as lintAutomapper,
-    LintLevel,
-    lintToString,
-  } from '../../twmap/automap'
-import { DDNetRulesLinter } from "./lang-ddnet_rules/lint";
+  import { DDNetRulesLinter } from "./lang-ddnet_rules/lint"
 
   const dispatch = createEventDispatcher()
 
@@ -70,19 +64,8 @@ import { DDNetRulesLinter } from "./lang-ddnet_rules/lint";
 
     const str = view.state.doc.toString()
 
-    const lints = lintAutomapper(str)
-    const errs = lints.filter(l => l.level === LintLevel.Error)
-
-    for (const lint of lints) {
-      await showError(lintToString(lint))
-    }
-
-    if (errs.length > 0) {
-      const resp = await showWarning(`The automapper contains ${errs.length} error(s). Proceed?`, 'yesno')
-      if (!resp) return
-    }
-
     try {
+      showInfo("Uploading...")
       const resp = await $server.query('uploadautomapper', {
         image: selected,
         content: str
@@ -96,10 +79,7 @@ import { DDNetRulesLinter } from "./lang-ddnet_rules/lint";
       return
     }
 
-    showInfo(
-      `Uploaded ${$automappers[selected].length} rules for '${selected}'.`,
-      'closable'
-    )
+    clearDialog()
     changed = false
   }
 
@@ -161,8 +141,8 @@ import { DDNetRulesLinter } from "./lang-ddnet_rules/lint";
   <div class="right">
     <div class="editor hljs" bind:this={editor}></div>
     <div class="controls">
-      <button class="default large" on:click={onClose}>Close</button>
-      <button class="primary large" on:click={onSave} disabled={selected === null}>Save</button>
+      <Button size="small" kind="secondary" on:click={onClose}>Close</Button>
+      <Button size="small" on:click={onSave} disabled={selected === null}>Save</Button>
     </div>
   </div>
 </div>

client/src/ui/lib/lang-ddnet_rules/index.js

@@ -12,7 +12,7 @@ const parser = LRParser.deserialize({
   maxTerm: 45,
   skippedNodes: [0,1],
   repeatNodeCount: 5,
-  tokenData: "/`~RaYZ!Wpq!]st!b{|!y}!O!y!O!P#S!Q![#x!g!h$Y!h!i$w!k!l%`!p!q&i!q!r+b!r!s+m!t!u,O!z!{-e!{!|.S!}#O.q~!]OU~~!bO{~~!gSP~OY!bZ;'S!b;'S;=`!s<%lO!b~!vP;=`<%l!bQ!|Q!O!P#S!Q![#jQ#VP!Q![#YQ#_QpQuv#e!Q![#YQ#jOpQQ#oRpQuv#e!O!P#Y!Q![#jR$PRpQ^Puv#e!O!P#Y!Q![#x~$]P!o!p$`~$cP!r!s$f~$iP!v!w$l~$oP!{!|$r~$wOg~~$zP!w!x$}~%QP!n!o%T~%WP!n!o%Z~%`Oh~~%cQ!p!q%i#b#c&Q~%lP!f!g%o~%rP!g!h%u~%xP!z!{%{~&QOj~~&TP#W#X&W~&ZP#X#Y&^~&aP#l#m&d~&iO]~~&lR!q!r&u#X#Y(O#c#d(m~&xQ!p!q'O!v!w'Z~'RP!g!h'U~'ZO|~~'^P!k!l'a~'dP!p!q'g~'jP!f!g'm~'pP!g!h's~'vP!z!{'y~(OOk~~(RP#k#l(U~(XP!t!u([~(_P#i#j(b~(eP#b#c(h~(mO}~~(pQ!f!g(v!n!o*Z~(yP#X#Y(|~)PP#Y#Z)S~)VP#T#U)Y~)]P#i#j)`~)cP#`#a)f~)iP#h#i)l~)oP!t!u)r~)uP#i#j)x~){P#`#a*O~*RP#X#Y*U~*ZOr~~*^P#T#U*a~*dP#m#n*g~*jP#X#Y*m~*pP#f#g*s~*vP!e!f*y~*|P#c#d+P~+SP#d#e+V~+YP#m#n+]~+bOY~~+eP!t!u+h~+mOm~~+pP#c#d+s~+vP#g#h+y~,OOe~~,RQ!q!r,X#T#U,v~,[P!v!w,_~,bP!c!d,e~,hP!v!w,k~,nP!g!h,q~,vOc~~,yP#b#c,|~-PP#W#X-S~-VP#c#d-Y~-]P#a#b-`~-eOo~~-hP!h!i-k~-nP!n!o-q~-tP!k!l-w~-zP!r!s-}~.SOa~~.VP!h!i.Y~.]P!n!o.`~.cP!k!l.f~.iP!r!s.l~.qOb~~.tTO#P.q#P#Q/T#Q;'S.q;'S;=`/Y<%lO.q~/YOT~~/]P;=`<%l.q",
+  tokenData: "/Q~RaYZ!Wpq!]st!b{|!y}!O!y!O!P#S!Q![#j!g!h#z!h!i$i!k!l%Q!p!q&Z!q!r+S!r!s+_!t!u+p!z!{-V!{!|-t!}#O.c~!]OU~~!bO{~~!gSP~OY!bZ;'S!b;'S;=`!s<%lO!b~!vP;=`<%l!bR!|Q!O!P#S!Q![#jQ#VP!Q![#YQ#_QpQuv#e!Q![#YQ#jOpQR#qRpQ^Puv#e!O!P#Y!Q![#j~#}P!o!p$Q~$TP!r!s$W~$ZP!v!w$^~$aP!{!|$d~$iOg~~$lP!w!x$o~$rP!n!o$u~$xP!n!o${~%QOh~~%TQ!p!q%Z#b#c%r~%^P!f!g%a~%dP!g!h%g~%jP!z!{%m~%rOj~~%uP#W#X%x~%{P#X#Y&O~&RP#l#m&U~&ZO]~~&^R!q!r&g#X#Y'p#c#d(_~&jQ!p!q&p!v!w&{~&sP!g!h&v~&{O|~~'OP!k!l'R~'UP!p!q'X~'[P!f!g'_~'bP!g!h'e~'hP!z!{'k~'pOk~~'sP#k#l'v~'yP!t!u'|~(PP#i#j(S~(VP#b#c(Y~(_O}~~(bQ!f!g(h!n!o){~(kP#X#Y(n~(qP#Y#Z(t~(wP#T#U(z~(}P#i#j)Q~)TP#`#a)W~)ZP#h#i)^~)aP!t!u)d~)gP#i#j)j~)mP#`#a)p~)sP#X#Y)v~){Or~~*OP#T#U*R~*UP#m#n*X~*[P#X#Y*_~*bP#f#g*e~*hP!e!f*k~*nP#c#d*q~*tP#d#e*w~*zP#m#n*}~+SOY~~+VP!t!u+Y~+_Om~~+bP#c#d+e~+hP#g#h+k~+pOe~~+sQ!q!r+y#T#U,h~+|P!v!w,P~,SP!c!d,V~,YP!v!w,]~,`P!g!h,c~,hOc~~,kP#b#c,n~,qP#W#X,t~,wP#c#d,z~,}P#a#b-Q~-VOo~~-YP!h!i-]~-`P!n!o-c~-fP!k!l-i~-lP!r!s-o~-tOa~~-wP!h!i-z~-}P!n!o.Q~.TP!k!l.W~.ZP!r!s.^~.cOb~~.fTO#P.c#P#Q.u#Q;'S.c;'S;=`.z<%lO.c~.zOT~~.}P;=`<%l.c",
   tokenizers: [0, 1],
   topRules: {"file":[0,2]},
   tokenPrec: 238

codemirror-lang-ddnet_rules/.gitignore

@@ -1,5 +1,3 @@
 /node_modules
 package-lock.json
 /dist
-/src/*.js
-/src/*.d.ts

codemirror-lang-ddnet_rules/src/syntax.grammar

@@ -23,7 +23,7 @@ NoLayerCopy   { "NoLayerCopy" EndLine }
   Comment { "#" ![\n]* }
   space { " " }
   EndLine { "\n" }
-  Int { @digit+ }
+  Int { $[+-]? @digit+ }
   Float { $[+-]? (@digit+ ("." @digit*)? | "." @digit+) "%"? }
   HeaderTok { "[" ![\]]* "]" }
 

codemirror-lang-ddnet_rules/src/syntax.grammar.d.ts

@@ -0,0 +1,3 @@
+import {LRParser} from "@lezer/lr"
+
+export declare const parser: LRParser