Fix formatter

src/check.ts

@@ -38,11 +38,7 @@ export async function activate(context: vscode.ExtensionContext) {
 
         if (ls.status !== 0) {
           const errMsg: string = "Juvix's Error: " + ls.stderr.toString();
-          logger.error(
-            'typechecking-silent provider error' + errMsg,
-            'check.ts'
-          );
-          throw new Error(errMsg);
+          logger.error( errMsg, 'check.ts' );
         }
         return ls.stdout;
       }

src/extension.ts

@@ -21,8 +21,8 @@ import * as vampir from './vampir/tasks';
 export async function activate(context: vscode.ExtensionContext) {
   statusBar.activate(context);
   codelens.activate(context);
-  // syntaxHighlighter.activate(context);
-  // goToDefinition.activate(context);
+  syntaxHighlighter.activate(context);
+  goToDefinition.activate(context);
   hoverInfo.activate(context);
   tasks.activate(context);
   inputMethod.activate(context);

src/formatter.ts

@@ -39,8 +39,8 @@ export function activate(_context: vscode.ExtensionContext) {
         return [vscode.TextEdit.replace(range, stdout)];
       } else {
         const errMsg: string = ls.stderr.toString();
-        logger.error('formatter provider error' + errMsg, 'formatter.ts');
-        throw new Error(errMsg);
+        logger.error(errMsg, 'formatter.ts');
+        return [];
       }
     },
   });
@@ -77,8 +77,9 @@ export function activate(_context: vscode.ExtensionContext) {
         return [vscode.TextEdit.replace(range, stdout)];
       } else {
         const errMsg: string = ls.stderr.toString();
-        throw new Error(errMsg);
+        logger.error(errMsg, 'formatter.ts');
       }
+      return [];
     },
   });
 }

src/highlighting.ts

@@ -13,7 +13,7 @@ import {
   DevHighlightOutput,
   HoverProperty,
 } from './interfaces';
-import { JuvixConfig } from './config';
+import { config } from './config';
 import { spawnSync } from 'child_process';
 
 /*
@@ -30,7 +30,6 @@ map that associates a file path to the corresponding information for that file.
 */
 
 export async function activate(context: vscode.ExtensionContext) {
-  const config = new JuvixConfig();
   if (!config.enableSemanticSyntax.get()) return;
   try {
     const semanticTokensProvider = new Highlighter();
@@ -99,8 +98,6 @@ export class Highlighter implements vscode.DocumentSemanticTokensProvider {
     const content: string = document.getText();
     const contentLines: string[] = content.split('\n');
 
-    const config = new JuvixConfig();
-
     /*
       Call the highlighter
     */

src/judoc.ts

@@ -151,7 +151,7 @@ export class JudocPanel {
       message => {
         switch (message.command) {
           case 'alert':
-            vscode.window.showErrorMessage(message.text);
+            logger.error(message.text, 'judoc');
             return;
         }
       },

src/tasks.ts

@@ -20,8 +20,7 @@ export async function activate(context: vscode.ExtensionContext) {
     const msg =
       'Juvix extension requires at least one workspace open.\n' +
       'Open a folder containing a Juvix project and try again.';
-    vscode.window.showErrorMessage(msg);
-    logger.error(msg);
+    logger.error(msg, 'tasks.ts');
     return;
   }
 

src/utils/assert.ts

@@ -13,6 +13,5 @@ export function assert(condition: () => boolean): void {
   if (!condition()) {
     const msg = `Assert failed: "${condition.toString()}" must be true, but was not!`;
     logger.error(msg);
-    throw new Error(msg);
   }
 }

src/utils/debug.ts

@@ -34,10 +34,10 @@ class Log {
     vscode.window.showWarningMessage(msg);
   }
 
-  public error(message: string, component?: string) {
+  public error(message: string, component?: string, modal:boolean = false) {
     const msg = this.logString(message, component);
     this.outputChannel.error(msg);
-    vscode.window.showErrorMessage(msg);
+    vscode.window.showErrorMessage(msg, {modal : modal });
     throw new Error(msg);
   }
 }

src/utils/fromResource.ts

@@ -46,8 +46,7 @@ export function fromResource<T>(
           value = getValue();
         } else {
           const msg = 'Either an argument or getValue must be provided';
-          logger.error(msg);
-          throw new Error(msg);
+          logger.error(msg, 'fromResource.ts');
         }
         atom.reportChanged();
       });

syntaxes/Juvix.json

@@ -1,9 +1,7 @@
 {
   "name": "Juvix",
   "scopeName": "source.Juvix",
-  "fileTypes": [
-    "Juvix"
-  ],
+  "fileTypes": ["Juvix"],
   "patterns": [
     {
       "include": "#comment"
@@ -13,6 +11,15 @@
     },
     {
       "include": "#number"
+    },
+    {
+      "include": "#keyword"
+    },
+    {
+      "include": "#constant"
+    },
+    {
+      "include": "#operator"
     }
   ],
   "repository": {
@@ -54,23 +61,53 @@
         }
       ]
     },
-    "string" :
-    {
-      "patterns" : [
+    "string": {
+      "patterns": [
         {
-          "match" : "\".*\"",
-          "name" : "string"
+          "match": "\".*\"",
+          "name": "string"
         }
       ]
     },
-    "number" : {
-      "patterns" : [
+    "number": {
+      "patterns": [
+        {
+          "match": "[0-9]+",
+          "name": "number"
+        }
+      ]
+    },
+    "keyword": {
+      "patterns": [
+        {
+          "match": "\\b(let|in|case|type|module|import|open|using|hiding|public|as|terminating|positive|Type|builtin|syntax)\\b",
+          "name": "keyword"
+        },
+        {
+          "name": "axiom",
+          "match": "(;)"
+        },
+        {
+          "name": "keyword",
+          "match": "(:=|:|\\/|->|→|↦|@|\\|)"
+        }
+      ]
+    },
+    "constant": {
+      "patterns": [
+        {
+          "match": "\\b(true|false)\\b",
+          "name": "constant.language"
+        }
+      ]
+    },
+    "operator": {
+      "patterns": [
         {
-          "match" : "[0-9]+",
-          "name" : "number"
+          "match": "(\\+|-|\\*|\\^|\\$|&&|\\!|==|>>|<=|>=)",
+          "name": "function"
         }
       ]
     }
   }
-
 }