fix bug in linter

Author: barakliato

src/clojureLintingProvider.ts

@@ -5,6 +5,7 @@ import { resolve } from 'dns';
 import { Diagnostic, Range, TextDocument } from 'vscode';
 import { cljParser } from './cljParser';
 import { CLOJURE_MODE } from './clojureMode';
+import { handleError } from './clojureEval';
 
 interface LinterWarningResult {
 
@@ -59,23 +60,32 @@ const infoSeverity: string[] = ["no-ns-form-found",
 
 export class ClojureLintingProvider {
 
+	private outputChannel: vscode.OutputChannel;
+
+	constructor(channel: vscode.OutputChannel) {
+		this.outputChannel = channel;
+	}
+
 	private getLintCommand(ns): string {		
+		console.log(ns);
 		return `(do (require '[eastwood.lint])
 					(require '[clojure.data.json])					
-					(-> ;(eastwood.lint/lint {:namespaces ['${ns}]}) 	
-						(eastwood.lint/lint {:namespaces ['madlan.server.sms-api]}) 						
+					(-> (eastwood.lint/lint {:namespaces ['${ns}]})
 						(select-keys [:warnings :err :err-data])
-						(update :warnings (fn [x] (map #(select-keys % [:msg :line :column :linter]) x)))	
+						(update :warnings (fn [x] (map #(select-keys % [:msg :line :column :linter]) x)))
 						(update :err-data :exception)
-						(update :err-data Throwable->map)						
-						(update :err-data #(select-keys % [:cause :data]))
+						((fn [data]
+							 (if-let [err-data (:err-data data)]
+									 (-> data
+										 (update :err-data Throwable->map)						
+										 (update :err-data #(select-keys % [:cause :data])))
+									 data)))
 						(clojure.data.json/write-str)))`;
 	}	
 
 	private diagnosticCollection: vscode.DiagnosticCollection;	
 
-	private parseLintSuccessResponse(response: string): LinterResult {
-		
+	private parseLintSuccessResponse(response: string): LinterResult {		
 		const parsedToString = JSON.parse(response);		
 		return JSON.parse(parsedToString);		
 	}
@@ -130,9 +140,16 @@ export class ClojureLintingProvider {
 						nreplClient.evaluate(command)
 								   .then(result => {
 											try {												
-												let lintResult: LinterResult = this.parseLintSuccessResponse(result[0].value);														
-												const diagnostics = this.createDiagnosticCollectionFromLintResult(textDocument, lintResult);
-												this.diagnosticCollection.set(textDocument.uri, diagnostics);
+												if(!!result[0].ex) {
+													handleError(this.outputChannel, 
+														new vscode.Selection(0,0,0,0), 
+														false, 
+														result[0].session);													
+												} else {
+													let lintResult: LinterResult = this.parseLintSuccessResponse(result[0].value);
+													const diagnostics = this.createDiagnosticCollectionFromLintResult(textDocument, lintResult);
+													this.diagnosticCollection.set(textDocument.uri, diagnostics);
+												}
 											} catch(e) {
 												console.error(e);
 											}

src/clojureMain.ts

@@ -50,7 +50,7 @@ export function activate(context: vscode.ExtensionContext) {
             }, this);
     }
 
-    let linter = new ClojureLintingProvider;	
+    let linter = new ClojureLintingProvider(evaluationResultChannel);	
 	linter.activate(context.subscriptions);
 }