sync fork with upstream

Author: DonJayamanne

.editorconfig

@@ -8,6 +8,7 @@ root = true
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
+insert_final_newline = true
 
 # The indent size used in the `package.json` file cannot be changed
 # https://github.com/npm/npm/pull/3180#issuecomment-16336516

.gitignore

@@ -2,7 +2,10 @@
 out
 node_modules
 *.pyc
-.vscode/.ropeproject/**
-src/test/.vscode/**
+**/.vscode/.ropeproject/**
 **/testFiles/**/.cache/**
 *.noseids
+.vscode-test
+__pycache__
+npm-debug.log
+**/.mypy_cache/**

.gitmodules

@@ -48,6 +48,7 @@ before_install: |
     pyenv install $PYTHON
     pyenv global $PYTHON
   fi
+  export TRAVIS_PYTHON_PATH=`which python`
 install:
   - pip install --upgrade -r requirements.txt
   - npm install

.jshintignore

@@ -1,25 +1,7 @@
 // A launch configuration that compiles the extension and then opens it inside a new window
 {
 	"version": "0.1.0",
-	"configurations": [{
-			"name": "CompletionServer.ppy",
-			"type": "python",
-			"request": "launch",
-			"stopOnEntry": true,
-			"pythonPath": "python",
-			"program": "${workspaceRoot}/pythonFiles/completionServer.py",
-			"cwd": "${workspaceRoot}",
-			"env": {},
-			"args": [
-				"123"
-			],
-			"envFile": "${workspaceRoot}/.env",
-			"debugOptions": [
-				"WaitOnAbnormalExit",
-				"WaitOnNormalExit",
-				"RedirectOutput"
-			]
-		},
+	"configurations": [
 		{
 			"name": "Launch Extension",
 			"type": "extensionHost",
@@ -30,7 +12,9 @@
 			],
 			"stopOnEntry": false,
 			"sourceMaps": true,
-			"outDir": "${workspaceRoot}/out",
+			"outFiles": [
+				"${workspaceRoot}/out/**/*.js"
+			],
 			"preLaunchTask": "compile"
 		},
 		{
@@ -43,7 +27,9 @@
 				"--server=4711"
 			],
 			"sourceMaps": true,
-			"outDir": "${workspaceRoot}/out/client",
+			"outFiles": [
+				"${workspaceRoot}/out/client/**/*.js"
+			],
 			"cwd": "${workspaceRoot}"
 		},
 		{
@@ -58,33 +44,36 @@
 			],
 			"stopOnEntry": false,
 			"sourceMaps": true,
-			"xxoutDir": "${workspaceRoot}/out/test",
 			"outFiles": [
 				"${workspaceRoot}/out/**/*.js"
 			],
 			"preLaunchTask": "compile"
 		},
 		{
-			"name": "Python",
-			"type": "python",
+			"name": "Launch Multiroot Tests",
+			"type": "extensionHost",
 			"request": "launch",
-			"stopOnEntry": true,
-			"pythonPath": "python",
-			"program": "${file}",
-			"console": "integratedTerminal",
-			"args": [],
-			"debugOptions": [
-				"WaitOnAbnormalExit",
-				"WaitOnNormalExit",
-				"RedirectOutput"
+			"runtimeExecutable": "${execPath}",
+			"args": [
+				"${workspaceRoot}/src/testMultiRootWkspc/multi.code-workspace",
+				"--extensionDevelopmentPath=${workspaceRoot}",
+				"--extensionTestsPath=${workspaceRoot}/out/test"
 			],
-			"cwd": "${workspaceRoot}"
+			"stopOnEntry": false,
+			"sourceMaps": true,
+			"outFiles": [
+				"${workspaceRoot}/out/**/*.js"
+			],
+			"preLaunchTask": "compile"
 		}
 	],
-	"compounds": [{
-		"name": "Extension + Debugger",
-		"configurations": [
-			"Launch Extension", "Launch Extension as debugServer"
-		]
-	}]
+	"compounds": [
+		{
+			"name": "Extension + Debugger",
+			"configurations": [
+				"Launch Extension",
+				"Launch Extension as debugServer"
+			]
+		}
+	]
 }

.jshintrc

@@ -4,7 +4,10 @@
 		"out": true, // set this to true to hide the "out" folder with the compiled JS files
 		"**/*.pyc": true,
 		"**/__pycache__": true,
