Merge branch 'master' of https://github.com/DonJayamanne/pythonVSCode

DonJayamanne · DonJayamanne · commit 511cbd377da2 · 2017-06-29T23:10:49.000+10:00
diff --git a/package.json b/package.json
@@ -1068,6 +1068,83 @@
 						"Warning"
 					]
 				},
+				"python.linting.pep8CategorySeverity.W": {
+					"type": "string",
+					"default": "Warning",
+					"description": "Severity of Pep8 message type 'W'.",
+					"enum": [
+						"Hint",
+						"Error",
+						"Information",
+						"Warning"
+					]
+				},
+				"python.linting.pep8CategorySeverity.E": {
+					"type": "string",
+					"default": "Error",
+					"description": "Severity of Pep8 message type 'E'.",
+					"enum": [
+						"Hint",
+						"Error",
+						"Information",
+						"Warning"
+					]
+				},
+				"python.linting.flake8CategorySeverity.F": {
+					"type": "string",
+					"default": "Error",
+					"description": "Severity of Flake8 message type 'F'.",
+					"enum": [
+						"Hint",
+						"Error",
+						"Information",
+						"Warning"
+					]
+				},
+				"python.linting.flake8CategorySeverity.E": {
+					"type": "string",
+					"default": "Error",
+					"description": "Severity of Flake8 message type 'E'.",
+					"enum": [
+						"Hint",
+						"Error",
+						"Information",
+						"Warning"
+					]
+				},
+				"python.linting.flake8CategorySeverity.W": {
+					"type": "string",
+					"default": "Warning",
+					"description": "Severity of Flake8 message type 'W'.",
+					"enum": [
+						"Hint",
+						"Error",
+						"Information",
+						"Warning"
+					]
+				},
+				"python.linting.mypyCategorySeverity.error": {
+					"type": "string",
+					"default": "Error",
+					"description": "Severity of Mypy message type 'Error'.",
+					"enum": [
+						"Hint",
+						"Error",
+						"Information",
+						"Warning"
+					]
+				},
+				"python.linting.mypyCategorySeverity.note": {
+					"type": "string",
+					"default": "Information",
+					"description": "Severity of Mypy message type 'Note'.",
+					"enum": [
+						"Hint",
+						"Error",
+						"Information",
+						"Warning"
+					]
+				},
 				"python.linting.prospectorPath": {
 					"type": "string",
 					"default": "prospector",
diff --git a/pythonFiles/completion.py b/pythonFiles/completion.py
@@ -4,6 +4,7 @@
 import sys
 import json
 import traceback
+import platform
 
 WORD_RE = re.compile(r'\w')
 jediPreview = False
@@ -33,6 +34,17 @@ class JediCompletion(object):
     def __init__(self):
         self.default_sys_path = sys.path
         self._input = io.open(sys.stdin.fileno(), encoding='utf-8')
+        if (os.path.sep == '/') and (platform.uname()[2].find('Microsoft') > -1):
+            # WSL; does not support UNC paths
+            self.drive_mount = '/mnt/'
+        elif sys.platform == 'cygwin':
+            # cygwin
+            self.drive_mount = '/cygdrive/'
+        else:
+            # Do no normalization, e.g. Windows build of Python.
+            # Could add additional test: ((os.path.sep == '/') and os.path.isdir('/mnt/c'))
+            # However, this may have more false positives trying to identify Windows/*nix hybrids
+            self.drive_mount = ''
 
     def _get_definition_type(self, definition):
         is_built_in = definition.in_builtin_module
@@ -533,13 +545,33 @@ def _set_request_config(self, config):
             if path and path not in sys.path:
                 sys.path.insert(0, path)
 
+    def _normalize_request_path(self, request):
+        """Normalize any Windows paths received by a *nix build of
+           Python. Does not alter the reverse os.path.sep=='\\',
+           i.e. *nix paths received by a Windows build of Python.
+        """
+        if 'path' in request:
+            if not self.drive_mount:
+                return
+            newPath = request['path'].replace('\\', '/')
+            if newPath[0:1] == '/':
+                # is absolute path with no drive letter
+                request['path'] = newPath
+            elif newPath[1:2] == ':':
+                # is path with drive letter, only absolute can be mapped
+                request['path'] = self.drive_mount + newPath[0:1].lower() + newPath[2:]
+            else:
+                # is relative path
+                request['path'] = newPath
+
     def _process_request(self, request):
         """Accept serialized request from VSCode and write response.
         """
         request = self._deserialize(request)
 
         self._set_request_config(request.get('config', {}))
 
+        self._normalize_request_path(request)
         path = self._get_top_level_module(request.get('path', ''))
         if path not in sys.path:
             sys.path.insert(0, path)
diff --git a/pythonFiles/preview/jedi/settings.py b/pythonFiles/preview/jedi/settings.py
@@ -109,7 +109,7 @@
 """
 
 if platform.system().lower() == 'windows':
-    _cache_directory = os.path.join(os.getenv('APPDATA') or '~', 'Jedi',
+    _cache_directory = os.path.join(os.getenv('LOCALAPPDATA') or '~', 'Jedi',
                                     'Jedi')
 elif platform.system().lower() == 'darwin':
     _cache_directory = os.path.join('~', 'Library', 'Caches', 'Jedi')
diff --git a/src/client/common/configSettings.ts b/src/client/common/configSettings.ts
@@ -49,6 +49,19 @@ export interface IPylintCategorySeverity {
     error: vscode.DiagnosticSeverity;
     fatal: vscode.DiagnosticSeverity;
 }
+export interface IPep8CategorySeverity {
+    W: vscode.DiagnosticSeverity;
+    E: vscode.DiagnosticSeverity;
+}
+export interface Flake8CategorySeverity {
+    F: vscode.DiagnosticSeverity;
+    E: vscode.DiagnosticSeverity;
+    W: vscode.DiagnosticSeverity;
+}
+export interface IMypyCategorySeverity {
+    error: vscode.DiagnosticSeverity;
+    note: vscode.DiagnosticSeverity;
+}
 export interface ILintingSettings {
     enabled: boolean;
     enabledWithoutWorkspace: boolean;
@@ -69,6 +82,9 @@ export interface ILintingSettings {
     lintOnSave: boolean;
     maxNumberOfProblems: number;
     pylintCategorySeverity: IPylintCategorySeverity;
+    pep8CategorySeverity: IPep8CategorySeverity;
+    flake8CategorySeverity: Flake8CategorySeverity;
+    mypyCategorySeverity: IMypyCategorySeverity;
     prospectorPath: string;
     pylintPath: string;
     pep8Path: string;
@@ -183,6 +199,19 @@ export class PythonSettings extends EventEmitter implements IPythonSettings {
                 fatal: vscode.DiagnosticSeverity.Error,
                 refactor: vscode.DiagnosticSeverity.Hint,
                 warning: vscode.DiagnosticSeverity.Warning
+            },
+            pep8CategorySeverity: {
+                E: vscode.DiagnosticSeverity.Error,
+                W: vscode.DiagnosticSeverity.Warning
+            },
+            flake8CategorySeverity: {
+                F: vscode.DiagnosticSeverity.Error,
+                E: vscode.DiagnosticSeverity.Error,
+                W: vscode.DiagnosticSeverity.Warning
+            },
+            mypyCategorySeverity: {
+                error: vscode.DiagnosticSeverity.Error,
+                note: vscode.DiagnosticSeverity.Hint
             }
         };
         this.linting.pylintPath = getAbsolutePath(systemVariables.resolveAny(this.linting.pylintPath), workspaceRoot);
diff --git a/src/client/linters/baseLinter.ts b/src/client/linters/baseLinter.ts
@@ -65,6 +65,29 @@ export abstract class BaseLinter {
     public abstract isEnabled(): Boolean;
     public abstract runLinter(document: vscode.TextDocument, cancellation: vscode.CancellationToken): Promise<ILintMessage[]>;
 
+    protected parseMessagesSeverity(error: string, categorySeverity: any): LintMessageSeverity {
+         if (categorySeverity[error]) {
+            let severityName = categorySeverity[error];
+            switch (severityName) {
+                case 'Error':
+                    return LintMessageSeverity.Error;
+                case 'Hint':
+                    return LintMessageSeverity.Hint;
+                case 'Information':
+                    return LintMessageSeverity.Information;
+                case 'Warning':
+                    return LintMessageSeverity.Warning;
+                default: {
+                    if (LintMessageSeverity[severityName]) {
+                        return <LintMessageSeverity><any>LintMessageSeverity[severityName];
+                    }
+                }
+            }
+        }
+
+        return LintMessageSeverity.Information;
+    }
+
     protected run(command: string, args: string[], document: vscode.TextDocument, cwd: string, cancellation: vscode.CancellationToken, regEx: string = REGEX): Promise<ILintMessage[]> {
         let outputChannel = this.outputChannel;
 
diff --git a/src/client/linters/flake8.ts b/src/client/linters/flake8.ts
@@ -12,20 +12,6 @@ export class Linter extends baseLinter.BaseLinter {
         super('flake8', Product.flake8, outputChannel, workspaceRootPath);
     }
 
-    private parseMessagesCodeSeverity(error: string): baseLinter.LintMessageSeverity {
-
-        let category_letter = error[0];
-        switch (category_letter) {
-            case 'F':
-            case 'E':
-                return baseLinter.LintMessageSeverity.Error;
-            case 'W':
-                return baseLinter.LintMessageSeverity.Warning;
-            default:
-                return baseLinter.LintMessageSeverity.Information;
-        }
-    }
-
     public isEnabled(): Boolean {
         return this.pythonSettings.linting.flake8Enabled;
     }
@@ -37,9 +23,9 @@ export class Linter extends baseLinter.BaseLinter {
         let flake8Path = this.pythonSettings.linting.flake8Path;
         let flake8Args = Array.isArray(this.pythonSettings.linting.flake8Args) ? this.pythonSettings.linting.flake8Args : [];
         return new Promise<baseLinter.ILintMessage[]>((resolve, reject) => {
-            this.run(flake8Path, flake8Args.concat(['--format=%(row)d,%(col)d,%(code)s,%(code)s:%(text)s', document.uri.fsPath]), document, this.workspaceRootPath, cancellation).then(messages => {
+            this.run(flake8Path, flake8Args.concat(['--format=%(row)d,%(col)d,%(code).1s,%(code)s:%(text)s', document.uri.fsPath]), document, this.workspaceRootPath, cancellation).then(messages => {
                 messages.forEach(msg => {
-                    msg.severity = this.parseMessagesCodeSeverity(msg.type);
+                    msg.severity = this.parseMessagesSeverity(msg.type, this.pythonSettings.linting.flake8CategorySeverity);
                 });
 
                 resolve(messages);
diff --git a/src/client/linters/mypy.ts b/src/client/linters/mypy.ts
@@ -11,19 +11,6 @@ export class Linter extends baseLinter.BaseLinter {
     constructor(outputChannel: OutputChannel, workspaceRootPath?: string) {
         super('mypy', Product.mypy, outputChannel, workspaceRootPath);
     }
-    private parseMessagesSeverity(category: string): baseLinter.LintMessageSeverity {
-        switch (category) {
-            case 'error': {
-                return baseLinter.LintMessageSeverity.Error;
-            }
-            case 'note': {
-                return baseLinter.LintMessageSeverity.Hint;
-            }
-            default: {
-                return baseLinter.LintMessageSeverity.Information;
-            }
-        }
-    }
 
     public isEnabled(): Boolean {
         return this.pythonSettings.linting.mypyEnabled;
@@ -38,7 +25,7 @@ export class Linter extends baseLinter.BaseLinter {
         return new Promise<baseLinter.ILintMessage[]>((resolve, reject) => {
             this.run(mypyPath, mypyArgs.concat([document.uri.fsPath]), document, this.workspaceRootPath, cancellation, REGEX).then(messages => {
                 messages.forEach(msg => {
-                    msg.severity = this.parseMessagesSeverity(msg.type);
+                    msg.severity = this.parseMessagesSeverity(msg.type, this.pythonSettings.linting.mypyCategorySeverity);
                     msg.code = msg.type;
                 });
 
diff --git a/src/client/linters/pep8Linter.ts b/src/client/linters/pep8Linter.ts
@@ -12,19 +12,6 @@ export class Linter extends baseLinter.BaseLinter {
         super('pep8', Product.pep8, outputChannel, workspaceRootPath);
     }
 
-    private parseMessagesCodeSeverity(error: string): baseLinter.LintMessageSeverity {
-
-        let category_letter = error[0];
-        switch (category_letter) {
-            case 'E':
-                return baseLinter.LintMessageSeverity.Error;
-            case 'W':
-                return baseLinter.LintMessageSeverity.Warning;
-            default:
-                return baseLinter.LintMessageSeverity.Information;
-        }
-    }
-
     public isEnabled(): Boolean {
         return this.pythonSettings.linting.pep8Enabled;
     }
@@ -36,9 +23,9 @@ export class Linter extends baseLinter.BaseLinter {
         let pep8Path = this.pythonSettings.linting.pep8Path;
         let pep8Args = Array.isArray(this.pythonSettings.linting.pep8Args) ? this.pythonSettings.linting.pep8Args : [];
         return new Promise<baseLinter.ILintMessage[]>(resolve => {
-            this.run(pep8Path, pep8Args.concat(['--format=%(row)d,%(col)d,%(code)s,%(code)s:%(text)s', document.uri.fsPath]), document, this.workspaceRootPath, cancellation).then(messages => {
+            this.run(pep8Path, pep8Args.concat(['--format=%(row)d,%(col)d,%(code).1s,%(code)s:%(text)s', document.uri.fsPath]), document, this.workspaceRootPath, cancellation).then(messages => {
                 messages.forEach(msg => {
-                    msg.severity = this.parseMessagesCodeSeverity(msg.type);
+                    msg.severity = this.parseMessagesSeverity(msg.type, this.pythonSettings.linting.pep8CategorySeverity);
                 });
 
                 resolve(messages);
diff --git a/src/client/linters/pylint.ts b/src/client/linters/pylint.ts
@@ -10,29 +10,6 @@ export class Linter extends baseLinter.BaseLinter {
         super('pylint', Product.pylint, outputChannel, workspaceRootPath);
     }
 
-    private parseMessagesSeverity(category: string): baseLinter.LintMessageSeverity {
-        if (this.pythonSettings.linting.pylintCategorySeverity[category]) {
-            let severityName = this.pythonSettings.linting.pylintCategorySeverity[category];
-            switch (severityName) {
-                case 'Error':
-                    return baseLinter.LintMessageSeverity.Error;
-                case 'Hint':
-                    return baseLinter.LintMessageSeverity.Hint;
-                case 'Information':
-                    return baseLinter.LintMessageSeverity.Information;
-                case 'Warning':
-                    return baseLinter.LintMessageSeverity.Warning;
-                default: {
-                    if (baseLinter.LintMessageSeverity[severityName]) {
-                        return <baseLinter.LintMessageSeverity><any>baseLinter.LintMessageSeverity[severityName];
-                    }
-                }
-            }
-        }
-
-        return baseLinter.LintMessageSeverity.Information;
-    }
-
     public isEnabled(): Boolean {
         return this.pythonSettings.linting.pylintEnabled;
     }
@@ -46,7 +23,7 @@ export class Linter extends baseLinter.BaseLinter {
         return new Promise<baseLinter.ILintMessage[]>((resolve, reject) => {
             this.run(pylintPath, pylintArgs.concat(['--msg-template=\'{line},{column},{category},{msg_id}:{msg}\'', '--reports=n', '--output-format=text', document.uri.fsPath]), document, this.workspaceRootPath, cancellation).then(messages => {
                 messages.forEach(msg => {
-                    msg.severity = this.parseMessagesSeverity(msg.type);
+                    msg.severity = this.parseMessagesSeverity(msg.type, this.pythonSettings.linting.pylintCategorySeverity);
                 });
 
                 resolve(messages);
diff --git a/src/test/pythonFiles/sorting/withconfig/before.py b/src/test/pythonFiles/sorting/withconfig/before.py
@@ -1,10 +1,3 @@
-from third_party import lib0
-from third_party import lib1
-from third_party import lib2
-from third_party import lib3
-from third_party import lib4
-from third_party import lib5
-from third_party import lib6
-from third_party import lib7
-from third_party import lib8
-from third_party import lib9
+from third_party import (lib1, lib2, lib3,
+                         lib4, lib5, lib6,
+                         lib7, lib8, lib9)
