revert typecheck-silent, add diagonistic (multiple files)

anoma · Aug 30, 2024 · 3d32a30 · 3d32a30
1 parent e6a67a4
commit 3d32a30
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 15 deletions.
diff --git a/src/check.ts b/src/check.ts
@@ -4,13 +4,64 @@
 
 import * as vscode from 'vscode';
 import * as user from './config';
-import { isJuvixFile, runShellCommand } from './utils/base';
+import { isJuvixFile, runShellCommand, getDiagnosticFromError } from './utils/base';
 import { logger } from './utils/debug';
-import {setJuvixCommandStatusBarItem, inProgressJuvixCommandStatusBar, showExecResultJuvixStatusBar } from './statusbar';
+import { setJuvixCommandStatusBarItem, inProgressJuvixCommandStatusBar, showExecResultJuvixStatusBar } from './statusbar';
 
-export async function activate(context: vscode.ExtensionContext) {
+export async function activate(context: vscode.ExtensionContext, diagnosticCollection: vscode.DiagnosticCollection) {
   const config = new user.JuvixConfig();
 
+  const command = 'juvix-mode.typecheck-silent';
+
+  const commandHandler = async (doc: vscode.TextDocument, content: string) => {
+    const activeEditor = vscode.window.activeTextEditor;
+
+    if (activeEditor && activeEditor.document == doc) {
+      if (doc && isJuvixFile(doc)) {
+        const filePath = doc.fileName;
+
+        const typecheckerCall = [
+          config.getJuvixExec(),
+          config.getGlobalFlags(),
+          'typecheck',
+          config.getTypeckeckFlags(),
+          filePath,
+        ].join(' ');
+
+        inProgressJuvixCommandStatusBar('Typecheck');
+        const { stdout, stderr, status } = await runShellCommand(typecheckerCall, content);
+
+        if (status !== 0) {
+          showExecResultJuvixStatusBar(false, 'Typecheck', stderr);
+          const diag = getDiagnosticFromError(stderr);
+          if (diag)
+            diagnosticCollection.set(doc.uri, [diag]);
+        }
+        else {
+          showExecResultJuvixStatusBar(true, 'Typecheck', stdout);
+          diagnosticCollection.delete(doc.uri);
+        }
+        return { stdout, stderr, status };
+      }
+    }
+    return undefined;
+  };
+
+  context.subscriptions.push(
+    vscode.commands.registerCommand(command, commandHandler),
+  );
+
+
+  context.subscriptions.push(
+    vscode.workspace.onDidCloseTextDocument(doc => diagnosticCollection.delete(doc.uri))
+  );
+
+  context.subscriptions.push(
+    vscode.window.onDidChangeActiveTextEditor(_ => {
+      setJuvixCommandStatusBarItem();
+    }
+    ));
+
   switch (config.typecheckOn()) {
     case 'change':
       context.subscriptions.push(

diff --git a/src/extension.ts b/src/extension.ts
@@ -49,10 +49,14 @@ export async function activate(context: vscode.ExtensionContext) {
       tasks,
       repl,
       judoc,
-      check,
       formatter,
     ];
     modules.forEach(module => module.activate(context));
+
+    let juvixDiagnosticCollection = vscode.languages.createDiagnosticCollection('juvix');
+    check.activate(context, juvixDiagnosticCollection);
+    context.subscriptions.push(juvixDiagnosticCollection);
+
     vscode.commands.executeCommand('setContext', 'juvix-mode:ready', true);
   }
 }
diff --git a/src/tasks.ts b/src/tasks.ts
@@ -5,7 +5,7 @@
 import * as vscode from 'vscode';
 import * as user from './config';
 import { logger } from './utils/debug';
-import { setJuvixCommandStatusBarItem, inProgressJuvixCommandStatusBar, showExecResultJuvixStatusBar } from './statusbar';
+import { inProgressJuvixCommandStatusBar, showExecResultJuvixStatusBar } from './statusbar';
 
 export const TASK_TYPE = 'Juvix';
 
@@ -109,12 +109,6 @@ export class JuvixTaskProvider implements vscode.TaskProvider {
         group: vscode.TaskGroup.Build,
         reveal: vscode.TaskRevealKind.Silent,
       },
-      {
-        command: 'typecheck-silent',
-        args: [config.getTypeckeckFlags(), '${file}'],
-        group: vscode.TaskGroup.Build,
-        reveal: vscode.TaskRevealKind.Never,
-      },
       {
         command: 'compile',
         args: [config.getCompilationFlags(), '${file}'],
@@ -233,10 +227,6 @@ export async function JuvixTask(
     case 'update-dependencies':
       exec = new vscode.ShellExecution(JuvixExec + `dependencies update`);
       break;
-    case 'typecheck-silent':
-      args[0] = "typecheck";
-      exec = new vscode.ShellExecution(JuvixExec + ` ${args.join(' ')}`);
-      break;
     default:
       exec = new vscode.ShellExecution(JuvixExec + ` ${input}`);
       break;

diff --git a/src/utils/base.ts b/src/utils/base.ts
@@ -70,3 +70,29 @@ export async function runShellCommand(command: string, input?: string): Promise<
     });
   });
 }
+
+const regexJuvixError = /(?<file>.*):(?<line>\d+):(?<begin_col>\d+)-?(?<end_col>\d+)?:\s(?<err_type>.*):\s(?<msg>((\n|.)*))/g;
+
+export function getDiagnosticFromError(output: string): vscode.Diagnostic | undefined {
+    const { file, line, begin_col, end_col, err_type, msg } = regexJuvixError.exec(output)!.groups!;
+    if (!msg || !line || !begin_col) return undefined;
+    const range = new vscode.Range(
+      new vscode.Position(parseInt(line) - 1 , parseInt(begin_col) - 1 ),
+      new vscode.Position(parseInt(line) - 1 , parseInt(end_col ?? begin_col) - 1 ),
+    );
+    let severity;
+    switch (err_type) {
+      case 'error':
+        severity = vscode.DiagnosticSeverity.Error;
+        break;
+      case 'warning':
+        severity = vscode.DiagnosticSeverity.Warning;
+        break;
+      case 'info':
+        severity = vscode.DiagnosticSeverity.Information;
+        break;
+    }
+    let diag = new vscode.Diagnostic(range, msg, severity);
+    diag.source = 'Juvix';
+    return diag;
+  }