@valtzu/codemirror-lang-el 0.2.1 → 0.2.3

package/README.md

@@ -13,7 +13,7 @@
     "codemirror": "https://esm.sh/codemirror@6.0.1",
     "@codemirror/autocomplete": "https://esm.sh/@codemirror/autocomplete@6.9.0",
     "@codemirror/view": "https://esm.sh/@codemirror/view@6.17.1",
-    "@valtzu/codemirror-lang-el": "https://esm.sh/@valtzu/codemirror-lang-el@0.1.13"
+    "@valtzu/codemirror-lang-el": "https://esm.sh/@valtzu/codemirror-lang-el@0.2.3"
   }
 }  
 </script>
@@ -27,7 +27,16 @@ let editor = new EditorView({
     extensions: [
         basicSetup,
         keymap.of([{key: "Tab", run: acceptCompletion}]),
-        expressionlanguage({ identifiers: ['foo', 'bar'], functions: {'smh': [], smash_my_head: ['object']} })
+        expressionlanguage({
+          identifiers: [
+            { name: 'foo', info: 'Foo is a variable' },
+            { name: 'bar' }
+          ],
+          functions: [
+            { name: 'smh' },
+            { name: 'smash_my_head', args: ['object'] },
+          ],
+        })
     ],   
     parent: document.getElementById('editor'),
 });

package/dist/index.cjs

@@ -5,6 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var lr = require('@lezer/lr');
 var language = require('@codemirror/language');
 var highlight = require('@lezer/highlight');