-		"node_modules": true
+		"node_modules": true,
+		".vscode-test": true,
+		"**/.mypy_cache/**": true,
+		"**/.ropeproject/**": true
 	},
 	"search.exclude": {
 		"out": true // set this to false to include "out" folder in search results

.travis.yml

@@ -53,6 +53,18 @@
                     "fileLocation": "relative"
                 }
             ]
+        },
+        {
+            "label": "lint-staged",
+            "type": "npm",
+            "script": "lint-staged",
+            "problemMatcher": [
+                "$tsc",
+                {
+                    "base": "$tslint5",
+                    "fileLocation": "relative"
+                }
+            ]
         }
     ]
 }

.vscode/launch.json

@@ -1,5 +1,38 @@
+### Version 0.8.0 (9 November 2017)
+* Add support for multi-root workspaces [#1228](https://github.com/DonJayamanne/pythonVSCode/issues/1228), [#1302](https://github.com/DonJayamanne/pythonVSCode/pull/1302), [#1328](https://github.com/DonJayamanne/pythonVSCode/issues/1328), [#1357](https://github.com/DonJayamanne/pythonVSCode/pull/1357)  
+* Add code snippet for ```ipdb``` [#1141](https://github.com/DonJayamanne/pythonVSCode/pull/1141)  
+* Add ability to resolving environment variables in path to ```mypy``` [#1195](https://github.com/DonJayamanne/pythonVSCode/issues/1195)   
+* Add ability to disable a linter globally and disable prompts to install linters [#1207](https://github.com/DonJayamanne/pythonVSCode/issues/1207)
+* Auto-selecting an interpreter from a virtual environment if only one is found in the root directory of the project [#1216](https://github.com/DonJayamanne/pythonVSCode/issues/1216)  
+* Add support for specifying the working directory for unit tests [#1155](https://github.com/DonJayamanne/pythonVSCode/issues/1155), [#1185](https://github.com/DonJayamanne/pythonVSCode/issues/1185)  
+* Add syntax highlighting of pip requirements files [#1247](https://github.com/DonJayamanne/pythonVSCode/pull/1247)  
+* Add ability to select an interpreter even when a workspace is not open [#1260](https://github.com/DonJayamanne/pythonVSCode/issues/1260), [#1263](https://github.com/DonJayamanne/pythonVSCode/pull/1263)  
+* Display a code lens to change the selected interpreter to the one specified in the shebang line [#1257](https://github.com/DonJayamanne/pythonVSCode/pull/1257), [#1263](https://github.com/DonJayamanne/pythonVSCode/pull/1263), [#1267](https://github.com/DonJayamanne/pythonVSCode/pull/1267), [#1280](https://github.com/DonJayamanne/pythonVSCode/issues/1280), [#1261](https://github.com/DonJayamanne/pythonVSCode/issues/1261), [#1290](https://github.com/DonJayamanne/pythonVSCode/pull/1290)      
+* Expand list of interpreters displayed for selection [#1147](https://github.com/DonJayamanne/pythonVSCode/issues/1147),  [#1148](https://github.com/DonJayamanne/pythonVSCode/issues/1148), [#1224](https://github.com/DonJayamanne/pythonVSCode/pull/1224), [#1240](https://github.com/DonJayamanne/pythonVSCode/pull/1240)
+* Display details of current or selected interpreter in statusbar [#1147](https://github.com/DonJayamanne/pythonVSCode/issues/1147), [#1217](https://github.com/DonJayamanne/pythonVSCode/issues/1217)
+* Ensure paths in workspace symbols are not prefixed with ```.vscode``` [#816](https://github.com/DonJayamanne/pythonVSCode/issues/816), [#1066](https://github.com/DonJayamanne/pythonVSCode/pull/1066), [#829](https://github.com/DonJayamanne/pythonVSCode/issues/829)    
+* Ensure paths in ```PYTHONPATH``` environment variable are delimited using the OS-specific path delimiter [#832](https://github.com/DonJayamanne/pythonVSCode/issues/832) 
+* Ensure ```Rope``` is not packaged with the extension [#1208](https://github.com/DonJayamanne/pythonVSCode/issues/1208), [#1207](https://github.com/DonJayamanne/pythonVSCode/issues/1207), [#1243](https://github.com/DonJayamanne/pythonVSCode/pull/1243), [#1229](https://github.com/DonJayamanne/pythonVSCode/issues/1229)  
+* Ensure ctags are rebuilt as expected upon file save [#624](https://github.com/DonJayamanne/pythonVSCode/issues/1212)  
+* Ensure right test method is executed when two test methods exist with the same name in different classes [#1203](https://github.com/DonJayamanne/pythonVSCode/issues/1203)  
+* Ensure unit tests run successfully on Travis for both Python 2.7 and 3.6 [#1255](https://github.com/DonJayamanne/pythonVSCode/pull/1255), [#1241](https://github.com/DonJayamanne/pythonVSCode/issues/1241), [#1315](https://github.com/DonJayamanne/pythonVSCode/issues/1315)    
+* Fix building of ctags when a path contains a space [#1064](https://github.com/DonJayamanne/pythonVSCode/issues/1064), [#1144](https://github.com/DonJayamanne/pythonVSCode/issues/1144),, [#1213](https://github.com/DonJayamanne/pythonVSCode/pull/1213)  
+* Fix autocompletion in unsaved Python files [#1194](https://github.com/DonJayamanne/pythonVSCode/issues/1194)  
+* Fix running of test methods in nose [#597](https://github.com/DonJayamanne/pythonVSCode/issues/597), [#1225](https://github.com/DonJayamanne/pythonVSCode/pull/1225)  
+* Fix to disable linting of diff windows [#1221](https://github.com/DonJayamanne/pythonVSCode/issues/1221), [#1244](https://github.com/DonJayamanne/pythonVSCode/pull/1244)
+* Fix docstring formatting [#1188](https://github.com/DonJayamanne/pythonVSCode/issues/1188)  
+* Fix to ensure language features can run in parallel without interference with one another [#1314](https://github.com/DonJayamanne/pythonVSCode/issues/1314), [#1318](https://github.com/DonJayamanne/pythonVSCode/pull/1318) 
+* Fix to ensure unit tests can be debugged more than once per run [#948](https://github.com/DonJayamanne/pythonVSCode/issues/948), [#1353](https://github.com/DonJayamanne/pythonVSCode/pull/1353)  
+* Fix to ensure parameterized unit tests can be debugged [#1284](https://github.com/DonJayamanne/pythonVSCode/issues/1284), [#1299](https://github.com/DonJayamanne/pythonVSCode/pull/1299)  
+* Fix issue that causes debugger to freeze/hang [#1041](https://github.com/DonJayamanne/pythonVSCode/issues/1041), [#1354](https://github.com/DonJayamanne/pythonVSCode/pull/1354)  
+* Fix to support unicode characters in Python tests [#1282](https://github.com/DonJayamanne/pythonVSCode/issues/1282), [#1291](https://github.com/DonJayamanne/pythonVSCode/pull/1291)
+* Changes as a result of VS Code API changes [#1270](https://github.com/DonJayamanne/pythonVSCode/issues/1270), [#1288](https://github.com/DonJayamanne/pythonVSCode/pull/1288), [#1372](https://github.com/DonJayamanne/pythonVSCode/issues/1372), [#1300](https://github.com/DonJayamanne/pythonVSCode/pull/1300), [#1298](https://github.com/DonJayamanne/pythonVSCode/issues/1298) 
+* Updates to Readme [#1212](https://github.com/DonJayamanne/pythonVSCode/issues/1212), [#1222](https://github.com/DonJayamanne/pythonVSCode/issues/1222)
+* Fix executing a command under PowerShell [#1098](https://github.com/DonJayamanne/pythonVSCode/issues/1098)
+
+
 ### Version 0.7.0 (3 August 2017)
-* Displaying internal documntation [#1008](https://github.com/DonJayamanne/pythonVSCode/issues/1008), [#10860](https://github.com/DonJayamanne/pythonVSCode/issues/10860)  
+* Displaying internal documentation [#1008](https://github.com/DonJayamanne/pythonVSCode/issues/1008), [#10860](https://github.com/DonJayamanne/pythonVSCode/issues/10860)  
 * Fixes to 'async with' snippet [#1108](https://github.com/DonJayamanne/pythonVSCode/pull/1108), [#996](https://github.com/DonJayamanne/pythonVSCode/issues/996)  
 * Add support for environment variable in unit tests [#1074](https://github.com/DonJayamanne/pythonVSCode/issues/1074)  
 * Fixes to unit test code lenses not being displayed [#1115](https://github.com/DonJayamanne/pythonVSCode/issues/1115)  

.vscode/settings.json

@@ -0,0 +1,6 @@
+This project has adopted the [Microsoft Open Source Code of
+Conduct](https://opensource.microsoft.com/codeofconduct/).
+For more information see the [Code of Conduct
+FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
+contact [[email protected]](mailto:[email protected])
+with any additional questions or comments.

.vscode/tasks.json

@@ -4,7 +4,7 @@
 
 ## Prerequisites
 1. Node.js
-2. Python v2.6 or later (required only for testing the extension and running unit tests)
+2. Python 2.7 or later (required only for testing the extension and running unit tests)
 3. Windows, OS X or Linux
 
 ## Setup
@@ -25,18 +25,18 @@ To test the changes you launch a development version of VS Code on the workspace
 Use the "Launch Extension" launch option.
 
 ### Unit Tests
-Run the Unit Tests via the "Launch Test" launch option.   
+Run the Unit Tests via the "Launch Test" launch option.
 Currently unit tests only run on [Travis](https://travis-ci.org/DonJayamanne/pythonVSCode)
 
-_Requirements_   
-1. Ensure you have disabled breaking into 'Uncaught Exceptions' when running the Unit Tests   
-2. For the linters and formatters tests to pass successfully, you will need to have those corresponding Python libraries installed locally   
+_Requirements_
+1. Ensure you have disabled breaking into 'Uncaught Exceptions' when running the Unit Tests
+2. For the linters and formatters tests to pass successfully, you will need to have those corresponding Python libraries installed locally
 
 ## Debugging the extension
 ### Standard Debugging
 Clone the repo into any directory and start debugging.
-From there use the "Launch Extension" launch option.   
+From there use the "Launch Extension" launch option.
 
 ### Debugging the Python Extension Debugger
-The easiest way to debug the Python Debugger (in my opinion) is to clone this git repo directory into [your](https://code.visualstudio.com/docs/extensions/install-extension#_your-extensions-folder) extensions directory.   
+The easiest way to debug the Python Debugger (in our opinion) is to clone this git repo directory into [your](https://code.visualstudio.com/docs/extensions/install-extension#_your-extensions-folder) extensions directory.
 From there use the ```Launch Extension as debugserver``` launch option.

CHANGELOG.md

@@ -1,6 +1,6 @@
-The MIT License (MIT)
+Copyright (c) Microsoft Corporation. All rights reserved.
 
-Copyright (c) 2015 DonJayamanne
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -12,7 +12,7 @@ furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

CODE_OF_CONDUCT.md

@@ -1,2 +1,93 @@
+<<<<<<< HEAD
 # This repository is no longer maintained. I will continue my work on this extension on the corresponding [Microsoft fork](https://github.com/Microsoft/vscode-python).
 
+=======
+# Python extension for Visual Studio Code
+
+A [Visual Studio Code](https://code.visualstudio.com/) [extension](https://marketplace.visualstudio.com/VSCode) with rich support for the [Python language](https://www.python.org/) (_including Python 3.6_), with features including the following and more:
+* Linting ([Prospector](https://pypi.io/project/prospector/), [Pylint](https://pypi.io/project/pylint/), [pycodestyle](https://pypi.io/project/pycodestyle/), [Flake8](https://pypi.io/project/flake8/), [pylama](https://github.com/klen/pylama), [pydocstyle](https://pypi.io/project/pydocstyle/), [mypy](http://mypy-lang.org/) with config files and plugins)
+* Intellisense (autocompletion with support for PEP 484 and PEP 526)
+* Auto indenting
+* Code formatting ([autopep8](https://pypi.io/project/autopep8/), [yapf](https://pypi.io/project/yapf/), with config files)
+* Code refactoring (Rename, Extract Variable, Extract Method,Sort Imports)
+* Viewing references, code navigation, view signature
+* Excellent debugging support (remote debugging over SSH, mutliple threads, django, flask)
+* Running and debugging Unit tests ([unittest](https://docs.python.org/3/library/unittest.html#module-unittest), [pytest](https://pypi.io/project/pytest/), [nose](https://pypi.io/project/nose/), with config files)
+* Execute file or code in a python terminal
+* Local help file (offline documentation)
+* Snippets
+
+## Quick Start
+* Install the extension
+* optionally install `ctags` for Workspace Symbols, from [here](http://ctags.sourceforge.net/), or using `brew install ctags` on macOS
+* Select your Python interpreter
+  + If it's already in your path then you're set
+  + Otherwise, to select a different Python Interpreter/Version (or use a virtual environment), use the command `Select Workspace Interpreter`)
+
+## [Documentation](https://code.visualstudio.com/docs/languages/python)
+For further information and details continue through to the [documentation](https://code.visualstudio.com/docs/languages/python).
+
+## Issues, Feature Requests, and Contributions
+* If you come across a problem with the extension please [file an issue](https://github.com/microsoft/vscode-python)
+* Contributions are always welcome! Please see our [contributing guide](https://github.com/Microsoft/vscode-python/blob/master/CONTRIBUTING.md) for more details
+* Any and all feedback is appreciated and welcome!
+  - If someone has already [file an issue](https://github.com/Microsoft/vscode-python) that encompasses your feedback, please leave a 👍/👎 reaction on the issue
+  - Othewise please file a new issue
+
+## Feature Details
+* IDE-like Features
+  + Automatic indenting
+  + Code navigation ("Go to", "Find all" references)
+  + Code definition (Peek and hover definition, View signatures)
+  + Rename refactoring
+  + Sorting import statements (use the `Python: Sort Imports` command)
+* Intellisense and Autocomplete (including PEP 484 support)
+  + Ability to include custom module paths (e.g. include paths for libraries like Google App Engine, etc.; use the setting `python.autoComplete.extraPaths = []`)
+* Code formatting
+  + Auto formatting of code upon saving changes (default to 'Off')
+  + Use either [yapf](https://pypi.io/project/yapf/) or [autopep8](https://pypi.io/project/autopep8/) for code formatting (defaults to autopep8)
+* Linting
+  + Support for multiple linters with custom settings (default is [Pylint](https://pypi.io/project/pylint/), but [Prospector](https://pypi.io/project/prospector/), [pycodestyle](https://pypi.io/project/pycodestyle/), [Flake8](https://pypi.io/project/flake8/), [pylama](https://github.com/klen/pylama), [pydocstyle](https://pypi.io/project/pydocstyle/), and [mypy](http://mypy-lang.org/) are also supported)
+* Debugging
+  + Watch window
+  + Evaluate Expressions
+  + Step through code ("Step in", "Step out", "Continue")
+  + Add/remove break points
+  + Local variables and arguments
+  + Multi-threaded applications
+  + Web applications (such as [Flask](http://flask.pocoo.org/) & [Django](https://www.djangoproject.com/), with template debugging)
+  + Expanding values (viewing children, properties, etc)
+  + Conditional break points
+  + Remote debugging (over SSH)
+  + Google App Engine
+  + Debugging in the integrated or external terminal window
+  + Debugging as sudo
+* Unit Testing
+  + Support for [unittest](https://docs.python.org/3/library/unittest.html#module-unittest), [pytest](https://pypi.io/project/pytest/), and [nose](https://pypi.io/project/nose/)
+  + Ability to run all failed tests, individual tests
+  + Debugging unit tests
+* Snippets
+* Miscellaneous
+  + Running a file or selected text in python terminal
+* Refactoring
+  + Rename Refactorings
+  + Extract Variable Refactorings
+  + Extract Method Refactorings
+  + Sort Imports
+
+![General Features](https://raw.githubusercontent.com/microsoft/vscode-python/master/images/general.gif)
+
+![Debugging](https://raw.githubusercontent.com/microsoft/vscode-python/master/images/debugDemo.gif)
+
+![Unit Tests](https://raw.githubusercontent.com/microsoft/vscode-python/master/images/unittest.gif)
+
+
+## Data/Telemetry
+The Microsoft Python Extension for Visual Studio Code collects usage
+data and sends it to Microsoft to help improve our products and
+services. Read our
+[privacy statement](https://privacy.microsoft.com/privacystatement) to
+learn more. This extension respects the `telemetry.enableTelemetry`
+setting which you can learn more about at
+https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting.
+>>>>>>> upstream/master