Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 588c2f9

Browse files
DonJayamanneDonJayamanne
committed
Merge remote-tracking branch 'upstream/master'
2 parents 8d8d2fc + 8e0e645 commit 588c2f9

File tree

239 files changed

+15396
-11423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+15396
-11423
lines changed

‎ISSUE_TEMPLATE.md renamed to ‎.github/ISSUE_TEMPLATE.md

File renamed without changes.

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ node_modules
99
__pycache__
1010
npm-debug.log
1111
**/.mypy_cache/**
12+
!yarn.lock
13+
coverage/
14+
.vscode-test/**

‎.travis.yml

+23-34
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,12 @@
11
language: python
22
cache: pip
33

4-
addons:
5-
apt:
6-
sources:
7-
- ubuntu-toolchain-r-test
8-
packages:
9-
- gcc-4.9
10-
- g++-4.9
11-
- gcc-4.9-multilib
12-
- g++-4.9-multilib
13-
- libgtk2.0-0
14-
- libx11-dev
15-
- libxkbfile-dev
16-
- libsecret-1-dev
17-
- python-dev
184
matrix:
195
include:
20-
# # Use the built in venv for linux builds
216
- os: linux
227
python: 2.7
238
- os: linux
249
python: 3.6
25-
# # # Use generic language for osx
26-
# - os: osx
27-
# language: generic
28-
# env: PYTHON=2.7.10
29-
# # Use generic language for osx
30-
# - os: osx
31-
# language: generic
32-
# env: PYTHON=3.6.1
33-
# Perform the manual steps on osx to install python 2.7.1 and 3.6.1 and set it as the global interpreter.
34-
# This way when the node unit tests will pick the right version of python (from global)
3510
before_install: |
3611
if [ $TRAVIS_OS_NAME == "linux" ]; then
3712
export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
@@ -43,17 +18,31 @@ before_install: |
4318
source ./.nvm/nvm.sh
4419
nvm install 8.9.1
4520
nvm use 8.9.1
46-
npm i -g [email protected]
47-
npm config set python `which python`
48-
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
49-
pyenv install $PYTHON
50-
pyenv global $PYTHON
51-
fi
21+
yarn global add vsce
22+
yarn global add azure-cli
5223
export TRAVIS_PYTHON_PATH=`which python`
5324
install:
5425
- pip install --upgrade -r requirements.txt
55-
- npm install
56-
- npm run vscode:prepublish
26+
- yarn
5727

5828
script:
59-
- npm test --silent
29+
- yarn run clean
30+
- yarn run vscode:prepublish
31+
- yarn run cover:enable
32+
- yarn run testSingleWorkspace --silent
33+
- if [ $TRAVIS_UPLOAD_COVERAGE == "true" ]; then
34+
bash <(curl -s https://codecov.io/bash);
35+
fi
36+
- yarn run clean
37+
- yarn run vscode:prepublish
38+
- yarn run cover:enable
39+
- yarn run testMultiWorkspace --silent
40+
- if [ $TRAVIS_UPLOAD_COVERAGE == "true" ]; then
41+
bash <(curl -s https://codecov.io/bash);
42+
fi
43+
after_success:
44+
- if [ $AZURE_STORAGE_ACCOUNT ]; then
45+
yarn run clean;
46+
vsce package;
47+
azure storage blob upload --container $AZURE_STORAGE_CONTAINER --blob ms-python-insiders.vsix --account-name $AZURE_STORAGE_ACCOUNT --account-key $AZURE_STORAGE_ACCESS_KEY --file python*.vsix --quiet;
48+
fi

‎.vscode/launch.json

+93-77
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,96 @@
11
// A launch configuration that compiles the extension and then opens it inside a new window
22
{
3-
"version": "0.1.0",
4-
"configurations": [
5-
{
6-
"name": "Launch Extension",
7-
"type": "extensionHost",
8-
"request": "launch",
9-
"runtimeExecutable": "${execPath}",
10-
"args": [
11-
"--extensionDevelopmentPath=${workspaceFolder}"
12-
],
13-
"stopOnEntry": false,
14-
"sourceMaps": true,
15-
"outFiles": [
16-
"${workspaceFolder}/out/**/*.js"
17-
],
18-
"preLaunchTask": "Compile"
19-
},
20-
{
21-
"name": "Launch Extension as debugServer", // https://code.visualstudio.com/docs/extensions/example-debuggers
22-
"type": "node",
23-
"request": "launch",
24-
"program": "${workspaceFolder}/out/client/debugger/Main.js",
25-
"stopOnEntry": false,
26-
"args": [
27-
"--server=4711"
28-
],
29-
"sourceMaps": true,
30-
"outFiles": [
31-
"${workspaceFolder}/out/client/**/*.js"
32-
],
33-
"cwd": "${workspaceFolder}",
34-
"preLaunchTask": "Compile"
35-
},
36-
{
37-
"name": "Launch Tests",
38-
"type": "extensionHost",
39-
"request": "launch",
40-
"runtimeExecutable": "${execPath}",
41-
"args": [
42-
"${workspaceFolder}/src/test",
43-
"--extensionDevelopmentPath=${workspaceFolder}",
44-
"--extensionTestsPath=${workspaceFolder}/out/test"
45-
],
46-
"stopOnEntry": false,
47-
"sourceMaps": true,
48-
"outFiles": [
49-
"${workspaceFolder}/out/**/*.js"
50-
],
51-
"preLaunchTask": "Compile"
52-
},
53-
{
54-
"name": "Launch Multiroot Tests",
55-
"type": "extensionHost",
56-
"request": "launch",
57-
"runtimeExecutable": "${execPath}",
58-
"args": [
59-
"${workspaceFolder}/src/testMultiRootWkspc/multi.code-workspace",
60-
"--extensionDevelopmentPath=${workspaceFolder}",
61-
"--extensionTestsPath=${workspaceFolder}/out/test"
62-
],
63-
"stopOnEntry": false,
64-
"sourceMaps": true,
65-
"outFiles": [
66-
"${workspaceFolder}/out/**/*.js"
67-
],
68-
"preLaunchTask": "Compile"
69-
}
70-
],
71-
"compounds": [
72-
{
73-
"name": "Extension + Debugger",
74-
"configurations": [
75-
"Launch Extension",
76-
"Launch Extension as debugServer"
77-
]
78-
}
79-
]
3+
"version": "0.1.0",
4+
"configurations": [
5+
{
6+
"name": "Launch Extension",
7+
"type": "extensionHost",
8+
"request": "launch",
9+
"runtimeExecutable": "${execPath}",
10+
"args": [
11+
"--extensionDevelopmentPath=${workspaceFolder}"
12+
],
13+
"stopOnEntry": false,
14+
"sourceMaps": true,
15+
"outFiles": [
16+
"${workspaceFolder}/out/**/*.js"
17+
],
18+
"preLaunchTask": "Compile"
19+
},
20+
{
21+
"name": "Launch Extension as debugServer", // https://code.visualstudio.com/docs/extensions/example-debuggers
22+
"type": "node",
23+
"request": "launch",
24+
"program": "${workspaceFolder}/out/client/debugger/Main.js",
25+
"stopOnEntry": false,
26+
"args": [
27+
"--server=4711"
28+
],
29+
"sourceMaps": true,
30+
"outFiles": [
31+
"${workspaceFolder}/out/client/**/*.js"
32+
],
33+
"cwd": "${workspaceFolder}",
34+
"preLaunchTask": "Compile"
35+
},
36+
{
37+
"name": "Launch Tests",
38+
"type": "extensionHost",
39+
"request": "launch",
40+
"runtimeExecutable": "${execPath}",
41+
"args": [
42+
"${workspaceFolder}/src/test",
43+
"--extensionDevelopmentPath=${workspaceFolder}",
44+
"--extensionTestsPath=${workspaceFolder}/out/test"
45+
],
46+
"stopOnEntry": false,
47+
"sourceMaps": true,
48+
"outFiles": [
49+
"${workspaceFolder}/out/**/*.js"
50+
],
51+
"preLaunchTask": "Compile"
52+
},
53+
{
54+
"name": "Launch Multiroot Tests",
55+
"type": "extensionHost",
56+
"request": "launch",
57+
"runtimeExecutable": "${execPath}",
58+
"args": [
59+
"${workspaceFolder}/src/testMultiRootWkspc/multi.code-workspace",
60+
"--extensionDevelopmentPath=${workspaceFolder}",
61+
"--extensionTestsPath=${workspaceFolder}/out/test"
62+
],
63+
"stopOnEntry": false,
64+
"sourceMaps": true,
65+
"outFiles": [
66+
"${workspaceFolder}/out/**/*.js"
67+
],
68+
"preLaunchTask": "Compile"
69+
},
70+
{
71+
"name": "Launch Tests (with code coverage)",
72+
"type": "extensionHost",
73+
"request": "launch",
74+
"runtimeExecutable": "${execPath}",
75+
"args": [
76+
"${workspaceFolder}/src/test",
77+
"--extensionDevelopmentPath=${workspaceFolder}",
78+
"--extensionTestsPath=${workspaceFolder}/out/test"
79+
],
80+
"stopOnEntry": false,
81+
"sourceMaps": true,
82+
"outFiles": [
83+
"${workspaceFolder}/out/**/*.js"
84+
]
85+
}
86+
],
87+
"compounds": [
88+
{
89+
"name": "Extension + Debugger",
90+
"configurations": [
91+
"Launch Extension",
92+
"Launch Extension as debugServer"
93+
]
94+
}
95+
]
8096
}

