microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 12:51:30 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

merge keyword completions in services.ts

Browse Source
This commit is contained in:
Mohamed Hegazy
2014-07-25 10:53:52 -07:00
parent 6ca9a1a6d8
commit 2b04bcf5a3
2 changed files with 33 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/services/keywordCompletions.ts
View File

@@ -1,76 +0,0 @@
// Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0.
// See LICENSE.txt in the project root for complete license information.
///<reference path='references.ts' />
module TypeScript.Services {
export class KeywordCompletions {
private static keywords = [
"break",
"case",
"catch",
"class",
"constructor",
"continue",
"debugger",
"declare",
"default",
"delete",
"do",
"else",
"enum",
"export",
"extends",
"false",
"finally",
"for",
"function",
"get",
"if",
"implements",
"import",
"in",
"instanceof",
"interface",
"module",
"new",
"null",
"private",
"public",
"require",
"return",
"set",
"static",
"super",
"switch",
"this",
"throw",
"true",
"try",
"typeof",
"var",
"while",
"with",
];
private static keywordCompletions: ts.CompletionEntry[] = null;
public static getKeywordCompltions(): ts.CompletionEntry[]{
if (KeywordCompletions.keywordCompletions === null) {
var completions: ts.CompletionEntry[] = [];
for (var i = 0, n = KeywordCompletions.keywords.length; i < n; i++) {
var keyword = KeywordCompletions.keywords[i];
completions.push({
name: keyword,
kind: ts.ScriptElementKind.keyword,
kindModifiers: ts.ScriptElementKindModifier.none
});
}
KeywordCompletions.keywordCompletions = completions;
}
return KeywordCompletions.keywordCompletions;
}
}
}

35
src/services/services.ts
View File

@@ -12,7 +12,6 @@
/// <reference path='indentation.ts' />
/// <reference path='formatting\formatting.ts' />
/// <reference path='completionHelpers.ts' />
/// <reference path='keywordCompletions.ts' />
/// <reference path='compiler\bloomFilter.ts' />
/// <reference path='core\references.ts' />
@@ -1194,6 +1193,7 @@ module ts {
var documentRegistry = documentRegistry;
var cancellationToken = new CancellationToken(host.getCancellationToken());
var activeCompletionSession: CompletionSession;
var keywordCompletions = getKeywordCompletionEntries();
// Check if the localized messages json is set, otherwise query the host for it
if (!TypeScript.LocalizedDiagnosticMessages) {
@@ -1349,6 +1349,37 @@ module ts {
};
}
function getKeywordCompletionEntries(): CompletionEntry[] {
var keywords = [
"break",
"case", "catch", "class", "constructor", "continue",
"debugger", "declare", "default", "delete", "do",
"else", "enum", "export", "extends",
"false", "finally", "for", "function",
"get",
"if","implements", "import", "in", "instanceof", "interface",
"module",
"new", "null",
"private", "public",
"require","return",
"set", "static", "super", "switch",
"this", "throw", "true", "try", "typeof",
"var",
"while","with",
];
var result = [];
forEach(keywords, (keyword) => {
result.push({
name: keyword,
kind: ScriptElementKind.keyword,
kindModifiers: ScriptElementKindModifier.none
});
});
return result;
}
function getCompletionsAtPosition(filename: string, position: number, isMemberCompletion: boolean) {
function getCompletionEntriesFromSymbols(symbols: ts.Symbol[], session: CompletionSession): void {
ts.forEach(symbols, (symbol) => {
@@ -1485,7 +1516,7 @@ module ts {
// Add keywords if this is not a member completion list
if (!isMemberCompletion) {
Array.prototype.push.apply(activeCompletionSession.entries, TypeScript.Services.KeywordCompletions.getKeywordCompltions());
Array.prototype.push.apply(activeCompletionSession.entries, keywordCompletions);
}
return {