Skip to content

1228 multi root master #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
8d28c71
fix #1280 handle env in shebang (#1290)
DonJayamanne Oct 10, 2017
be9e535
fix #1282 use PYTHONIOENCODING variable (#1291)
DonJayamanne Oct 10, 2017
c69a724
fix #1270 debugger contribution changes (#1288)
DonJayamanne Oct 10, 2017
154d33a
merged master
DonJayamanne Oct 11, 2017
733dff2
forgot to save file before commiting a merge
DonJayamanne Oct 11, 2017
cf7723e
ability to opt out of telemetry using vscode settings (#1297)
DonJayamanne Oct 11, 2017
9de9f70
Fix #1284 debugging parameterized tests (#1299)
DonJayamanne Oct 11, 2017
e1ea437
fix #1298 remove vscode.startDebug command (#1300)
DonJayamanne Oct 11, 2017
2eda86a
#1288 installer config and tests (#1302)
DonJayamanne Oct 12, 2017
7fa680e
Merge branch 'master' into 1228MultiRootMaster
DonJayamanne Oct 12, 2017
215d9a8
fix #1276 Pre-commit hooks to ensure code complies with standards (#1…
DonJayamanne Oct 12, 2017
52d2554
merged master
DonJayamanne Oct 12, 2017
51103f1
1228 multi root workspace symbols (#1307)
DonJayamanne Oct 13, 2017
3457c62
Fixed travis unit tests (#1308)
DonJayamanne Oct 14, 2017
abdcf20
fix #1315 unit tests need to wait for extension to activate (#1316)
DonJayamanne Oct 16, 2017
792b022
fix #1314 allow for simultaneous language features (#1317)
DonJayamanne Oct 16, 2017
a019d44
#1228 support multi roots in language service (#1309)
DonJayamanne Oct 16, 2017
b7f2d0a
merged master
DonJayamanne Oct 16, 2017
f281674
add additional tests for #1314 (#1318)
DonJayamanne Oct 16, 2017
8fd2a31
#1228 run all tests under multiroot (#1322)
DonJayamanne Oct 18, 2017
00ad035
fix #1304 preserve empty lines (#1329)
DonJayamanne Oct 19, 2017
4adfed5
#1228 multiroot interpreter display (#1339)
DonJayamanne Oct 26, 2017
5203237
1228 multiroot interpreter ui changes (#1345)
DonJayamanne Oct 30, 2017
1e54bd9
fix 948 remove hardcoding of port number (#1353)
DonJayamanne Oct 30, 2017
45a456b
fix #1041 when debugging a test do not cancel it when re-discovering …
DonJayamanne Oct 30, 2017
2af5f54
merge master
DonJayamanne Oct 30, 2017
b2001ae
bug fix - in unit tests
DonJayamanne Oct 31, 2017
6f2b500
bug fix - in unit tests
DonJayamanne Oct 31, 2017
a6d87e5
#1228 multiroot unit test runner (#1357)
DonJayamanne Oct 31, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true

# Tab indentation
[*]
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
[{.travis.yml,npm-shrinkwrap.json,package.json}]
indent_style = space
indent_size = 4
15 changes: 15 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@

{
"env": {
"node": true,
"es6": true
},
"rules": {
"no-console": 0,
"no-cond-assign": 0,
"no-unused-vars": 1,
"no-extra-semi": "warn",
"semi": "warn"
},
"extends": "eslint:recommended"
}
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
out
node_modules
*.pyc
.vscode/.ropeproject/**
src/test/.vscode/**
**/.vscode/.ropeproject/**
**/testFiles/**/.cache/**
*.noseids
.vscode-test
__pycache__
npm-debug.log
**/.mypy_cache/**
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
64 changes: 25 additions & 39 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -33,7 +15,7 @@
"outFiles": [
"${workspaceRoot}/out/**/*.js"
],
"preLaunchTask": "npm"
"preLaunchTask": "compile"
},
{
"name": "Launch Extension as debugServer", // https://code.visualstudio.com/docs/extensions/example-debuggers
Expand Down Expand Up @@ -65,29 +47,33 @@
"outFiles": [
"${workspaceRoot}/out/**/*.js"
],
"preLaunchTask": "npm"
"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"
]
}
]
}
8 changes: 5 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
// Place your settings in this file to overwrite default and user settings.
{
"files.exclude": {
"out": false, // set this to true to hide the "out" folder with the compiled JS files
"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
Expand All @@ -15,6 +18,5 @@
"python.formatting.formatOnSave": false,
"python.unitTest.promptToConfigure": false,
"python.workspaceSymbols.enabled": false,
"python.pythonPath": "/Users/donjayamanne/Projects/PythonEnvs/p27/bin/python",
"python.formatting.provider": "yapf"
}
80 changes: 61 additions & 19 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,66 @@
// ${fileDirname}: the current opened file's dirname
// ${fileExtname}: the current opened file's extension
// ${cwd}: the current working directory of the spawned process

// A task runner that calls a custom npm script that compiles the extension.
{
"version": "0.1.0",

// we want to run npm
"command": "npm",

// the command is a shell script
"isShellCommand": true,

// show the output window only if unrecognized errors occur.
"showOutput": "silent",

// we run the custom script "compile" as defined in package.json
"args": ["run", "compile", "--loglevel", "silent"],
"isBackground": true,

// use the standard tsc in watch mode problem matcher to find compile problems in the output.
"problemMatcher": "$tsc-watch"
}
"version": "2.0.0",
"presentation": {
"echo": true,
"reveal": "always",
"focus": false,
"panel": "shared"
},
"tasks": [
{
"label": "compile",
"type": "npm",
"script": "compile",
"group": "build",
"isBackground": true,
"problemMatcher": [
"$tsc",
{
"base": "$tslint5",
"fileLocation": "relative"
}
]
},
{
"type": "npm",
"script": "lint",
"problemMatcher": {
"base": "$tslint5",
"fileLocation": "relative"
}
},
{
"type": "npm",
"script": "watch",
"isBackground": true,
"problemMatcher": "$tsc-watch"
},
{
"type": "gulp",
"task": "hygiene",
"problemMatcher": [
"$tsc",
{
"base": "$tslint5",
"fileLocation": "relative"
}
]
},
{
"label": "lint-staged",
"type": "npm",
"script": "lint-staged",
"problemMatcher": [
"$tsc",
{
"base": "$tslint5",
"fileLocation": "relative"
}
]
}
]
}
Loading