fixes to json deserialization

DonJayamanne · DonJayamanne · commit 6c7a0eb520e4 · 2016-08-08T10:04:14.000+10:00
diff --git a/pythonFiles/refactor.py b/pythonFiles/refactor.py
@@ -244,7 +244,13 @@ def watch(self):
             try:
                 self._process_request(self._input.readline())
             except Exception as ex:
-                message = ex.message + '  \n' + traceback.format_exc()
+                message = ""
+                try:
+                    message = ex.message
+                except:     
+                    pass
+                               
+                message = message + '  \n' + traceback.format_exc()
                 sys.stderr.write('$ERROR' + str(len(message)) + ':' + message)
                 sys.stderr.flush()
 
diff --git a/src/client/refactor/proxy.ts b/src/client/refactor/proxy.ts
@@ -36,13 +36,13 @@ export class RefactorProxy extends vscode.Disposable {
         this._process = null;
     }
     extractVariable<T>(document: vscode.TextDocument, name: string, filePath: string, range: vscode.Range): Promise<T> {
-        let command = `{"lookup":"extract_variable", "file":"${filePath}", "start":"${document.offsetAt(range.start)}", "end":"${document.offsetAt(range.end)}", "id":"1", "name":"${name}"}`;
-        return this.sendCommand<T>(command, REFACTOR.ExtractVariable);
+        let command = {"lookup":"extract_variable", "file":`"${filePath}"`, "start":document.offsetAt(range.start).toString(), "end":document.offsetAt(range.end).toString(), "id":"1", "name":`"${name}"`};
+        return this.sendCommand<T>(JSON.stringify(command), REFACTOR.ExtractVariable);
     }
     extractMethod<T>(document: vscode.TextDocument, name: string, filePath: string, range: vscode.Range): Promise<T> {
-        let command = `{"lookup":"extract_method", "file":"${filePath}", "start":"${document.offsetAt(range.start)}", "end":"${document.offsetAt(range.end)}", "id":"1","name":"${name}"}`;
-        return this.sendCommand<T>(command, REFACTOR.ExtractVariable);
-    }
+        let command = {"lookup":"extract_method", "file":`"${filePath}"`, "start":document.offsetAt(range.start).toString(), "end":document.offsetAt(range.end).toString(), "id":"1","name":`"${name}"`};
+        return this.sendCommand<T>(JSON.stringify(command), REFACTOR.ExtractVariable);
+    } 
     private sendCommand<T>(command: string, telemetryEvent: string): Promise<T> {
         let timer = new Delays();
         return this.initialize(this.pythonSettings.pythonPath).then(() => {
