optimisations to jedi (pass source if changes)

DonJayamanne · DonJayamanne · commit c9f523bdd600 · 2016-09-26T11:43:02.000+10:00
diff --git a/pythonFiles/completion.py b/pythonFiles/completion.py
@@ -303,12 +303,12 @@ def _process_request(self, request):
         if lookup == 'names':
             return self._write_response(self._serialize_definitions(
                 jedi.api.names(
-                    source=request['source'], 
+                    source=request.get('source', None), 
                     path=request.get('path', '')),
                 request['id']))
                 
         script = jedi.api.Script(
-            source=request['source'], line=request['line'] + 1,
+            source=request.get('source', None), line=request['line'] + 1,
             column=request['column'], path=request.get('path', ''))
 
         if lookup == 'definitions':
diff --git a/src/client/providers/definitionProvider.ts b/src/client/providers/definitionProvider.ts
@@ -30,18 +30,18 @@ export class PythonDefinitionProvider implements vscode.DefinitionProvider {
                 return resolve();
             }
 
-            var source = document.getText();
             var range = document.getWordRangeAtPosition(position);
             var columnIndex = range.isEmpty ? position.character : range.end.character;
             var cmd: proxy.ICommand<proxy.IDefinitionResult> = {
                 telemetryEvent: telemetryContracts.IDE.Definition,
                 command: proxy.CommandType.Definitions,
                 fileName: filename,
                 columnIndex: columnIndex,
-                lineIndex: position.line,
-                source: source
+                lineIndex: position.line
             };
-
+            if (document.isDirty){
+                cmd.source = document.getText();
+            }
             this.jediProxyHandler.sendCommand(cmd, resolve, token);
         });
     }
diff --git a/src/client/providers/hoverProvider.ts b/src/client/providers/hoverProvider.ts
@@ -30,7 +30,6 @@ export class PythonHoverProvider implements vscode.HoverProvider {
                 return resolve();
             }
 
-            var source = document.getText();
             var range = document.getWordRangeAtPosition(position);
             if (range == undefined || range.isEmpty) {
                 return resolve();
@@ -41,10 +40,11 @@ export class PythonHoverProvider implements vscode.HoverProvider {
                 command: proxy.CommandType.Completions,
                 fileName: filename,
                 columnIndex: columnIndex,
-                lineIndex: position.line,
-                source: source
+                lineIndex: position.line
             };
-
+            if (document.isDirty){
+                cmd.source = document.getText();
+            }
             this.jediProxyHandler.sendCommand(cmd, resolve, token);
         });
     }
diff --git a/src/client/providers/jediProxy.ts b/src/client/providers/jediProxy.ts
@@ -484,7 +484,7 @@ function getConfig() {
 export interface ICommand<T extends ICommandResult> {
     telemetryEvent: string;
     command: CommandType;
-    source: string;
+    source?: string;
     fileName: string;
     lineIndex: number;
     columnIndex: number;
diff --git a/src/client/providers/referenceProvider.ts b/src/client/providers/referenceProvider.ts
@@ -35,18 +35,19 @@ export class PythonReferenceProvider implements vscode.ReferenceProvider {
                 return resolve();
             }
 
-            var source = document.getText();
             var range = document.getWordRangeAtPosition(position);
             var columnIndex = range.isEmpty ? position.character : range.end.character;
             var cmd: proxy.ICommand<proxy.IReferenceResult> = {
                 telemetryEvent: telemetryContracts.IDE.Reference,
                 command: proxy.CommandType.Usages,
                 fileName: filename,
                 columnIndex: columnIndex,
-                lineIndex: position.line,
-                source: source
+                lineIndex: position.line
             };
 
+            if (document.isDirty){
+                cmd.source = document.getText();
+            }
             var definition: proxy.IAutoCompleteItem = null;
 
             this.jediProxyHandler.sendCommand(cmd, resolve, token);
diff --git a/src/client/providers/symbolProvider.ts b/src/client/providers/symbolProvider.ts
@@ -26,15 +26,18 @@ export class PythonSymbolProvider implements vscode.DocumentSymbolProvider {
         return new Promise<vscode.SymbolInformation[]>((resolve, reject) => {
             var filename = document.fileName;
 
-            var source = document.getText();
             var cmd: proxy.ICommand<proxy.ISymbolResult> = {
                 telemetryEvent: telemetryContracts.IDE.Symbol,
                 command: proxy.CommandType.Symbols,
                 fileName: filename,
                 columnIndex: 0,
-                lineIndex: 0,
-                source: source
+                lineIndex: 0
             };
+
+            if (document.isDirty){
+                cmd.source = document.getText();
+            }
+
             this.jediProxyHandler.sendCommand(cmd, resolve, token);
         });
     }
