streamlined

DonJayamanne · DonJayamanne · commit dc31d1cd6fe1 · 2017-05-08T22:16:48.000+10:00
diff --git a/src/client/jedi/main.ts b/src/client/jedi/main.ts
@@ -6,50 +6,44 @@ import * as child_process from 'child_process';
 import * as path from 'path';
 import * as vscode from 'vscode';
 import { createDeferred, Deferred } from '../common/helpers';
-import { IClientAdapter } from './IClientAdapter';
 import { PythonSettings } from '../common/configSettings';
 import { EventEmitter } from 'events';
 import { formatErrorForLogging } from '../common/utils';
-import { TextDocument, Position, CancellationToken } from 'vscode';
-import { CompletionItem, Definition, Hover, ReferenceContext, Location, SignatureHelp, SymbolInformation } from 'vscode';
-import { Commands } from "./commands";
-import { CompletionParser } from './parsers/CompletionParser';
+import { CancellationToken } from 'vscode';
+import { CompletionItem, Definition, Hover, Location, SignatureHelp, SymbolInformation } from 'vscode';
+import { RequestCommands } from "./commands";
 import { DefinitionParser } from './parsers/DefinitionParser';
 import { HoverParser } from './parsers/HoverParser';
 import { LocationParser } from './parsers/LocationParser';
 import { SignatureHelpParser } from './parsers/SignatureHelpParser';
 import { SymbolInformationParser } from './parsers/SymbolInformationParser';
 