+var lint = require('@codemirror/lint');
+var view = require('@codemirror/view');
 
 // This file was generated by lezer-generator. You probably shouldn't edit it.
 const parser = lr.LRParser.deserialize({
@@ -27,6 +29,53 @@ const parser = lr.LRParser.deserialize({
 });
 
 const identifier = /^[a-zA-Z_]+[a-zA-Z_0-9]*$/;
+const isFunction = (identifier, config) => { var _a; return (_a = config.functions) === null || _a === void 0 ? void 0 : _a.find(fn => fn.name === identifier); };
+const isVariable = (identifier, config) => { var _a; return (_a = config.identifiers) === null || _a === void 0 ? void 0 : _a.find(variable => variable.name === identifier); };
+const expressionLanguageLinter = (config) => lint.linter(view => {
+    let diagnostics = [];
+    language.syntaxTree(view.state).cursor().iterate(node => {
+        if (node.name == "Identifier") {
+            const identifier = view.state.sliceDoc(node.from, node.to);
+            if (!isFunction(identifier, config) && !isVariable(identifier, config)) {
+                diagnostics.push({
+                    from: node.from,
+                    to: node.to,
+                    severity: 'error',
+                    message: `Identifier "${identifier}" not found`,
+                });
+            }
+        }
+    });
+    return diagnostics;
+});
+const keywordTooltip = (config) => view.hoverTooltip((view, pos, side) => {
+    var _a, _b;
+    let { from, to, text } = view.state.doc.lineAt(pos);
+    let start = pos, end = pos;
+    while (start > from && /\w/.test(text[start - from - 1]))
+        start--;
+    while (end < to && /\w/.test(text[end - from]))
+        end++;
+    if (start == pos && side < 0 || end == pos && side > 0) {
+        return null;
+    }
+    const keyword = text.slice(start - from, end - from);
+    const info = (_b = ((_a = isFunction(keyword, config)) !== null && _a !== void 0 ? _a : isVariable(keyword, config))) === null || _b === void 0 ? void 0 : _b.info;
+    if (!info) {
+        return null;
+    }
+    return {
+        pos: start,
+        end,
+        above: true,
+        create(view) {
+            let dom = document.createElement("div");
+            dom.textContent = info;
+            dom.className = 'cm-diagnostic';
+            return { dom };
+        },
+    };
+});
 const ELLanguage = language.LRLanguage.define({
     parser: parser.configure({
         props: [
@@ -86,7 +135,7 @@ function expressionLanguageCompletionFor(config, context) {
     if (tree.name == 'String') {
         return null;
     }
-    if (tree.prevSibling && !['Operator', 'OperatorKeyword', 'Punctuation', 'NullSafe', 'NullCoalescing'].includes(tree.prevSibling.name)) {
+    if (tree.prevSibling && !['Operator', 'OperatorKeyword', 'Punctuation', 'NullSafe', 'NullCoalescing', 'OpeningBracket'].includes(tree.prevSibling.name)) {
         return completeOperatorKeyword(state, config, tree, tree.from, pos);
     }
     if (tree.name == "Identifier") {
@@ -100,8 +149,14 @@ function expressionLanguageCompletionSourceWith(config) {
     return (context) => expressionLanguageCompletionFor(config, context);
 }
 function expressionlanguage(config = {}, extensions = []) {
-    return new language.LanguageSupport(ELLanguage, [ELLanguage.data.of({ autocomplete: expressionLanguageCompletionSourceWith(config) }), ...extensions]);
+    return new language.LanguageSupport(ELLanguage, [
+        ELLanguage.data.of({ autocomplete: expressionLanguageCompletionSourceWith(config) }),
+        expressionLanguageLinter(config),
+        keywordTooltip(config),
+        ...extensions,
+    ]);
 }
 
 exports.ELLanguage = ELLanguage;
 exports.expressionlanguage = expressionlanguage;
+exports.keywordTooltip = keywordTooltip;

package/dist/index.d.cts

@@ -12,6 +12,7 @@ interface ExpressionLanguageConfig {
     }[];
     operatorKeywords?: readonly string[];
 }
+declare const keywordTooltip: (config: ExpressionLanguageConfig) => import("@codemirror/state").Extension;
 declare const ELLanguage: LRLanguage;
 declare function expressionlanguage(config?: ExpressionLanguageConfig, extensions?: Array<any>): LanguageSupport;
-export { ExpressionLanguageConfig, ELLanguage, expressionlanguage };
+export { ExpressionLanguageConfig, keywordTooltip, ELLanguage, expressionlanguage };

package/dist/index.d.ts

@@ -12,6 +12,7 @@ interface ExpressionLanguageConfig {
     }[];
     operatorKeywords?: readonly string[];
 }
+declare const keywordTooltip: (config: ExpressionLanguageConfig) => import("@codemirror/state").Extension;
 declare const ELLanguage: LRLanguage;
 declare function expressionlanguage(config?: ExpressionLanguageConfig, extensions?: Array<any>): LanguageSupport;
-export { ExpressionLanguageConfig, ELLanguage, expressionlanguage };
+export { ExpressionLanguageConfig, keywordTooltip, ELLanguage, expressionlanguage };

package/dist/index.js

@@ -1,6 +1,8 @@
 import { LRParser } from '@lezer/lr';
 import { LRLanguage, indentNodeProp, delimitedIndent, foldNodeProp, foldInside, LanguageSupport, syntaxTree } from '@codemirror/language';
 import { styleTags, tags } from '@lezer/highlight';
+import { linter } from '@codemirror/lint';
+import { hoverTooltip } from '@codemirror/view';
 
 // This file was generated by lezer-generator. You probably shouldn't edit it.
 const parser = LRParser.deserialize({
@@ -23,6 +25,53 @@ const parser = LRParser.deserialize({
 });
 
 const identifier = /^[a-zA-Z_]+[a-zA-Z_0-9]*$/;
+const isFunction = (identifier, config) => { var _a; return (_a = config.functions) === null || _a === void 0 ? void 0 : _a.find(fn => fn.name === identifier); };
+const isVariable = (identifier, config) => { var _a; return (_a = config.identifiers) === null || _a === void 0 ? void 0 : _a.find(variable => variable.name === identifier); };
+const expressionLanguageLinter = (config) => linter(view => {
+    let diagnostics = [];
+    syntaxTree(view.state).cursor().iterate(node => {
+        if (node.name == "Identifier") {
+            const identifier = view.state.sliceDoc(node.from, node.to);
+            if (!isFunction(identifier, config) && !isVariable(identifier, config)) {
+                diagnostics.push({
+                    from: node.from,
+                    to: node.to,
+                    severity: 'error',
+                    message: `Identifier "${identifier}" not found`,
+                });
+            }
+        }
+    });
+    return diagnostics;
+});
+const keywordTooltip = (config) => hoverTooltip((view, pos, side) => {
+    var _a, _b;
+    let { from, to, text } = view.state.doc.lineAt(pos);
+    let start = pos, end = pos;
+    while (start > from && /\w/.test(text[start - from - 1]))
+        start--;
+    while (end < to && /\w/.test(text[end - from]))
+        end++;
+    if (start == pos && side < 0 || end == pos && side > 0) {
+        return null;
+    }
+    const keyword = text.slice(start - from, end - from);
+    const info = (_b = ((_a = isFunction(keyword, config)) !== null && _a !== void 0 ? _a : isVariable(keyword, config))) === null || _b === void 0 ? void 0 : _b.info;
+    if (!info) {
+        return null;
+    }
+    return {
+        pos: start,
+        end,
+        above: true,
+        create(view) {
+            let dom = document.createElement("div");
+            dom.textContent = info;
+            dom.className = 'cm-diagnostic';
+            return { dom };
+        },
+    };
+});
 const ELLanguage = LRLanguage.define({
     parser: parser.configure({
         props: [
@@ -82,7 +131,7 @@ function expressionLanguageCompletionFor(config, context) {
     if (tree.name == 'String') {
         return null;
     }
-    if (tree.prevSibling && !['Operator', 'OperatorKeyword', 'Punctuation', 'NullSafe', 'NullCoalescing'].includes(tree.prevSibling.name)) {
+    if (tree.prevSibling && !['Operator', 'OperatorKeyword', 'Punctuation', 'NullSafe', 'NullCoalescing', 'OpeningBracket'].includes(tree.prevSibling.name)) {
         return completeOperatorKeyword(state, config, tree, tree.from, pos);
     }
     if (tree.name == "Identifier") {
@@ -96,7 +145,12 @@ function expressionLanguageCompletionSourceWith(config) {
     return (context) => expressionLanguageCompletionFor(config, context);
 }
 function expressionlanguage(config = {}, extensions = []) {
-    return new LanguageSupport(ELLanguage, [ELLanguage.data.of({ autocomplete: expressionLanguageCompletionSourceWith(config) }), ...extensions]);
+    return new LanguageSupport(ELLanguage, [
+        ELLanguage.data.of({ autocomplete: expressionLanguageCompletionSourceWith(config) }),
+        expressionLanguageLinter(config),
+        keywordTooltip(config),
+        ...extensions,
+    ]);
 }
 
-export { ELLanguage, expressionlanguage };
+export { ELLanguage, expressionlanguage, keywordTooltip };

package/package.json

@@ -17,10 +17,12 @@
   "dependencies": {
     "@codemirror/autocomplete": "^6.9.0",
     "@codemirror/language": "^6.0.0",
+    "@codemirror/lint": "^6.4.2",
     "@lezer/highlight": "^1.0.0",
     "@lezer/lr": "^1.0.0"
   },
   "devDependencies": {
+    "@codemirror/state": "^6.2.1",
     "@lezer/generator": "^1.0.0",
     "@types/mocha": "^10.0.1",
     "ist": "^1.1.7",
@@ -39,5 +41,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "0.2.1"
+  "version": "0.2.3"
 }