Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 10:38:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Extract should trigger to new method

Browse Source
This commit is contained in:
Matt Bierner
2018-02-23 16:54:30 -08:00
parent 85933d7ba8
commit 0d5bb310d9
1 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
extensions/typescript/src/features/completionItemProvider.ts
View File

@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { CompletionItem, TextDocument, Position, CompletionItemKind, CompletionItemProvider, CancellationToken, Range, SnippetString, workspace, CompletionContext, Uri, MarkdownString, window, QuickPickItem } from 'vscode';
import { CompletionItem, TextDocument, Position, CompletionItemKind, CompletionItemProvider, CancellationToken, Range, SnippetString, workspace, CompletionContext, Uri, MarkdownString, window, QuickPickItem, TextLine } from 'vscode';
import { ITypeScriptServiceClient } from '../typescriptService';
import TypingsStatus from '../utils/typingsStatus';
@@ -227,7 +227,7 @@ namespace Configuration {
export default class TypeScriptCompletionItemProvider implements CompletionItemProvider {
constructor(
private client: ITypeScriptServiceClient,
private readonly client: ITypeScriptServiceClient,
private readonly typingsStatus: TypingsStatus,
commandManager: CommandManager
) {
@@ -259,36 +259,8 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
const line = document.lineAt(position.line);
const config = this.getConfiguration(document.uri);
if (context.triggerCharacter === '"' || context.triggerCharacter === '\'') {
if (!config.quickSuggestionsForPaths) {
return [];
}
// make sure we are in something that looks like the start of an import
const pre = line.text.slice(0, position.character);
if (!pre.match(/\b(from|import)\s*["']$/) && !pre.match(/\b(import|require)\(['"]$/)) {
return [];
}
}
if (context.triggerCharacter === '/') {
if (!config.quickSuggestionsForPaths) {
return [];
}
// make sure we are in something that looks like an import path
const pre = line.text.slice(0, position.character);
if (!pre.match(/\b(from|import)\s*["'][^'"]*$/) && !pre.match(/\b(import|require)\(['"][^'"]*$/)) {
return [];
}
}
if (context.triggerCharacter === '@') {
// make sure we are in something that looks like the start of a jsdoc comment
const pre = line.text.slice(0, position.character);
if (!pre.match(/^\s*\*[ ]?@/) && !pre.match(/\/\*\*+[ ]?@/)) {
return [];
}
if (!this.shouldTrigger(context, config, line, position)) {
return [];
}
try {
@@ -348,6 +320,42 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
}
}
private shouldTrigger(context: CompletionContext, config: Configuration, line: TextLine, position: Position) {
if (context.triggerCharacter === '"' || context.triggerCharacter === '\'') {
if (!config.quickSuggestionsForPaths) {
return false;
}
// make sure we are in something that looks like the start of an import
const pre = line.text.slice(0, position.character);
if (!pre.match(/\b(from|import)\s*["']$/) && !pre.match(/\b(import|require)\(['"]$/)) {
return false;
}
}
if (context.triggerCharacter === '/') {
if (!config.quickSuggestionsForPaths) {
return false;
}
// make sure we are in something that looks like an import path
const pre = line.text.slice(0, position.character);
if (!pre.match(/\b(from|import)\s*["'][^'"]*$/) && !pre.match(/\b(import|require)\(['"][^'"]*$/)) {
return false;
}
}
if (context.triggerCharacter === '@') {
// make sure we are in something that looks like the start of a jsdoc comment
const pre = line.text.slice(0, position.character);
if (!pre.match(/^\s*\*[ ]?@/) && !pre.match(/\/\*\*+[ ]?@/)) {
return false;
}
}
return true;
}
public async resolveCompletionItem(
item: CompletionItem,
token: CancellationToken