microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-29 13:36:27 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

Revert "Only apply TS Dot Accept Suggestion if Previous Character is a valid identifier (#18063)"

Browse Source 
This reverts commit 41cb5ee5ae.
This commit is contained in:
Joao Moreno
2017-01-10 10:11:52 +01:00
parent 3b35c42992
commit 31997b32c3
3 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/typescript/package.json
View File

@@ -258,7 +258,7 @@
},
"keybindings": {
"key": ".",
"command": "typescript.tryAcceptSelectedSuggestionOnDot",
"command": "^acceptSelectedSuggestion",
"when": "editorTextFocus && suggestWidgetVisible && editorLangId == 'typescript' && suggestionSupportsAcceptOnKey"
},
"commands": [
@@ -269,10 +269,6 @@
{
"command": "javascript.reloadProjects",
"title": "%javascript.reloadProjects.title%"
},
{
"command": "typescript.tryAcceptSelectedSuggestionOnDot",
"title": "%typescript.tryAcceptSelectedSuggestionOnDot%"
}
],
"breakpoints": [

1
extensions/typescript/package.nls.json
View File

@@ -12,7 +12,6 @@
"typescript.tsserver.experimentalAutoBuild": "Enables experimental auto build. Requires 1.9 dev or 2.x tsserver version and a restart of VS Code after changing it.",
"typescript.validate.enable": "Enable/disable TypeScript validation.",
"typescript.format.enable": "Enable/disable default TypeScript formatter.",
"typescript.tryAcceptSelectedSuggestionOnDot": "Accept current suggestion when a dot is typed",
"javascript.format.enable": "Enable/disable default JavaScript formatter.",
"format.insertSpaceAfterCommaDelimiter": "Defines space handling after a comma delimiter.",
"format.insertSpaceAfterSemicolonInForStatements": " Defines space handling after a semicolon in a for statement.",

14
extensions/typescript/src/typescriptMain.ts
View File

@@ -9,7 +9,7 @@
* ------------------------------------------------------------------------------------------ */
'use strict';
import { env, languages, commands, workspace, window, Uri, ExtensionContext, Memento, IndentAction, Diagnostic, DiagnosticCollection, Range, DocumentFilter, Disposable, Position } from 'vscode';
import { env, languages, commands, workspace, window, Uri, ExtensionContext, Memento, IndentAction, Diagnostic, DiagnosticCollection, Range, DocumentFilter, Disposable } from 'vscode';
// This must be the first statement otherwise modules might got loaded with
// the wrong locale.
@@ -83,18 +83,6 @@ export function activate(context: ExtensionContext): void {
clientHost.reloadProjects();
}));
context.subscriptions.push(commands.registerCommand('typescript.tryAcceptSelectedSuggestionOnDot', () => {
// When typing a dot, make sure the character before the dot is a valid indentifier character.
const editor = window.activeTextEditor;
if (editor && editor.selection && editor.selection.start.character >= 1) {
const preText = editor.document.getText(new Range(new Position(editor.selection.start.line, 0), new Position(editor.selection.start.line, editor.selection.start.character - 1)));
if (preText.match(/[a-z_$]\s*$/ig)) {
return commands.executeCommand('acceptSelectedSuggestion');
}
}
return commands.executeCommand('type', { text: '.' });
}));
window.onDidChangeActiveTextEditor(VersionStatus.showHideStatus, null, context.subscriptions);
client.onReady().then(() => {
context.subscriptions.push(ProjectStatus.create(client,