Reload ns

package.json

@@ -40,6 +40,10 @@
         {
             "name": "Alessandro Decina",
             "email": "[email protected]"
+        },
+        {
+            "name": "Barak Liato",
+            "email": "[email protected]"
         }
     ],
     "license": "MIT",
@@ -52,7 +56,8 @@
         "Other"
     ],
     "activationEvents": [
-        "onLanguage:clojure"
+        "onCommand:clojureVSCode.startNRepl",
+        "onCommand:clojureVSCode.manuallyConnectToNRepl"
     ],
     "main": "./out/src/clojureMain",
     "contributes": {
@@ -80,6 +85,14 @@
             {
                 "command": "clojureVSCode.formatFile",
                 "title": "Clojure: Format file or selection"
+            },
+            {
+                "command": "clojureVSCode.reloadNamespace",
+                "title": "reload the current namespace"
+            },
+            {
+                "command": "clojureVSCode.searchSymbol",
+                "title": "Try to find the symbol and add its namespace to the decleration"
             }
         ],
         "configuration": {
@@ -95,6 +108,16 @@
                     "type": "boolean",
                     "default": false,
                     "description": "Format the code on save."
+                },
+                "clojureVSCode.alertOnEval": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "show pop up alert on eval."
+                },
+                "clojureVSCode.autoReloadNamespaceOnSave": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "auto reload the file upon save."
                 }
             }
         }

src/cljConnection.ts

@@ -225,4 +225,4 @@ export const cljConnection = {
     startNRepl,
     disconnect,
     sessionForFilename
-};
+};

src/cljParser.ts

@@ -1,3 +1,5 @@
+import { TextDocument, Range, Position, CompletionList } from "vscode";
+
 interface ExpressionInfo {
     functionName: string;
     parameterPosition: number;
@@ -135,8 +137,40 @@ const getNamespace = (text: string): string => {
     return m ? m[1] : 'user';
 };
 
+//assume the position is before the block directly
+const getDirectlyBeforeBlockRange = (editor: TextDocument, line: number, column: number): Range => {
+    const lastLineNumber = editor.lineCount - 1;
+    const lastLine = editor.lineAt(lastLineNumber);    
+    const range = new Range(line, column, lastLineNumber, lastLine.range.end.character);
+    const text = editor.getText(range);
+
+    let count = 0;     
+    let endPosition = new Position(line, column);
+    let c = column;
+    for(let l = line; l < range.end.line;) {
+        const currentLine = editor.lineAt(l);
+        for(;c < currentLine.range.end.character;c++) {
+            if(text[c] === '(')
+                 count++;
+
+            if(text[c] === ')')
+                count--;
+        }
+
+        if(count === 0) {
+            return new Range(line - 1, column, l - 1, c);
+        }
+
+        l++;
+        c = 0;
+    }
+
+    return new Range(line, column, line, column);
+}
+
 export const cljParser = {
     R_CLJ_WHITE_SPACE,
     getExpressionInfo,
     getNamespace,
+    getDirectlyBeforeBlockRange
 };

src/clojureEval.ts

@@ -3,15 +3,35 @@ import * as vscode from 'vscode';
 import { cljConnection } from './cljConnection';
 import { cljParser } from './cljParser';
 import { nreplClient } from './nreplClient';
+import {readBooleanConfiguration} from './utils';
 
-export function clojureEval(outputChannel: vscode.OutputChannel): void {
+function getAlertOnEvalResult() {
+    return readBooleanConfiguration('aletOnEval');
+}
+
+export function clojureEval(outputChannel: vscode.OutputChannel): void {        
     evaluate(outputChannel, false);
 }
 
-export function clojureEvalAndShowResult(outputChannel: vscode.OutputChannel): void {
+export function clojureEvalAndShowResult(outputChannel: vscode.OutputChannel): void {    
     evaluate(outputChannel, true);
 }
 
+export function evaluateText(outputChannel: vscode.OutputChannel, 
+                      showResults: boolean, 
+                      fileName: string,
+                      text: string): Promise<any[]> {    
+    return cljConnection.sessionForFilename(fileName).then(session => {
+        return (fileName.length === 0 && session.type == 'ClojureScript')
+        // Piggieback's evalFile() ignores the text sent as part of the request
+            // and just loads the whole file content from disk. So we use eval()
+            // here, which as a drawback will give us a random temporary filename in
+            // the stacktrace should an exception occur.              
+        ? nreplClient.evaluate(text, session.id)
+        : nreplClient.evaluateFile(text, fileName, session.id);            
+    });
+}
+
 function evaluate(outputChannel: vscode.OutputChannel, showResults: boolean): void {
     if (!cljConnection.isConnected()) {
         vscode.window.showWarningMessage('You should connect to nREPL first to evaluate code.');
@@ -26,28 +46,17 @@ function evaluate(outputChannel: vscode.OutputChannel, showResults: boolean): vo
         text = `(ns ${ns})\n${editor.document.getText(selection)}`;
     }
 
-    cljConnection.sessionForFilename(editor.document.fileName).then(session => {
-        let response;
-        if (!selection.isEmpty && session.type == 'ClojureScript') {
-            // Piggieback's evalFile() ignores the text sent as part of the request
-            // and just loads the whole file content from disk. So we use eval()
-            // here, which as a drawback will give us a random temporary filename in
-            // the stacktrace should an exception occur.
-            response = nreplClient.evaluate(text, session.id);
-        } else {
-            response = nreplClient.evaluateFile(text, editor.document.fileName, session.id);
-        }
-        response.then(respObjs => {
-            if (!!respObjs[0].ex)
-                return handleError(outputChannel, selection, showResults, respObjs[0].session);
-
-            return handleSuccess(outputChannel, showResults, respObjs);
-        })
-    });
+    evaluateText(outputChannel, showResults, editor.document.fileName, text)
+            .then(respObjs => {
+                if (!!respObjs[0].ex)
+                    return handleError(outputChannel, selection, showResults, respObjs[0].session);
+
+                return handleSuccess(outputChannel, showResults, respObjs);
+            });    
 }
 
-function handleError(outputChannel: vscode.OutputChannel, selection: vscode.Selection, showResults: boolean, session: string): Promise<void> {
-    if (!showResults)
+export function handleError(outputChannel: vscode.OutputChannel, selection: vscode.Selection, showResults: boolean, session: string): Promise<void> {
+    if (!showResults && getAlertOnEvalResult())
         vscode.window.showErrorMessage('Compilation error');
 
     return nreplClient.stacktrace(session)
@@ -75,8 +84,8 @@ function handleError(outputChannel: vscode.OutputChannel, selection: vscode.Sele
         });
 }
 
-function handleSuccess(outputChannel: vscode.OutputChannel, showResults: boolean, respObjs: any[]): void {
-    if (!showResults) {
+export function handleSuccess(outputChannel: vscode.OutputChannel, showResults: boolean, respObjs: any[]): void {
+    if (!showResults && getAlertOnEvalResult()) {
         vscode.window.showInformationMessage('Successfully compiled');
     } else {
         respObjs.forEach(respObj => {