From c6afbbb50ce16489f082359597668aaa98b6af80 Mon Sep 17 00:00:00 2001 From: Pine Wu Date: Mon, 29 Oct 2018 12:11:44 -0700 Subject: [PATCH] Make the hellocode sample self-explanatory --- hellocode-minimal-sample/package.json | 2 +- hellocode-sample/.prettierrc.json | 5 - hellocode-sample/.vscode/extensions.json | 7 -- hellocode-sample/.vscode/launch.json | 14 --- hellocode-sample/.vscode/settings.json | 3 - hellocode-sample/.vscodeignore | 9 -- hellocode-sample/package-lock.json | 105 +++++--------------- hellocode-sample/package.json | 19 ++-- hellocode-sample/src/extension.ts | 6 +- hellocode-sample/src/test/extension.test.ts | 21 ---- hellocode-sample/src/test/index.ts | 22 ---- hellocode-sample/tslint.json | 6 -- 12 files changed, 36 insertions(+), 183 deletions(-) delete mode 100644 hellocode-sample/.prettierrc.json delete mode 100644 hellocode-sample/.vscode/extensions.json delete mode 100644 hellocode-sample/.vscode/settings.json delete mode 100644 hellocode-sample/.vscodeignore delete mode 100644 hellocode-sample/src/test/extension.test.ts delete mode 100644 hellocode-sample/src/test/index.ts delete mode 100644 hellocode-sample/tslint.json diff --git a/hellocode-minimal-sample/package.json b/hellocode-minimal-sample/package.json index 724a2a21..ee55546a 100644 --- a/hellocode-minimal-sample/package.json +++ b/hellocode-minimal-sample/package.json @@ -9,7 +9,7 @@ "activationEvents": [ "onCommand:extension.sayHello" ], - "main": "./extension", + "main": "./extension.js", "contributes": { "commands": [ { diff --git a/hellocode-sample/.prettierrc.json b/hellocode-sample/.prettierrc.json deleted file mode 100644 index c090136a..00000000 --- a/hellocode-sample/.prettierrc.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "useTabs": true, - "printWidth": 120, - "singleQuote": true -} \ No newline at end of file diff --git a/hellocode-sample/.vscode/extensions.json b/hellocode-sample/.vscode/extensions.json deleted file mode 100644 index ee71911b..00000000 --- a/hellocode-sample/.vscode/extensions.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - // See http://go.microsoft.com/fwlink/?LinkId=827846 - // for the documentation about the extensions.json format - "recommendations": [ - "eg2.tslint" - ] -} \ No newline at end of file diff --git a/hellocode-sample/.vscode/launch.json b/hellocode-sample/.vscode/launch.json index 527cbf4b..a875cead 100644 --- a/hellocode-sample/.vscode/launch.json +++ b/hellocode-sample/.vscode/launch.json @@ -16,20 +16,6 @@ "${workspaceFolder}/out/**/*.js" ], "preLaunchTask": "npm: watch" - }, - { - "name": "Run Extension Tests", - "type": "extensionHost", - "request": "launch", - "runtimeExecutable": "${execPath}", - "args": [ - "--extensionDevelopmentPath=${workspaceFolder}", - "--extensionTestsPath=${workspaceFolder}/out/test" - ], - "outFiles": [ - "${workspaceFolder}/out/test/**/*.js" - ], - "preLaunchTask": "npm: watch" } ] } diff --git a/hellocode-sample/.vscode/settings.json b/hellocode-sample/.vscode/settings.json deleted file mode 100644 index e46111f1..00000000 --- a/hellocode-sample/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "editor.insertSpaces": false -} \ No newline at end of file diff --git a/hellocode-sample/.vscodeignore b/hellocode-sample/.vscodeignore deleted file mode 100644 index 85571789..00000000 --- a/hellocode-sample/.vscodeignore +++ /dev/null @@ -1,9 +0,0 @@ -.vscode/** -.vscode-test/** -out/test/** -out/**/*.map -src/** -.gitignore -tsconfig.json -vsc-extension-quickstart.md -tslint.json \ No newline at end of file diff --git a/hellocode-sample/package-lock.json b/hellocode-sample/package-lock.json index a9efdd27..b5dcd957 100644 --- a/hellocode-sample/package-lock.json +++ b/hellocode-sample/package-lock.json @@ -4,12 +4,6 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "@types/mocha": { - "version": "2.2.48", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.48.tgz", - "integrity": "sha512-nlK/iyETgafGli8Zh9zJVCTicvU3iajSkRwOh3Hhiva598CMqNJ4NcVCGMTGKpGpTYj/9R8RLzS9NAykSSCqGw==", - "dev": true - }, "@types/node": { "version": "8.10.30", "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.30.tgz", @@ -46,24 +40,13 @@ "ansi-wrap": "0.1.0" } }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, "ansi-wrap": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=", "dev": true }, +<<<<<<< Updated upstream "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -73,6 +56,8 @@ "sprintf-js": "1.0.3" } }, +======= +>>>>>>> Stashed changes "arr-diff": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz", @@ -167,6 +152,7 @@ "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", "dev": true }, +<<<<<<< Updated upstream "babel-code-frame": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", @@ -193,6 +179,8 @@ } } }, +======= +>>>>>>> Stashed changes "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -257,18 +245,13 @@ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", "dev": true }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true - }, "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", "dev": true }, +<<<<<<< Updated upstream "chalk": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", @@ -300,6 +283,8 @@ } } }, +======= +>>>>>>> Stashed changes "clone": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", @@ -335,21 +320,6 @@ "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", "dev": true }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, "combined-stream": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", @@ -359,12 +329,6 @@ "delayed-stream": "1.0.0" } }, - "commander": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.18.0.tgz", - "integrity": "sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==", - "dev": true - }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -419,12 +383,6 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, - "diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", - "dev": true - }, "duplexer": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", @@ -469,18 +427,6 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true - }, "event-stream": { "version": "3.3.4", "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", @@ -1076,6 +1022,7 @@ "har-schema": "2.0.0" } }, +<<<<<<< Updated upstream "has-ansi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", @@ -1091,6 +1038,8 @@ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, +======= +>>>>>>> Stashed changes "he": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", @@ -1255,6 +1204,7 @@ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", "dev": true }, +<<<<<<< Updated upstream "js-tokens": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", @@ -1271,6 +1221,8 @@ "esprima": "4.0.1" } }, +======= +>>>>>>> Stashed changes "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", @@ -1639,12 +1591,6 @@ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, - "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", - "dev": true - }, "pause-stream": { "version": "0.0.11", "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", @@ -1831,6 +1777,7 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, +<<<<<<< Updated upstream "resolve": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", @@ -1840,6 +1787,8 @@ "path-parse": "1.0.6" } }, +======= +>>>>>>> Stashed changes "rimraf": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", @@ -1892,12 +1841,6 @@ "through": "2.3.8" } }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, "sshpk": { "version": "1.14.2", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz", @@ -1960,6 +1903,7 @@ "safe-buffer": "5.1.2" } }, +<<<<<<< Updated upstream "strip-ansi": { "version": "3.0.1", "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", @@ -1969,6 +1913,8 @@ "ansi-regex": "2.1.1" } }, +======= +>>>>>>> Stashed changes "strip-bom": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", @@ -1988,12 +1934,6 @@ "strip-bom": "2.0.0" } }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - }, "tar": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", @@ -2061,6 +2001,7 @@ "punycode": "1.4.1" } }, +<<<<<<< Updated upstream "tslib": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", @@ -2096,6 +2037,8 @@ "tslib": "1.9.3" } }, +======= +>>>>>>> Stashed changes "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", diff --git a/hellocode-sample/package.json b/hellocode-sample/package.json index 4813e2c7..a532b03a 100644 --- a/hellocode-sample/package.json +++ b/hellocode-sample/package.json @@ -5,20 +5,20 @@ "version": "0.0.1", "publisher": "vscode-samples", "engines": { - "vscode": "^1.28.0" + "vscode": "^1.25.0" }, "categories": [ "Other" ], "activationEvents": [ - "onCommand:extension.sayHello" + "onCommand:extension.helloCode" ], - "main": "./out/extension", + "main": "./out/extension.js", "contributes": { "commands": [ { - "command": "extension.sayHello", - "title": "Hello World" + "command": "extension.helloCode", + "title": "Hello Code" } ] }, @@ -26,14 +26,11 @@ "vscode:prepublish": "npm run compile", "compile": "tsc -p ./", "watch": "tsc -watch -p ./", - "postinstall": "node ./node_modules/vscode/bin/install", - "test": "npm run compile && node ./node_modules/vscode/bin/test" + "postinstall": "node ./node_modules/vscode/bin/install" }, "devDependencies": { - "typescript": "^2.6.1", - "vscode": "^1.1.21", - "tslint": "^5.8.0", "@types/node": "^8.10.25", - "@types/mocha": "^2.2.42" + "typescript": "^2.6.1", + "vscode": "^1.1.21" } } diff --git a/hellocode-sample/src/extension.ts b/hellocode-sample/src/extension.ts index e85adbb2..cf304261 100644 --- a/hellocode-sample/src/extension.ts +++ b/hellocode-sample/src/extension.ts @@ -10,13 +10,13 @@ export function activate(context: vscode.ExtensionContext) { console.log('Congratulations, your extension "hellocode-sample" is now active!'); // The command has been defined in the package.json file - // Now provide the implementation of the command with registerCommand + // Now provide the implementation of the command with registerCommand // The commandId parameter must match the command field in package.json - let disposable = vscode.commands.registerCommand('extension.sayHello', () => { + let disposable = vscode.commands.registerCommand('extension.helloCode', () => { // The code you place here will be executed every time your command is executed // Display a message box to the user - vscode.window.showInformationMessage('Hello World!'); + vscode.window.showInformationMessage('Hello Code!'); }); context.subscriptions.push(disposable); diff --git a/hellocode-sample/src/test/extension.test.ts b/hellocode-sample/src/test/extension.test.ts deleted file mode 100644 index f364cca4..00000000 --- a/hellocode-sample/src/test/extension.test.ts +++ /dev/null @@ -1,21 +0,0 @@ -// -// Note: This example test is leveraging the Mocha test framework. -// Please refer to their documentation on https://mochajs.org/ for help. -// - -// The module 'assert' provides assertion methods from node -import * as assert from 'assert'; - -// You can import and use all API from the 'vscode' module -// as well as import your extension to test it -// import * as vscode from 'vscode'; -// import * as myExtension from '../extension'; - -// Defines a Mocha test suite to group tests of similar kind together -suite('Extension Tests', function() { - // Defines a Mocha unit test - test('Something 1', function() { - assert.equal(-1, [1, 2, 3].indexOf(5)); - assert.equal(-1, [1, 2, 3].indexOf(0)); - }); -}); diff --git a/hellocode-sample/src/test/index.ts b/hellocode-sample/src/test/index.ts deleted file mode 100644 index 27dc468f..00000000 --- a/hellocode-sample/src/test/index.ts +++ /dev/null @@ -1,22 +0,0 @@ -// -// PLEASE DO NOT MODIFY / DELETE UNLESS YOU KNOW WHAT YOU ARE DOING -// -// This file is providing the test runner to use when running extension tests. -// By default the test runner in use is Mocha based. -// -// You can provide your own test runner if you want to override it by exporting -// a function run(testRoot: string, clb: (error:Error) => void) that the extension -// host can call to run the tests. The test runner is expected to use console.log -// to report the results back to the caller. When the tests are finished, return -// a possible error to the callback or null if none. - -import * as testRunner from 'vscode/lib/testrunner'; - -// You can directly control Mocha options by uncommenting the following lines -// See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info -testRunner.configure({ - ui: 'tdd', // the TDD UI is being used in extension.test.ts (suite, test, etc.) - useColors: true // colored output from test results -}); - -module.exports = testRunner; diff --git a/hellocode-sample/tslint.json b/hellocode-sample/tslint.json deleted file mode 100644 index 0ab0ca6e..00000000 --- a/hellocode-sample/tslint.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "rules": { - "indent": [true, "tabs"], - "semicolon": [true, "always"] - } -} \ No newline at end of file