From 383137c190cab040d2609f8295ef822c3917b88d Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kristof@marussy.com>
Date: Sat, 19 Nov 2022 14:00:12 +0100
Subject: feat(language): numeric expressions

---
 subprojects/frontend/src/language/problemLanguageSupport.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'subprojects/frontend/src/language/problemLanguageSupport.ts')

diff --git a/subprojects/frontend/src/language/problemLanguageSupport.ts b/subprojects/frontend/src/language/problemLanguageSupport.ts
index a96b5402..cde8b157 100644
--- a/subprojects/frontend/src/language/problemLanguageSupport.ts
+++ b/subprojects/frontend/src/language/problemLanguageSupport.ts
@@ -21,11 +21,12 @@ const parserWithMetadata = parser.configure({
     styleTags({
       LineComment: t.lineComment,
       BlockComment: t.blockComment,
-      'problem class enum pred indiv scope': t.definitionKeyword,
+      'problem class enum pred individual scope': t.definitionKeyword,
       'abstract extends refers contains container opposite': t.modifier,
       'default error contained containment': t.modifier,
       'true false unknown error': t.operatorKeyword,
-      'may must current count': t.operatorKeyword,
+      'may must current': t.operatorKeyword,
+      'sum prod min max': t.operatorKeyword,
       // 'new delete': t.keyword,
       NotOp: t.operator,
       UnknownOp: t.operator,
@@ -42,13 +43,14 @@ const parserWithMetadata = parser.configure({
       '( )': t.paren,
       '[ ]': t.squareBracket,
       '. .. , :': t.separator,
-      '<-> ==>': t.definitionOperator,
+      '<-> = -> ==>': t.definitionOperator,
     }),
     indentNodeProp.add({
       ProblemDeclaration: indentDeclaration,
       UniqueDeclaration: indentDeclaration,
       ScopeDeclaration: indentDeclaration,
       PredicateBody: indentPredicateOrRule,
+      FunctionBody: indentPredicateOrRule,
       // RuleBody: indentPredicateOrRule,
       BlockComment: indentBlockComment,
     }),
@@ -57,6 +59,7 @@ const parserWithMetadata = parser.configure({
       EnumBody: foldInside,
       ParameterList: foldInside,
       PredicateBody: foldInside,
+      FunctionBody: foldInside,
       // RuleBody: foldInside,
       Conjunction: foldConjunction,
       // Consequent: foldWholeNode,
@@ -77,7 +80,7 @@ const problemLanguage = LRLanguage.define({
       },
       line: '%',
     },
-    indentOnInput: /^\s*(?:\{|\}|\(|\)|;|\.)$/,
+    indentOnInput: /^\s*(?:\{|\}|\(|\)|->|;|\.)$/,
   },
 });
 
-- 
cgit v1.2.3-54-g00ecf