From 8da068ad51c8a90ac2195a43349aec03edb8a905 Mon Sep 17 00:00:00 2001 From: Yan Zhang Date: Fri, 31 Aug 2018 13:53:00 +0800 Subject: [PATCH 1/3] Update testplan for setting environment variables. (#394) * Update testplan for setting environment variables. * Update TestPlan.md --- TestPlan.md | 10 ++++++++ .../26.environmentVariables/.classpath | 6 +++++ testprojects/26.environmentVariables/.project | 17 ++++++++++++++ .../.vscode/launch.json | 23 +++++++++++++++++++ .../src/main/java/EnvrionmentVariable.java | 8 +++++++ 5 files changed, 64 insertions(+) create mode 100644 testprojects/26.environmentVariables/.classpath create mode 100644 testprojects/26.environmentVariables/.project create mode 100644 testprojects/26.environmentVariables/.vscode/launch.json create mode 100644 testprojects/26.environmentVariables/src/main/java/EnvrionmentVariable.java diff --git a/TestPlan.md b/TestPlan.md index 1f0c85a9..123764bb 100644 --- a/TestPlan.md +++ b/TestPlan.md @@ -419,3 +419,13 @@ Exception in thread "main" java.lang.IllegalStateException 7. Verify that the program starts, and there is no information in "watch" and "callstack" view. 8. Click the "pause" button in the toolbar, it should NOT pause the program. 9. Click the "stop" button in the toolbar, it should stop the program. + + +## Environment Variables +1. Open `26.environmentVariables` in vscode. +2. Press F5 to start. +3. Verify the output in Debug Console should be as following: + ``` + CustomEnv: This env is for test plan. + SystemPath: + ``` diff --git a/testprojects/26.environmentVariables/.classpath b/testprojects/26.environmentVariables/.classpath new file mode 100644 index 00000000..02610159 --- /dev/null +++ b/testprojects/26.environmentVariables/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/testprojects/26.environmentVariables/.project b/testprojects/26.environmentVariables/.project new file mode 100644 index 00000000..9c16656a --- /dev/null +++ b/testprojects/26.environmentVariables/.project @@ -0,0 +1,17 @@ + + + 26.environmentVariables + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/testprojects/26.environmentVariables/.vscode/launch.json b/testprojects/26.environmentVariables/.vscode/launch.json new file mode 100644 index 00000000..8bd81fb1 --- /dev/null +++ b/testprojects/26.environmentVariables/.vscode/launch.json @@ -0,0 +1,23 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + + { + "type": "java", + "name": "Debug (Launch)-EnvrionmentVariable<26.environmentVariables>", + "request": "launch", + "cwd": "${workspaceFolder}", + "console": "internalConsole", + "stopOnEntry": false, + "mainClass": "EnvrionmentVariable", + "args": "", + "projectName": "26.environmentVariables", + "env": { + "CUSTOM_ENV_FOR_TEST_PLAN": "This env is for test plan." + } + } + ] +} \ No newline at end of file diff --git a/testprojects/26.environmentVariables/src/main/java/EnvrionmentVariable.java b/testprojects/26.environmentVariables/src/main/java/EnvrionmentVariable.java new file mode 100644 index 00000000..2efe8edd --- /dev/null +++ b/testprojects/26.environmentVariables/src/main/java/EnvrionmentVariable.java @@ -0,0 +1,8 @@ +public class EnvrionmentVariable { + public static void main(String[] args) { + String customEnv = System.getenv("CUSTOM_ENV_FOR_TEST_PLAN"); + String systemPath = System.getenv("PATH"); + System.out.println(String.format("CustomEnv: %s", customEnv)); + System.out.println(String.format("SystemPath: %s", systemPath)); + } +} \ No newline at end of file From 210df128cec8783d920131075bff2ec85e216d2e Mon Sep 17 00:00:00 2001 From: Yan Zhang Date: Fri, 31 Aug 2018 14:41:07 +0800 Subject: [PATCH 2/3] Update changelog for hotfix 0.12.1 (#396) * Update changelog for hotfix 0.12.1 * Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89c5976c..046b8c1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to the "vscode-java-debugger" extension will be documented i The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## 0.12.1 - 2018-8-31 +### Fixed +- Fix: `env` config in launch.json not respected. [#393](https://github.com/Microsoft/vscode-java-debug/issues/393). + ## 0.12.0 - 2018-8-29 ### Added - Start without debugging. See [#351](https://github.com/Microsoft/vscode-java-debug/issues/351). From 9bc2a6a52cfb0aad62f7cf7232a3139cadc3c2d7 Mon Sep 17 00:00:00 2001 From: Yan Zhang Date: Fri, 31 Aug 2018 14:41:24 +0800 Subject: [PATCH 3/3] Bump version to 0.12.1 (#397) --- package-lock.json | 188 +++++++++++++++++++++------------------------- package.json | 6 +- 2 files changed, 90 insertions(+), 104 deletions(-) diff --git a/package-lock.json b/package-lock.json index a66f4587..61df62d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "vscode-java-debug", - "version": "0.12.0", + "version": "0.12.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2118,23 +2118,21 @@ "dev": true, "optional": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -2147,20 +2145,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -2201,7 +2196,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "fs.realpath": { @@ -2216,14 +2211,14 @@ "dev": true, "optional": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "glob": { @@ -2232,12 +2227,12 @@ "dev": true, "optional": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "has-unicode": { @@ -2252,7 +2247,7 @@ "dev": true, "optional": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": "^2.1.0" } }, "ignore-walk": { @@ -2261,7 +2256,7 @@ "dev": true, "optional": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "inflight": { @@ -2270,15 +2265,14 @@ "dev": true, "optional": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -2290,9 +2284,8 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "isarray": { @@ -2305,25 +2298,22 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "safe-buffer": "^5.1.1", + "yallist": "^3.0.0" } }, "minizlib": { @@ -2332,14 +2322,13 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "mkdirp": { "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -2356,9 +2345,9 @@ "dev": true, "optional": true, "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.21", - "sax": "1.2.4" + "debug": "^2.1.2", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" } }, "node-pre-gyp": { @@ -2367,16 +2356,16 @@ "dev": true, "optional": true, "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.7", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.1" + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.0", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.1.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4" } }, "nopt": { @@ -2385,8 +2374,8 @@ "dev": true, "optional": true, "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" + "abbrev": "1", + "osenv": "^0.1.4" } }, "npm-bundled": { @@ -2401,8 +2390,8 @@ "dev": true, "optional": true, "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, "npmlog": { @@ -2411,17 +2400,16 @@ "dev": true, "optional": true, "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -2433,9 +2421,8 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os-homedir": { @@ -2456,8 +2443,8 @@ "dev": true, "optional": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "path-is-absolute": { @@ -2478,10 +2465,10 @@ "dev": true, "optional": true, "requires": { - "deep-extend": "0.5.1", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.5.1", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -2498,13 +2485,13 @@ "dev": true, "optional": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rimraf": { @@ -2513,7 +2500,7 @@ "dev": true, "optional": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-buffer": { @@ -2555,11 +2542,10 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -2568,7 +2554,7 @@ "dev": true, "optional": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -2576,7 +2562,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { @@ -2591,13 +2577,13 @@ "dev": true, "optional": true, "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "chownr": "^1.0.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.2.4", + "minizlib": "^1.1.0", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.1", + "yallist": "^3.0.2" } }, "util-deprecate": { @@ -2612,7 +2598,7 @@ "dev": true, "optional": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2" } }, "wrappy": { @@ -6478,8 +6464,8 @@ "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", "dev": true, "requires": { - "clone": "0.2.0", - "clone-stats": "0.0.1" + "clone": "^0.2.0", + "clone-stats": "^0.0.1" } } } @@ -6609,7 +6595,7 @@ "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", "dev": true, "requires": { - "has-flag": "2.0.0" + "has-flag": "^2.0.0" } } } diff --git a/package.json b/package.json index 2fccb013..a6e5b3f1 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-java-debug", "displayName": "Debugger for Java", "description": "A lightweight Java debugger for Visual Studio Code", - "version": "0.12.0", + "version": "0.12.1", "publisher": "vscjava", "preview": true, "aiKey": "67d4461e-ccba-418e-8082-1bd0acfe8516", @@ -37,7 +37,7 @@ "main": "./out/src/extension", "contributes": { "javaExtensions": [ - "./server/com.microsoft.java.debug.plugin-0.12.0.jar" + "./server/com.microsoft.java.debug.plugin-0.12.1.jar" ], "commands": [], "debuggers": [ @@ -366,7 +366,7 @@ "vscode:prepublish": "tsc -p ./", "compile": "tsc -watch -p ./", "postinstall": "node ./node_modules/vscode/bin/install", - "test": "node ./scripts/download-vscode-for-system-tests && node ./scripts/install-vsix-dependencies redhat.java && node ./scripts/install-vsix-dependencies vscode-java-debug-0.12.0.vsix && node ./scripts/run-vscode-tests" + "test": "node ./scripts/download-vscode-for-system-tests && node ./scripts/install-vsix-dependencies redhat.java && node ./scripts/install-vsix-dependencies vscode-java-debug-0.12.1.vsix && node ./scripts/run-vscode-tests" }, "extensionDependencies": [ "redhat.java"