From 52e5d6d9aafbd85312a84deabb736cb5db78a1ec Mon Sep 17 00:00:00 2001 From: Sammy Tahtah Date: Fri, 4 Nov 2016 11:24:45 +0100 Subject: [PATCH 1/4] Add to Keymaps category. --- package.json | 659 ++++++++++++++++++++++++++++----------------------- 1 file changed, 364 insertions(+), 295 deletions(-) diff --git a/package.json b/package.json index 064c63c..3146dfd 100644 --- a/package.json +++ b/package.json @@ -1,298 +1,367 @@ { - "name": "vscode-emacs", - "displayName": "vscode-emacs", - "description": "emacs like extension for vscode", - "version": "0.1.0", - "publisher": "hiro-sun", - "homepage": "https://github.com/hiro-sun/vscode-emacs", - "repository": { - "type": "git", - "url": "https://github.com/hiro-sun/vscode-emacs.git" - }, - "bugs": "https://github.com/hiro-sun/vscode-emacs/issues", - "engines": { - "vscode": "^0.10.1" - }, - "categories": [ - "Other" + "name": "vscode-emacs", + "displayName": "vscode-emacs", + "description": "emacs like extension for vscode", + "version": "0.1.0", + "publisher": "hiro-sun", + "homepage": "https://github.com/hiro-sun/vscode-emacs", + "repository": { + "type": "git", + "url": "https://github.com/hiro-sun/vscode-emacs.git" + }, + "bugs": "https://github.com/hiro-sun/vscode-emacs/issues", + "engines": { + "vscode": "^1.0.3" + }, + "categories": [ + "Other", + "Keymaps" + ], + "keywords": [ + "emacs", + "shortcuts", + "keybindings", + "behavior", + "killring" + ], + "activationEvents": [ + "*" + ], + "main": "./out/src/extension", + "contributes": { + "commands": [ + { + "command": "emacs.C-k", + "title": "Cut the text from cursor to line end and save it in emacs kill ring" + }, + { + "command": "emacs.M-w", + "title": "Copy selected text to emacs kill ring" + }, + { + "command": "emacs.C-w", + "title": "Cut selected text to emacs kill ring" + }, + { + "command": "emacs.C-y", + "title": "Yank (Paste) emacs kill ring" + } ], - "keywords": [ - "emacs", "shortcuts", "keybindings", "behavior", "killring" - ], - "activationEvents": [ - "*" - ], - "main": "./out/src/extension", - "contributes": { - "commands": [ - { - "command": "emacs.C-k", - "title": "Cut the text from cursor to line end and save it in emacs kill ring" - },{ - "command": "emacs.M-w", - "title": "Copy selected text to emacs kill ring" - },{ - "command": "emacs.C-w", - "title": "Cut selected text to emacs kill ring" - },{ - "command": "emacs.C-y", - "title": "Yank (Paste) emacs kill ring" - } - ], - "keybindings": [ - { - "key": "right", - "command": "emacs.cursorRight", - "when": "editorTextFocus" - },{ - "key": "ctrl+f", - "command": "emacs.cursorRight", - "when": "editorTextFocus" - },{ - "key": "left", - "command": "emacs.cursorLeft", - "when": "editorTextFocus" - },{ - "key": "ctrl+b", - "command": "emacs.cursorLeft", - "when": "editorTextFocus" - },{ - "key": "up", - "command": "emacs.cursorUp", - "when": "editorTextFocus && !suggestWidgetVisible" - },{ - "key": "ctrl+p", - "command": "emacs.cursorUp", - "when": "editorTextFocus && !suggestWidgetVisible" - },{ - "key": "down", - "command": "emacs.cursorDown", - "when": "editorTextFocus && !suggestWidgetVisible" - },{ - "key": "ctrl+n", - "command": "emacs.cursorDown", - "when": "editorTextFocus && !suggestWidgetVisible" - },{ - "key": "home", - "command": "emacs.cursorHome", - "when": "editorTextFocus" - },{ - "key": "ctrl+a", - "command": "emacs.cursorHome", - "when": "editorTextFocus" - },{ - "key": "end", - "command": "emacs.cursorEnd", - "when": "editorTextFocus" - },{ - "key": "ctrl+e", - "command": "emacs.cursorEnd", - "when": "editorTextFocus" - },{ - "key": "alt+f", - "command": "emacs.cursorWordRight", - "when": "editorTextFocus" - },{ - "key": "alt+b", - "command": "emacs.cursorWordLeft", - "when": "editorTextFocus" - },{ - "key": "pagedown", - "command": "emacs.cursorPageDown", - "when": "editorTextFocus && !suggestWidgetVisible" - },{ - "key": "ctrl+v", - "command": "emacs.cursorPageDown", - "when": "editorTextFocus && !suggestWidgetVisible" - },{ - "key": "pageup", - "command": "emacs.cursorPageUp", - "when": "editorTextFocus && !suggestWidgetVisible" - },{ - "key": "alt+v", - "command": "emacs.cursorPageUp", - "when": "editorTextFocus && !suggestWidgetVisible" - },{ - "key": "alt+shift+.", - "command": "emacs.cursorBottom", - "when": "editorTextFocus" - },{ - "key": "alt+shift+,", - "command": "emacs.cursorTop", - "when": "editorTextFocus" - },{ - "key": "alt+g g", - "command": "workbench.action.gotoLine" - },{ - "key": "ctrl+s", - "command": "actions.find", - "when": "!findWidgetVisible" - },{ - "key": "ctrl+s", - "command": "editor.action.nextMatchFindAction", - "when": "findWidgetVisible" - },{ - "key": "ctrl+r", - "command": "actions.find", - "when": "!findWidgetVisible" - },{ - "key": "ctrl+r", - "command": "editor.action.previousMatchFindAction", - "when": "findWidgetVisible" - },{ - "key": "ctrl+alt+n", - "command": "editor.action.addSelectionToNextFindMatch", - "when": "editorFocus" - },{ - "key": "ctrl+d", - "command": "deleteRight", - "when": "editorTextFocus" - },{ - "key": "ctrl+h", - "command": "deleteLeft", - "when": "editorTextFocus" - },{ - "key": "alt+d", - "command": "deleteWordRight", - "when": "editorTextFocus" - },{ - "key": "ctrl+k", - "command": "emacs.C-k", - "when": "editorTextFocus" - },{ - "key": "ctrl+w", - "command": "emacs.C-w", - "when": "editorTextFocus" - },{ - "key": "alt+w", - "command": "emacs.M-w", - "when": "editorTextFocus" - },{ - "key": "ctrl+y", - "command": "emacs.C-y", - "when": "editorTextFocus" - },{ - "key": "ctrl+j", - "command": "editor.action.insertLineAfter", - "when": "editorTextFocus" - },{ - "key": "ctrl+x ctrl+o", - "command": "emacs.C-x_C-o", - "when": "editorTextFocus" - },{ - "key": "ctrl+x h", - "command": "editor.action.selectAll", - "when": "editorTextFocus" - },{ - "key": "ctrl+x u", - "command": "emacs.C-x_u", - "when": "editorTextFocus" - },{ - "key": "ctrl+/", - "command": "emacs.C-/", - "when": "editorTextFocus" - },{ - "key": "ctrl+;", - "command": "editor.action.commentLine", - "when": "editorTextFocus" - },{ - "key": "alt+;", - "command": "editor.action.blockComment", - "when": "editorTextFocus" - },{ - "key": "ctrl+g", - "command": "emacs.C-g", - "when": "editorTextFocus" - },{ - "key": "ctrl+g", - "command": "closeFindWidget", - "when": "editorFocus && findWidgetVisible" - },{ - "key": "ctrl+g", - "command": "emacs.exitMarkMode", - "when": "editorTextFocus && editorHasSelection" - },{ - "key": "ctrl+g", - "command": "closeReferenceSearchEditor", - "when": "searchViewletVisible" - },{ - "key": "ctrl+space", - "command": "emacs.enterMarkMode", - "when": "editorTextFocus" - },{ - "key": "ctrl+x ctrl+f", - "command": "workbench.action.files.openFolder" - },{ - "key": "ctrl+x ctrl+s", - "command": "workbench.action.files.save", - "when": "editorTextFocus" - },{ - "key": "ctrl+x ctrl+w", - "command": "workbench.action.files.saveAs", - "when": "editorTextFocus" - },{ - "key": "ctrl+p", - "command": "showPrevParameterHint", - "when": "editorTextFocus && parameterHintsVisible" - },{ - "key": "ctrl+n", - "command": "showNextParameterHint", - "when": "editorTextFocus && parameterHintsVisible" - },{ - "key": "ctrl+p", - "command": "selectPrevQuickFix", - "when": "editorFocus && quickFixWidgetVisible" - },{ - "key": "ctrl+n", - "command": "selectNextQuickFix", - "when": "editorFocus && quickFixWidgetVisible" - },{ - "key": "ctrl+p", - "command": "selectPrevSuggestion", - "when": "editorTextFocus && suggestWidgetVisible" - },{ - "key": "ctrl+n", - "command": "selectNextSuggestion", - "when": "editorTextFocus && suggestWidgetVisible" - },{ - "key": "ctrl+p", - "command": "workbench.action.quickOpenNavigatePrevious", - "when": "inQuickOpen" - },{ - "key": "ctrl+n", - "command": "workbench.action.quickOpenNavigateNext", - "when": "inQuickOpen" - },{ - "key": "ctrl+'", - "command": "editor.action.triggerSuggest", - "when": "editorTextFocus" - },{ - "key": "ctrl+'", - "command": "toggleSuggestionDetails", - "when": "editorTextFocus && suggestWidgetVisible" - },{ - "key": "ctrl+shift+'", - "command": "editor.action.triggerParameterHints", - "when": "editorTextFocus" - },{ - "key": "alt+x", - "command": "workbench.action.showCommands" - },{ - "key": "ctrl+alt+space", - "command": "workbench.action.toggleSidebarVisibility" - }, { - "key": "ctrl+x b", - "command": "workbench.action.quickOpen" - } - ] - }, - "scripts": { - "vscode:prepublish": "node ./node_modules/vscode/bin/compile", - "compile": "node ./node_modules/vscode/bin/compile -watch -p ./" - }, - "devDependencies": { - "tsd": "^0.6.5", - "typescript": "^1.6.2", - "vscode": "0.10.x" - } + "keybindings": [ + { + "key": "right", + "command": "emacs.cursorRight", + "when": "editorTextFocus" + }, + { + "key": "ctrl+f", + "command": "emacs.cursorRight", + "when": "editorTextFocus" + }, + { + "key": "left", + "command": "emacs.cursorLeft", + "when": "editorTextFocus" + }, + { + "key": "ctrl+b", + "command": "emacs.cursorLeft", + "when": "editorTextFocus" + }, + { + "key": "up", + "command": "emacs.cursorUp", + "when": "editorTextFocus && !suggestWidgetVisible" + }, + { + "key": "ctrl+p", + "command": "emacs.cursorUp", + "when": "editorTextFocus && !suggestWidgetVisible" + }, + { + "key": "down", + "command": "emacs.cursorDown", + "when": "editorTextFocus && !suggestWidgetVisible" + }, + { + "key": "ctrl+n", + "command": "emacs.cursorDown", + "when": "editorTextFocus && !suggestWidgetVisible" + }, + { + "key": "home", + "command": "emacs.cursorHome", + "when": "editorTextFocus" + }, + { + "key": "ctrl+a", + "command": "emacs.cursorHome", + "when": "editorTextFocus" + }, + { + "key": "end", + "command": "emacs.cursorEnd", + "when": "editorTextFocus" + }, + { + "key": "ctrl+e", + "command": "emacs.cursorEnd", + "when": "editorTextFocus" + }, + { + "key": "alt+f", + "command": "emacs.cursorWordRight", + "when": "editorTextFocus" + }, + { + "key": "alt+b", + "command": "emacs.cursorWordLeft", + "when": "editorTextFocus" + }, + { + "key": "pagedown", + "command": "emacs.cursorPageDown", + "when": "editorTextFocus && !suggestWidgetVisible" + }, + { + "key": "ctrl+v", + "command": "emacs.cursorPageDown", + "when": "editorTextFocus && !suggestWidgetVisible" + }, + { + "key": "pageup", + "command": "emacs.cursorPageUp", + "when": "editorTextFocus && !suggestWidgetVisible" + }, + { + "key": "alt+v", + "command": "emacs.cursorPageUp", + "when": "editorTextFocus && !suggestWidgetVisible" + }, + { + "key": "alt+shift+.", + "command": "emacs.cursorBottom", + "when": "editorTextFocus" + }, + { + "key": "alt+shift+,", + "command": "emacs.cursorTop", + "when": "editorTextFocus" + }, + { + "key": "alt+g g", + "command": "workbench.action.gotoLine" + }, + { + "key": "ctrl+s", + "command": "actions.find", + "when": "!findWidgetVisible" + }, + { + "key": "ctrl+s", + "command": "editor.action.nextMatchFindAction", + "when": "findWidgetVisible" + }, + { + "key": "ctrl+r", + "command": "actions.find", + "when": "!findWidgetVisible" + }, + { + "key": "ctrl+r", + "command": "editor.action.previousMatchFindAction", + "when": "findWidgetVisible" + }, + { + "key": "ctrl+alt+n", + "command": "editor.action.addSelectionToNextFindMatch", + "when": "editorFocus" + }, + { + "key": "ctrl+d", + "command": "deleteRight", + "when": "editorTextFocus" + }, + { + "key": "ctrl+h", + "command": "deleteLeft", + "when": "editorTextFocus" + }, + { + "key": "alt+d", + "command": "deleteWordRight", + "when": "editorTextFocus" + }, + { + "key": "ctrl+k", + "command": "emacs.C-k", + "when": "editorTextFocus" + }, + { + "key": "ctrl+w", + "command": "emacs.C-w", + "when": "editorTextFocus" + }, + { + "key": "alt+w", + "command": "emacs.M-w", + "when": "editorTextFocus" + }, + { + "key": "ctrl+y", + "command": "emacs.C-y", + "when": "editorTextFocus" + }, + { + "key": "ctrl+j", + "command": "editor.action.insertLineAfter", + "when": "editorTextFocus" + }, + { + "key": "ctrl+x ctrl+o", + "command": "emacs.C-x_C-o", + "when": "editorTextFocus" + }, + { + "key": "ctrl+x h", + "command": "editor.action.selectAll", + "when": "editorTextFocus" + }, + { + "key": "ctrl+x u", + "command": "emacs.C-x_u", + "when": "editorTextFocus" + }, + { + "key": "ctrl+/", + "command": "emacs.C-/", + "when": "editorTextFocus" + }, + { + "key": "ctrl+;", + "command": "editor.action.commentLine", + "when": "editorTextFocus" + }, + { + "key": "alt+;", + "command": "editor.action.blockComment", + "when": "editorTextFocus" + }, + { + "key": "ctrl+g", + "command": "emacs.C-g", + "when": "editorTextFocus" + }, + { + "key": "ctrl+g", + "command": "closeFindWidget", + "when": "editorFocus && findWidgetVisible" + }, + { + "key": "ctrl+g", + "command": "emacs.exitMarkMode", + "when": "editorTextFocus && editorHasSelection" + }, + { + "key": "ctrl+g", + "command": "closeReferenceSearchEditor", + "when": "searchViewletVisible" + }, + { + "key": "ctrl+space", + "command": "emacs.enterMarkMode", + "when": "editorTextFocus" + }, + { + "key": "ctrl+x ctrl+f", + "command": "workbench.action.files.openFolder" + }, + { + "key": "ctrl+x ctrl+s", + "command": "workbench.action.files.save", + "when": "editorTextFocus" + }, + { + "key": "ctrl+x ctrl+w", + "command": "workbench.action.files.saveAs", + "when": "editorTextFocus" + }, + { + "key": "ctrl+p", + "command": "showPrevParameterHint", + "when": "editorTextFocus && parameterHintsVisible" + }, + { + "key": "ctrl+n", + "command": "showNextParameterHint", + "when": "editorTextFocus && parameterHintsVisible" + }, + { + "key": "ctrl+p", + "command": "selectPrevQuickFix", + "when": "editorFocus && quickFixWidgetVisible" + }, + { + "key": "ctrl+n", + "command": "selectNextQuickFix", + "when": "editorFocus && quickFixWidgetVisible" + }, + { + "key": "ctrl+p", + "command": "selectPrevSuggestion", + "when": "editorTextFocus && suggestWidgetVisible" + }, + { + "key": "ctrl+n", + "command": "selectNextSuggestion", + "when": "editorTextFocus && suggestWidgetVisible" + }, + { + "key": "ctrl+p", + "command": "workbench.action.quickOpenNavigatePrevious", + "when": "inQuickOpen" + }, + { + "key": "ctrl+n", + "command": "workbench.action.quickOpenNavigateNext", + "when": "inQuickOpen" + }, + { + "key": "ctrl+'", + "command": "editor.action.triggerSuggest", + "when": "editorTextFocus" + }, + { + "key": "ctrl+'", + "command": "toggleSuggestionDetails", + "when": "editorTextFocus && suggestWidgetVisible" + }, + { + "key": "ctrl+shift+'", + "command": "editor.action.triggerParameterHints", + "when": "editorTextFocus" + }, + { + "key": "alt+x", + "command": "workbench.action.showCommands" + }, + { + "key": "ctrl+alt+space", + "command": "workbench.action.toggleSidebarVisibility" + }, + { + "key": "ctrl+x b", + "command": "workbench.action.quickOpen" + } + ] + }, + "scripts": { + "vscode:prepublish": "node ./node_modules/vscode/bin/compile", + "compile": "node ./node_modules/vscode/bin/compile -watch -p ./" + }, + "devDependencies": { + "typescript": "^2.0.7", + "typings": "^1.5.0", + "vscode": "^1.0.3" + } } From 04a317d507abb11cef068724bb7b733e99f463e9 Mon Sep 17 00:00:00 2001 From: Sammy Tahtah Date: Fri, 4 Nov 2016 12:35:08 +0100 Subject: [PATCH 2/4] Update dependencies version. --- .vscode/launch.json | 52 ++++++++++++++++++------------------- .vscode/settings.json | 14 +++++----- .vscode/tasks.json | 26 +++++++++---------- .vscodeignore | 2 +- package.json | 13 ++++++---- test/extension.test.ts | 12 ++++----- test/index.ts | 10 +++---- tsconfig.json | 24 ++++++++++------- tsd.json | 8 ------ typings/node.d.ts | 1 - typings/tsd.d.ts | 1 - typings/vscode-typings.d.ts | 1 - vsc-extension-quickstart.md | 20 +++++++------- 13 files changed, 90 insertions(+), 94 deletions(-) delete mode 100644 tsd.json delete mode 100644 typings/node.d.ts delete mode 100644 typings/tsd.d.ts delete mode 100644 typings/vscode-typings.d.ts diff --git a/.vscode/launch.json b/.vscode/launch.json index d60c89d..c77b2ad 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,28 +1,28 @@ // A launch configuration that compiles the extension and then opens it inside a new window { - "version": "0.1.0", - "configurations": [ - { - "name": "Launch Extension", - "type": "extensionHost", - "request": "launch", - "runtimeExecutable": "${execPath}", - "args": ["--extensionDevelopmentPath=${workspaceRoot}" ], - "stopOnEntry": false, - "sourceMaps": true, - "outDir": "${workspaceRoot}/out/src", - "preLaunchTask": "npm" - }, - { - "name": "Launch Tests", - "type": "extensionHost", - "request": "launch", - "runtimeExecutable": "${execPath}", - "args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out/test" ], - "stopOnEntry": false, - "sourceMaps": true, - "outDir": "${workspaceRoot}/out/test", - "preLaunchTask": "npm" - } - ] -} \ No newline at end of file + "version": "0.1.0", + "configurations": [ + { + "name": "Launch Extension", + "type": "extensionHost", + "request": "launch", + "runtimeExecutable": "${execPath}", + "args": ["--extensionDevelopmentPath=${workspaceRoot}" ], + "stopOnEntry": false, + "sourceMaps": true, + "outDir": "${workspaceRoot}/out/src", + "preLaunchTask": "npm" + }, + { + "name": "Launch Tests", + "type": "extensionHost", + "request": "launch", + "runtimeExecutable": "${execPath}", + "args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out/test" ], + "stopOnEntry": false, + "sourceMaps": true, + "outDir": "${workspaceRoot}/out/test", + "preLaunchTask": "npm" + } + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json index 3f5aa9c..7877e3f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,10 +1,10 @@ // 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 - }, - "search.exclude": { - "out": true // set this to false to include "out" folder in search results - }, - "typescript.tsdk": "./node_modules/typescript/lib" // we want to use the TS server from our node_modules folder to control its version + "files.exclude": { + "out": false // set this to true to hide the "out" folder with the compiled JS files + }, + "search.exclude": { + "out": true // set this to false to include "out" folder in search results + }, + "typescript.tsdk": "./node_modules/typescript/lib" // we want to use the TS server from our node_modules folder to control its version } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index d31b159..fb7f662 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -8,23 +8,23 @@ // A task runner that calls a custom npm script that compiles the extension. { - "version": "0.1.0", + "version": "0.1.0", - // we want to run npm - "command": "npm", + // we want to run npm + "command": "npm", - // the command is a shell script - "isShellCommand": true, + // the command is a shell script + "isShellCommand": true, - // show the output window only if unrecognized errors occur. - "showOutput": "silent", + // 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"], + // we run the custom script "compile" as defined in package.json + "args": ["run", "compile", "--loglevel", "silent"], - // The tsc compiler is started in watching mode - "isWatching": true, + // The tsc compiler is started in watching mode + "isWatching": true, - // use the standard tsc in watch mode problem matcher to find compile problems in the output. - "problemMatcher": "$tsc-watch" + // use the standard tsc in watch mode problem matcher to find compile problems in the output. + "problemMatcher": "$tsc-watch" } \ No newline at end of file diff --git a/.vscodeignore b/.vscodeignore index 93e28ff..5ff3c19 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -1,5 +1,5 @@ .vscode/** -typings/** +.vscode-test/** out/test/** test/** src/** diff --git a/package.json b/package.json index 3146dfd..f444068 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "bugs": "https://github.com/hiro-sun/vscode-emacs/issues", "engines": { - "vscode": "^1.0.3" + "vscode": "^1.5.0" }, "categories": [ "Other", @@ -356,12 +356,15 @@ ] }, "scripts": { - "vscode:prepublish": "node ./node_modules/vscode/bin/compile", - "compile": "node ./node_modules/vscode/bin/compile -watch -p ./" + "vscode:prepublish": "tsc -p ./", + "compile": "tsc -watch -p ./", + "postinstall": "node ./node_modules/vscode/bin/install" }, "devDependencies": { + "mocha": "^3.1.2", "typescript": "^2.0.7", - "typings": "^1.5.0", - "vscode": "^1.0.3" + "vscode": "^1.0.3", + "@types/mocha": "^2.2.32", + "@types/node": "^6.0.40" } } diff --git a/test/extension.test.ts b/test/extension.test.ts index cf47b2c..5c4a4da 100644 --- a/test/extension.test.ts +++ b/test/extension.test.ts @@ -1,4 +1,4 @@ -// +// // Note: This example test is leveraging the Mocha test framework. // Please refer to their documentation on https://mochajs.org/ for help. // @@ -14,9 +14,9 @@ import * as myExtension from '../src/extension'; // Defines a Mocha test suite to group tests of similar kind together suite("Extension Tests", () => { - // Defines a Mocha unit test - test("Something 1", () => { - assert.equal(-1, [1, 2, 3].indexOf(5)); - assert.equal(-1, [1, 2, 3].indexOf(0)); - }); + // Defines a Mocha unit test + test("Something 1", () => { + assert.equal(-1, [1, 2, 3].indexOf(5)); + assert.equal(-1, [1, 2, 3].indexOf(0)); + }); }); \ No newline at end of file diff --git a/test/index.ts b/test/index.ts index e3cebd0..50bae45 100644 --- a/test/index.ts +++ b/test/index.ts @@ -1,9 +1,9 @@ -// -// PLEASE DO NOT MODIFY / DELETE UNLESS YOU KNOW WHAT YOU ARE DOING +// +// 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 @@ -15,8 +15,8 @@ var testRunner = require('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 + 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; \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 5a3f246..11282c9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,12 +1,16 @@ { - "compilerOptions": { - "module": "commonjs", - "target": "es5", - "outDir": "out", - "noLib": true, - "sourceMap": true - }, - "exclude": [ - "node_modules" - ] + "compilerOptions": { + "module": "commonjs", + "target": "es6", + "outDir": "out", + "lib": [ + "es6" + ], + "sourceMap": true, + "rootDir": "." + }, + "exclude": [ + "node_modules", + ".vscode-test" + ] } \ No newline at end of file diff --git a/tsd.json b/tsd.json deleted file mode 100644 index cc73a38..0000000 --- a/tsd.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "version": "v4", - "repo": "borisyankov/DefinitelyTyped", - "ref": "master", - "path": "typings", - "bundle": "typings/tsd.d.ts", - "installed": {} -} diff --git a/typings/node.d.ts b/typings/node.d.ts deleted file mode 100644 index 5ed7730..0000000 --- a/typings/node.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// \ No newline at end of file diff --git a/typings/tsd.d.ts b/typings/tsd.d.ts deleted file mode 100644 index 8b13789..0000000 --- a/typings/tsd.d.ts +++ /dev/null @@ -1 +0,0 @@ - diff --git a/typings/vscode-typings.d.ts b/typings/vscode-typings.d.ts deleted file mode 100644 index 5590dc8..0000000 --- a/typings/vscode-typings.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// diff --git a/vsc-extension-quickstart.md b/vsc-extension-quickstart.md index 4dfd9da..6cdea2b 100644 --- a/vsc-extension-quickstart.md +++ b/vsc-extension-quickstart.md @@ -2,16 +2,16 @@ ## What's in the folder * This folder contains all of the files necessary for your extension -* `package.json` - this is the manifest file in which you declare your extension and command. -The sample plugin registers a command and defines its title and command name. With this information -VS Code can show the command in the command palette. It doesn’t yet need to load the plugin. -* `src/extension.ts` - this is the main file where you will provide the implementation of your command. -The file exports one function, `activate`, which is called the very first time your extension is -activated (in this case by executing the command). Inside the `activate` function we call `registerCommand`. -We pass the function containing the implementation of the command as the second parameter to +* `package.json` - this is the manifest file in which you declare your extension and command. +The sample plugin registers a command and defines its title and command name. With this information +VS Code can show the command in the command palette. It doesn’t yet need to load the plugin. +* `src/extension.ts` - this is the main file where you will provide the implementation of your command. +The file exports one function, `activate`, which is called the very first time your extension is +activated (in this case by executing the command). Inside the `activate` function we call `registerCommand`. +We pass the function containing the implementation of the command as the second parameter to `registerCommand`. -## Get up and running straight away +## Get up and running straight away * press `F5` to open a new window with your extension loaded * run your command from the command palette by pressing (`Ctrl+Shift+P` or `Cmd+Shift+P` on Mac) and typing `Hello World` * set breakpoints in your code inside `src/extension.ts` to debug your extension @@ -29,5 +29,5 @@ We pass the function containing the implementation of the command as the second * press `F5` to run the tests in a new window with your extension loaded * see the output of the test result in the debug console * make changes to `test/extension.test.ts` or create new test files inside the `test` folder - * by convention, the test runner will only consider files matching the name pattern `**.test.ts` - * you can create folders inside the `test` folder to structure your tests any way you want \ No newline at end of file + * by convention, the test runner will only consider files matching the name pattern `**.test.ts` + * you can create folders inside the `test` folder to structure your tests any way you want \ No newline at end of file From 3de7dfe1d37cd63168614be1ed2e7333aed2089f Mon Sep 17 00:00:00 2001 From: Sammy Tahtah Date: Fri, 4 Nov 2016 15:40:53 +0100 Subject: [PATCH 3/4] [FIX] C-g does not cancel suggestions and prompts. --- CHANGES.md => CHANGELOG.md | 0 package.json | 66 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 63 insertions(+), 3 deletions(-) rename CHANGES.md => CHANGELOG.md (100%) diff --git a/CHANGES.md b/CHANGELOG.md similarity index 100% rename from CHANGES.md rename to CHANGELOG.md diff --git a/package.json b/package.json index f444068..0cde4af 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "vscode-emacs", - "displayName": "vscode-emacs", + "displayName": "Emacs Keymap", "description": "emacs like extension for vscode", - "version": "0.1.0", + "version": "0.1.1", "publisher": "hiro-sun", "homepage": "https://github.com/hiro-sun/vscode-emacs", "repository": { @@ -265,7 +265,67 @@ { "key": "ctrl+g", "command": "closeReferenceSearchEditor", - "when": "searchViewletVisible" + "when": "inReferenceSearchEditor && !config.editor.stablePeek" + }, + { + "key": "ctrl+g", + "command": "closeReferenceSearch", + "when": "referenceSearchVisible && !config.editor.stablePeek" + }, + { + "key": "ctrl+g", + "command": "removeSecondaryCursors", + "when": "editorHasMultipleSelections && editorTextFocus" + }, + { + "key": "ctrl+g", + "command": "closeBreakpointWidget", + "when": "breakpointWidgetVisible && editorFocus" + }, + { + "key": "ctrl+g", + "command": "leaveSnippet", + "when": "editorTextFocus && inSnippetMode" + }, + { + "key": "ctrl+g", + "command": "closeMarkersNavigation", + "when": "editorFocus && markersNavigationVisible" + }, + { + "key": "ctrl+g", + "command": "closeParameterHints", + "when": "editorTextFocus && parameterHintsVisible" + }, + { + "key": "ctrl+g", + "command": "hideSuggestWidget", + "when": "editorTextFocus && suggestWidgetVisible" + }, + { + "key": "ctrl+g", + "command": "cancelRenameInput", + "when": "editorFocus && renameInputVisible" + }, + { + "key": "ctrl+g", + "command": "closeAccessibilityHelp", + "when": "accessibilityHelpWidgetVisible && editorFocus" + }, + { + "key": "ctrl+g", + "command": "closeReplaceInFilesWidget", + "when": "replaceInputBoxFocus && searchViewletVisible" + }, + { + "key": "ctrl+g", + "command": "workbench.action.closeMessages", + "when": "globalMessageVisible" + }, + { + "key": "ctrl+g", + "command": "workbench.action.closeQuickOpen", + "when": "inQuickOpen" }, { "key": "ctrl+space", From fa0aa84ec9111809f77104652f230b9c009c373a Mon Sep 17 00:00:00 2001 From: Sammy Date: Fri, 4 Nov 2016 15:51:30 +0100 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5ab4a3..7ab2545 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.1.1 (2016-11-04) +- Fix #24: C-g does not cancel suggestions and prompts +- Update vscode engine + ## 0.1.0 - Fix: IntelliSense Suggestion. - Add C-x b. @@ -36,4 +40,4 @@ These commands and bug fixes were coding by kpping. Thanks. :) - Modify the search operation. ## 0.0.3 -- Fixed a bug that occurred when you start from the command line. \ No newline at end of file +- Fixed a bug that occurred when you start from the command line.