GeezerVison is showing github.com — #1228 multi root master (#2) · iceesj/pythonVSCode@2bc6b2e
File treeExpand file treeCollapse file tree Open diff view settings Some content is hiddenLarge Commits have some content hidden by default. Use the searchbox below for content that may be hidden. Dismiss bannerExpand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: .editorconfig +1Lines changed: 1 addition & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -8,6 +8,7 @@ root = true | 8 | 8 | indent_style = space | 9 | 9 | indent_size = 4 | 10 | 10 | trim_trailing_whitespace = true | | 11 | +insert_final_newline = true | 11 | 12 |
| 12 | 13 | # The indent size used in the `package.json` file cannot be changed | 13 | 14 | # https://github.com/npm/npm/pull/3180#issuecomment-16336516 | |
Collapse file Copy file name to clipboardExpand all lines: .gitignore +5-2Lines changed: 5 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 2 | 2 | out | 3 | 3 | node_modules | 4 | 4 | *.pyc | 5 | | -.vscode/.ropeproject/** | 6 | | -src/test/.vscode/** | | 5 | +**/.vscode/.ropeproject/** | 7 | 6 | **/testFiles/**/.cache/** | 8 | 7 | *.noseids | | 8 | +.vscode-test | | 9 | +__pycache__ | | 10 | +npm-debug.log | | 11 | +**/.mypy_cache/** |
Collapse file Copy file name to clipboardExpand all lines: .jshintignore -1Lines changed: 0 additions & 1 deletion Collapse file Copy file name to clipboardExpand all lines: .jshintrc -10Lines changed: 0 additions & 10 deletions Collapse file Copy file name to clipboardExpand all lines: .travis.yml +1Lines changed: 1 addition & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -48,6 +48,7 @@ before_install: | | 48 | 48 | pyenv install $PYTHON | 49 | 49 | pyenv global $PYTHON | 50 | 50 | fi | | 51 | + export TRAVIS_PYTHON_PATH=`which python` | 51 | 52 | install: | 52 | 53 | - pip install --upgrade -r requirements.txt | 53 | 54 | - npm install | |
Collapse file Copy file name to clipboard +29-40Lines changed: 29 additions & 40 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 | // A launch configuration that compiles the extension and then opens it inside a new window | 2 | 2 | { | 3 | 3 | "version": "0.1.0", | 4 | | - "configurations": [{ | 5 | | - "name": "CompletionServer.ppy", | 6 | | - "type": "python", | 7 | | - "request": "launch", | 8 | | - "stopOnEntry": true, | 9 | | - "pythonPath": "python", | 10 | | - "program": "${workspaceRoot}/pythonFiles/completionServer.py", | 11 | | - "cwd": "${workspaceRoot}", | 12 | | - "env": {}, | 13 | | - "args": [ | 14 | | - "123" | 15 | | - ], | 16 | | - "envFile": "${workspaceRoot}/.env", | 17 | | - "debugOptions": [ | 18 | | - "WaitOnAbnormalExit", | 19 | | - "WaitOnNormalExit", | 20 | | - "RedirectOutput" | 21 | | - ] | 22 | | - }, | | 4 | + "configurations": [ | 23 | 5 | { | 24 | 6 | "name": "Launch Extension", | 25 | 7 | "type": "extensionHost", | | 30 | 12 | ], | 31 | 13 | "stopOnEntry": false, | 32 | 14 | "sourceMaps": true, | 33 | | - "outDir": "${workspaceRoot}/out", | | 15 | + "outFiles": [ | | 16 | + "${workspaceRoot}/out/**/*.js" | | 17 | + ], | 34 | 18 | "preLaunchTask": "compile" | 35 | 19 | }, | 36 | 20 | { | | 43 | 27 | "--server=4711" | 44 | 28 | ], | 45 | 29 | "sourceMaps": true, | 46 | | - "outDir": "${workspaceRoot}/out/client", | | 30 | + "outFiles": [ | | 31 | + "${workspaceRoot}/out/client/**/*.js" | | 32 | + ], | 47 | 33 | "cwd": "${workspaceRoot}" | 48 | 34 | }, | 49 | 35 | { | | 58 | 44 | ], | 59 | 45 | "stopOnEntry": false, | 60 | 46 | "sourceMaps": true, | 61 | | - "xxoutDir": "${workspaceRoot}/out/test", | 62 | 47 | "outFiles": [ | 63 | 48 | "${workspaceRoot}/out/**/*.js" | 64 | 49 | ], | 65 | 50 | "preLaunchTask": "compile" | 66 | 51 | }, | 67 | 52 | { | 68 | | - "name": "Python", | 69 | | - "type": "python", | | 53 | + "name": "Launch Multiroot Tests", | | 54 | + "type": "extensionHost", | 70 | 55 | "request": "launch", | 71 | | - "stopOnEntry": true, | 72 | | - "pythonPath": "python", | 73 | | - "program": "${file}", | 74 | | - "console": "integratedTerminal", | 75 | | - "args": [], | 76 | | - "debugOptions": [ | 77 | | - "WaitOnAbnormalExit", | 78 | | - "WaitOnNormalExit", | 79 | | - "RedirectOutput" | | 56 | + "runtimeExecutable": "${execPath}", | | 57 | + "args": [ | | 58 | + "${workspaceRoot}/src/testMultiRootWkspc/multi.code-workspace", | | 59 | + "--extensionDevelopmentPath=${workspaceRoot}", | | 60 | + "--extensionTestsPath=${workspaceRoot}/out/test" | 80 | 61 | ], | 81 | | - "cwd": "${workspaceRoot}" | | 62 | + "stopOnEntry": false, | | 63 | + "sourceMaps": true, | | 64 | + "outFiles": [ | | 65 | + "${workspaceRoot}/out/**/*.js" | | 66 | + ], | | 67 | + "preLaunchTask": "compile" | 82 | 68 | } | 83 | 69 | ], | 84 | | - "compounds": [{ | 85 | | - "name": "Extension + Debugger", | 86 | | - "configurations": [ | 87 | | - "Launch Extension", "Launch Extension as debugServer" | 88 | | - ] | 89 | | - }] | | 70 | + "compounds": [ | | 71 | + { | | 72 | + "name": "Extension + Debugger", | | 73 | + "configurations": [ | | 74 | + "Launch Extension", | | 75 | + "Launch Extension as debugServer" | | 76 | + ] | | 77 | + } | | 78 | + ] | 90 | 79 | } |
Collapse file Copy file name to clipboardExpand all lines: .vscode/settings.json +4-1Lines changed: 4 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 4 | 4 | "out": true, // set this to true to hide the "out" folder with the compiled JS files | 5 | 5 | "**/*.pyc": true, | 6 | 6 | "**/__pycache__": true, | 7 | | - "node_modules": true | | 7 | + "node_modules": true, | | 8 | + ".vscode-test": true, | | 9 | + "**/.mypy_cache/**": true, | | 10 | + "**/.ropeproject/**": true | 8 | 11 | }, | 9 | 12 | "search.exclude": { | 10 | 13 | "out": true // set this to false to include "out" folder in search results | |
Collapse file Copy file name to clipboardExpand all lines: .vscode/tasks.json +12Lines changed: 12 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 53 | 53 | "fileLocation": "relative" | 54 | 54 | } | 55 | 55 | ] | | 56 | + }, | | 57 | + { | | 58 | + "label": "lint-staged", | | 59 | + "type": "npm", | | 60 | + "script": "lint-staged", | | 61 | + "problemMatcher": [ | | 62 | + "$tsc", | | 63 | + { | | 64 | + "base": "$tslint5", | | 65 | + "fileLocation": "relative" | | 66 | + } | | 67 | + ] | 56 | 68 | } | 57 | 69 | ] | 58 | 70 | } |
Collapse file Copy file name to clipboardExpand all lines: gulpfile.js +9-8Lines changed: 9 additions & 8 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -80,7 +80,7 @@ function reportFailures(failures) { | 80 | 80 | const line = position.lineAndCharacter ? position.lineAndCharacter.line : position.line; | 81 | 81 | const character = position.lineAndCharacter ? position.lineAndCharacter.character : position.character; | 82 | 82 |
| 83 | | - // Output in format similar to tslint for the linter to pickup | | 83 | + // Output in format similar to tslint for the linter to pickup. | 84 | 84 | console.error(`ERROR: (${failure.ruleName}) ${relative(__dirname, name)}[${line + 1}, ${character + 1}]: ${failure.failure}`); | 85 | 85 | }); | 86 | 86 | } | @@ -103,9 +103,9 @@ const hygiene = exports.hygiene = (some, options) => { | 103 | 103 | .split(/\r\n|\r|\n/) | 104 | 104 | .forEach((line, i) => { | 105 | 105 | if (/^\s*$/.test(line)) { | 106 | | - // empty or whitespace lines are OK | | 106 | + // Empty or whitespace lines are OK. | 107 | 107 | } else if (/^(\s\s\s\s)+.*/.test(line)) { | 108 | | - // good indent | | 108 | + // Good indent. | 109 | 109 | } else if (/^[\t]+.*/.test(line)) { | 110 | 110 | console.error(file.relative + '(' + (i + 1) + ',1): Bad whitespace indentation'); | 111 | 111 | errorCount++; | @@ -118,9 +118,10 @@ const hygiene = exports.hygiene = (some, options) => { | 118 | 118 | const formatting = es.map(function (file, cb) { | 119 | 119 | tsfmt.processString(file.path, file.contents.toString('utf8'), { | 120 | 120 | verify: true, | 121 | | - tsfmt: true, | 122 | | - editorconfig: true | 123 | | - // verbose: true | | 121 | + tsconfig: true, | | 122 | + tslint: true, | | 123 | + editorconfig: true, | | 124 | + tsfmt: true | 124 | 125 | }).then(result => { | 125 | 126 | if (result.error) { | 126 | 127 | console.error(result.message); | @@ -176,7 +177,7 @@ const hygiene = exports.hygiene = (some, options) => { | 176 | 177 | console.error(error.message); | 177 | 178 | }, | 178 | 179 | finish: function () { | 179 | | - // forget the summary | | 180 | + // forget the summary. | 180 | 181 | } | 181 | 182 | }; | 182 | 183 | } | @@ -213,7 +214,7 @@ const hygiene = exports.hygiene = (some, options) => { | 213 | 214 |
| 214 | 215 | gulp.task('hygiene', () => hygiene()); | 215 | 216 |
| 216 | | -// this allows us to run hygiene as a git pre-commit hook | | 217 | +// this allows us to run hygiene as a git pre-commit hook. | 217 | 218 | if (require.main === module) { | 218 | 219 | const cp = require('child_process'); | 219 | 220 |
| |
|