-export class ClientAdapter extends EventEmitter implements IClientAdapter {
+export enum Command {
+    Completions,
+    Definition,
+    Hover,
+    References,
+    Signature,
+    DocumentSymbols
+}
+
+const commandMapping = new Map<Command, Buffer>();
+commandMapping.set(Command.Completions, RequestCommands.Completions);
+commandMapping.set(Command.Definition, RequestCommands.Definitions);
+commandMapping.set(Command.Hover, RequestCommands.Hover);
+commandMapping.set(Command.References, RequestCommands.Usages);
+commandMapping.set(Command.Signature, RequestCommands.Arguments);
+commandMapping.set(Command.DocumentSymbols, RequestCommands.Names);
+
+export class ClientAdapter extends EventEmitter {
     constructor(private outputChannel: vscode.OutputChannel, private rootDir: string) {
         super();
     }
-
-    public getCompletions(token: CancellationToken, fileName: string, columnIndex: number, lineIndex: number, source: string): Promise<CompletionItem[]> {
-        return this.socketClient.getResult<any>(Commands.Completions, token, fileName, columnIndex, lineIndex, source)
-            .then(CompletionParser.parse);
-    }
-    public getDefinition(token: CancellationToken, fileName: string, columnIndex: number, lineIndex: number, source: string): Promise<Definition> {
-        return this.socketClient.getResult<any>(Commands.Completions, token, fileName, columnIndex, lineIndex, source)
-            .then(DefinitionParser.parse);
-    }
-    public getHoverDefinition(token: CancellationToken, fileName: string, columnIndex: number, lineIndex: number, source: string): Promise<Hover> {
-        return this.socketClient.getResult<any>(Commands.Completions, token, fileName, columnIndex, lineIndex, source)
-            .then(HoverParser.parse);
-    }
-    public getReferences(token: CancellationToken, fileName: string, columnIndex: number, lineIndex: number, source: string): Promise<Location[]> {
-        return this.socketClient.getResult<any>(Commands.Completions, token, fileName, columnIndex, lineIndex, source)
-            .then(DefinitionParser.parse);
+    public getResult<T>(responseParser: (data: Object) => T, command: Command, token: CancellationToken, fileName: string, columnIndex?: number, lineIndex?: number, source?: string): Promise<T> {
+        const cmd = commandMapping.get(command);
+        return this.socketClient.getResult<any>(cmd, token, fileName, columnIndex, lineIndex, source)
+            .then(responseParser);
     }
-    public getSignature(token: CancellationToken, fileName: string, columnIndex: number, lineIndex: number, source: string): Promise<SignatureHelp> {
-        return this.socketClient.getResult<any>(Commands.Completions, token, fileName, columnIndex, lineIndex, source)
-            .then(SignatureHelpParser.parse);
-    }
-    public getDocumentSymbols(token: CancellationToken, fileName: string, columnIndex: number, lineIndex: number, source: string): Promise<SymbolInformation[]> {
-        return this.socketClient.getResult<any>(Commands.Completions, token, fileName, columnIndex, lineIndex, source)
-            .then(SymbolInformationParser.parse);
-    }
-
     private process: child_process.ChildProcess;
     private socketServer: SocketServer;
     private socketClient: SocketClient;
@@ -87,7 +81,6 @@ export class ClientAdapter extends EventEmitter implements IClientAdapter {
         this.startDef = createDeferred<any>();
         const pyFile = path.join(__dirname, '..', '..', '..', '..', 'pythonFiles', 'completionServer.py');
         const newEnv = {};
-        // const newEnv = {'DEBUG_DJAYAMANNE_IPYTHON':'1'};
         Object.assign(newEnv, envVariables);
         Object.assign(newEnv, process.env);
 
@@ -100,15 +93,12 @@ export class ClientAdapter extends EventEmitter implements IClientAdapter {
 
             let processStarted = false;
             let handshakeDone = false;
-            let isInTestRun = newEnv['PYTHON_DONJAYAMANNE_TEST'] === "1";
-            const testDef = createDeferred<any>();
-            const promiseToResolve = isInTestRun ? testDef.resolve.bind(testDef) : def.resolve.bind(def);
 
             this.process.stdout.on('data', (data: string) => {
                 if (!processStarted && data.split(/\r?\n/g).some(line => line === 'Started')) {
                     processStarted = true;
                     if (processStarted && handshakeDone) {
-                        promiseToResolve();
+                        def.resolve();
                     }
                     return;
                 }
@@ -121,28 +111,10 @@ export class ClientAdapter extends EventEmitter implements IClientAdapter {
             this.socketClient.on('handshake', () => {
                 handshakeDone = true;
                 if (processStarted && handshakeDone) {
-                    promiseToResolve();
+                    def.resolve();
                 }
             });
 
-            // If we're testing, then test the ping and the pong
-            // TODO: Better way to test sockets
-            if (isInTestRun) {
-                testDef.promise.then(() => {
-                    // Ok everything has started, now test ping
-                    const msg1 = 'Hello world from Type Script - Функция проверки ИНН и КПП - 长城!1';
-                    const msg2 = 'Hello world from Type Script - Функция проверки ИНН и КПП - 长城!2';
-                    Promise.all<string, string>([this.socketClient.ping(msg1), this.socketClient.ping(msg2)]).then(msgs => {
-                        if (msgs.indexOf(msg1) === -1 || msgs.indexOf(msg2) === -1) {
-                            def.reject('msg1 or msg2 not returned');
-                        }
-                        else {
-                            def.resolve();
-                        }
-                    }).catch(reason => def.reject(reason));
-                });
-            }
-
             return def.promise;
         }).then(() => {
             this.startDef.resolve();
@@ -164,52 +136,8 @@ export class ClientAdapter extends EventEmitter implements IClientAdapter {
             this.outputChannel.appendLine('Error received: ' + error);
         });
         this.socketClient.on('commanderror', (commandError: { command: string, id: string, trace: string }) => {
-            this.outputChannel.appendLine(`Unhandled command Error from Jupyter. '${JSON.stringify(commandError)}'`);
+            this.outputChannel.appendLine(`Unhandled command Error from Autocompletion Library. '${JSON.stringify(commandError)}'`);
         });
         return this.socketServer.Start();
     }
-
-    public getAllKernelSpecs(): Promise<{ [key: string]: Kernelspec }> {
-        return this.start().then(() => this.socketClient.listKernelSpecs());
-    }
-    private lastStartedKernelUUID: string;
-    public startKernel(kernelSpec: KernelspecMetadata): Promise<[string, any, string]> {
-        return this.start().then(() => this.getAllKernelSpecs()).then(specks => {
-            // ok given the specks, find the name of the kernelspec
-            const kernelSpecName = Object.keys(specks).find(kernelSpecName => {
-                const spec = specks[kernelSpecName];
-                return spec.spec.display_name === kernelSpec.display_name;
-            });
-            return this.socketClient.startKernel(kernelSpecName).then(info => {
-                this.lastStartedKernelUUID = info[0];
-                return info;
-            });
-        });
-    }
-    public shutdownkernel(kernelUUID: string): Promise<any> {
-        return this.start().then(() => this.socketClient.sendKernelCommand(kernelUUID, KernelCommand.shutdown));
-    }
-    public interruptKernel(kernelUUID: string): Promise<any> {
-        return this.start().then(() => this.socketClient.sendKernelCommand(kernelUUID, KernelCommand.interrupt));
-    }
-    public restartKernel(kernelUUID: string): Promise<any> {
-        return this.start().then(() => this.socketClient.sendKernelCommand(kernelUUID, KernelCommand.restart));
-    }
-    public runCode(code: string): Rx.IObservable<ParsedIOMessage> {
-        const subject = new Rx.Subject<ParsedIOMessage>();
-        this.start().then(() => {
-            const runnerObservable = this.socketClient.runCode(code);
-            runnerObservable.subscribe(data => {
-                subject.onNext(data);
-            }, reason => {
-                subject.onError(reason);
-            }, () => {
-                subject.onCompleted();
-            });
-        }).catch(reason => {
-            subject.onError(reason);
-        });
-
-        return subject;
-    }
 }
diff --git a/src/client/jedi/socketClient.ts b/src/client/jedi/socketClient.ts
@@ -1,36 +1,25 @@
 "use strict";
 
 import { SocketCallbackHandler } from "../common/comms/socketCallbackHandler";
-import { Commands, ResponseCommands } from "./commands";
+import { RequestCommands, ResponseCommands } from "./commands";
 import { SocketServer } from '../common/comms/socketServer';
 import { IdDispenser } from '../common/idDispenser';
 import { createDeferred, Deferred } from '../common/helpers';
 import { OutputChannel, CancellationToken } from 'vscode';
 
-/*
-    public static Exit: Buffer = new Buffer("exit");
-    public static Ping: Buffer = new Buffer("ping");
-    public static Arguments = new Buffer("args");
-    public static Completions = new Buffer("comp");
-    public static Definitions = new Buffer("defs");
-    public static Hover = new Buffer("hovr");
-    public static Usages = new Buffer("usag");
-    public static Names = new Buffer("name");
-*/
-
-
 export class SocketClient extends SocketCallbackHandler {
     constructor(socketServer: SocketServer, private outputChannel: OutputChannel) {
         super(socketServer);
         this.registerCommandHandler(ResponseCommands.Pong, this.onPong.bind(this));
         this.registerCommandHandler(ResponseCommands.Error, this.onError.bind(this));
+        this.registerCommandHandler(ResponseCommands.TraceLog, this.onWriteToLog.bind(this));
 
-        this.registerCommandHandler(ResponseCommands.Arguments, this.onResponseReceived.bind(this));
+        this.registerCommandHandler(ResponseCommands.Signature, this.onResponseReceived.bind(this));
         this.registerCommandHandler(ResponseCommands.Completions, this.onResponseReceived.bind(this));
         this.registerCommandHandler(ResponseCommands.Definitions, this.onResponseReceived.bind(this));
         this.registerCommandHandler(ResponseCommands.Hover, this.onResponseReceived.bind(this));
-        this.registerCommandHandler(ResponseCommands.Names, this.onResponseReceived.bind(this));
-        this.registerCommandHandler(ResponseCommands.Usages, this.onResponseReceived.bind(this));
+        this.registerCommandHandler(ResponseCommands.DocumentSymbols, this.onResponseReceived.bind(this));
+        this.registerCommandHandler(ResponseCommands.References, this.onResponseReceived.bind(this));
 
         this.idDispenser = new IdDispenser();
     }
@@ -49,9 +38,6 @@ export class SocketClient extends SocketCallbackHandler {
     }
     private idDispenser: IdDispenser;
     private pid: number;
-    private writeToDebugLog(message: string) {
-        this.outputChannel.appendLine(message);
-    }
     public dispose() {
         super.dispose();
     }
@@ -108,9 +94,17 @@ export class SocketClient extends SocketCallbackHandler {
 
         def.resolve(jsonResponse);
     }
+    private onWriteToLog() {
+        const message = this.stream.readStringInTransaction();
+        if (typeof message !== 'string') {
+            return;
+        }
+        this.outputChannel.appendLine(message);
+    }
+
     public ping(message: string) {
         const [def, id] = this.createId<string>(null);
-        this.SendRawCommand(Commands.Ping);
+        this.SendRawCommand(RequestCommands.Ping);
         this.stream.WriteString(id);
         this.stream.WriteString(message);
         return def.promise;