‎.vscode/settings.json

+18-17
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
// Place your settings in this file to overwrite default and user settings.
22
{
3-
"files.exclude": {
4-
"out": true, // set this to true to hide the "out" folder with the compiled JS files
5-
"**/*.pyc": true,
6-
"**/__pycache__": true,
7-
"node_modules": true,
8-
".vscode-test": true,
9-
"**/.mypy_cache/**": true,
10-
"**/.ropeproject/**": true
11-
},
12-
"search.exclude": {
13-
"out": true // set this to false to include "out" folder in search results
14-
},
15-
"typescript.tsdk": "./node_modules/typescript/lib", // we want to use the TS server from our node_modules folder to control its version
16-
"tslint.enable": true,
17-
"python.linting.enabled": false,
18-
"python.unitTest.promptToConfigure": false,
19-
"python.workspaceSymbols.enabled": false,
3+
"files.exclude": {
4+
"out": true, // set this to true to hide the "out" folder with the compiled JS files
5+
"**/*.pyc": true,
6+
"**/__pycache__": true,
7+
"node_modules": true,
8+
".vscode-test": true,
9+
"**/.mypy_cache/**": true,
10+
"**/.ropeproject/**": true
11+
},
12+
"search.exclude": {
13+
"out": true, // set this to false to include "out" folder in search results
14+
"coverage": true
15+
},
16+
"typescript.tsdk": "./node_modules/typescript/lib", // we want to use the TS server from our node_modules folder to control its version
17+
"tslint.enable": true,
18+
"python.linting.enabled": false,
19+
"python.unitTest.promptToConfigure": false,
20+
"python.workspaceSymbols.enabled": false,
2021
"python.formatting.provider": "none",
2122
"files.insertFinalNewline": true
2223
}

‎.vscodeignore

+18
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,37 @@
11
.vscode/**
2+
.vscode-test/**
3+
.github/**
4+
.nvm/**
25
typings/**
36
out/test/**
7+
out/src/**
48
out/pythonFiles/**
9+
out/testMultiRootWkspc/**
10+
out/coverconfig.json
511
test/**
612
src/**
713
scripts/**
814
**/*.map
915
.gitignore
1016
.gitmodules
17+
.editorconfig
18+
.eslintrc
19+
.gitattributes
1120
images/**/*.gif
1221
images/**/*.png
1322
tsconfig.json
1423
typings.json
24+
coverconfig.json
25+
tslint.json
26+
tsfmt.json
27+
gulpfile.js
1528
pythonFiles/**/*.pyc
1629
requirements.txt
1730
vsc-extension-quickstart.md
1831
.travis.yml
1932
webpack.config.js
33+
yarn.lock
34+
coverage/**
35+
CODE_OF_CONDUCT.md
36+
CODING_STANDARDS.md
37+
CONTRIBUTING.md

0 commit comments

Comments
 (0)