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

More PR feedback

Browse Source
This commit is contained in:
Richard Knoll
2016-08-25 17:39:55 -07:00
parent 34847f0ce0
commit 276b56dfb0
2 changed files with 51 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/services/services.ts
View File

@@ -2076,6 +2076,8 @@ namespace ts {
*/
const tripleSlashDirectiveFragmentRegex = /^(\/\/\/\s*<reference\s+(path|types)\s*=\s*(?:'|"))([^\3]*)$/;
const nodeModulesDependencyKeys = ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"];
let commandLineOptionsStringToEnum: CommandLineOptionOfCustomType[];
/** JS users may pass in string values for enum compiler options (such as ModuleKind), so convert. */
@@ -4606,23 +4608,27 @@ namespace ts {
if (host.readDirectory) {
// Enumerate the available files if possible
const files = host.readDirectory(baseDirectory, extensions, /*exclude*/undefined, /*include*/["./*"]);
const foundFiles = createMap<boolean>();
for (let filePath of files) {
filePath = normalizePath(filePath);
if (exclude && comparePaths(filePath, exclude, scriptPath, ignoreCase) === Comparison.EqualTo) {
continue;
}
const fileName = includeExtensions ? getBaseFileName(filePath) : removeFileExtension(getBaseFileName(filePath));
const duplicate = !includeExtensions && forEach(result, entry => entry.name === fileName);
const foundFileName = includeExtensions ? getBaseFileName(filePath) : removeFileExtension(getBaseFileName(filePath));
if (!duplicate) {
result.push({
name: fileName,
kind: ScriptElementKind.scriptElement,
sortText: fileName
});
if (!foundFiles[foundFileName]) {
foundFiles[foundFileName] = true;
}
}
for (const foundFile in foundFiles) {
result.push({
name: foundFile,
kind: ScriptElementKind.scriptElement,
sortText: foundFile
});
}
}
// If possible, get folder completion as well
@@ -4836,7 +4842,7 @@ namespace ts {
function getCompletionEntriesFromTypings(host: LanguageServiceHost, options: CompilerOptions, scriptPath: string, result: ImportCompletionEntry[] = []): ImportCompletionEntry[] {
// Check for typings specified in compiler options
if (options.types) {
for (const moduleName of options.types){
for (const moduleName of options.types) {
result.push(createCompletionEntryForModule(moduleName, ScriptElementKind.externalModuleName));
}
}
@@ -4911,11 +4917,9 @@ namespace ts {
const nodeModulesDir = combinePaths(getDirectoryPath(packageJson), "node_modules");
const foundModuleNames: string[] = [];
if (package.dependencies) {
addPotentialPackageNames(package.dependencies, foundModuleNames);
}
if (package.devDependencies) {
addPotentialPackageNames(package.devDependencies, foundModuleNames);
// Provide completions for all non @types dependencies
for (const key of nodeModulesDependencyKeys) {
addPotentialPackageNames(package[key], foundModuleNames);
}
for (const moduleName of foundModuleNames) {
@@ -4940,11 +4944,12 @@ namespace ts {
}
}
// Add all the package names that are not in the @types scope
function addPotentialPackageNames(dependencies: any, result: string[]) {
for (const dep in dependencies) {
if (dependencies.hasOwnProperty(dep) && !startsWith(dep, "@types/")) {
result.push(dep);
if (dependencies) {
for (const dep in dependencies) {
if (dependencies.hasOwnProperty(dep) && !startsWith(dep, "@types/")) {
result.push(dep);
}
}
}
}
@@ -4955,7 +4960,6 @@ namespace ts {
}
// Replace everything after the last directory seperator that appears
// FIXME: do we care about the other seperator?
function getDirectoryFragmentTextSpan(text: string, textStart: number): TextSpan {
const index = text.lastIndexOf(directorySeparator);
const offset = index !== -1 ? index + 1 : 0;

28
tests/cases/fourslash/completionForStringLiteralNonrelativeImport12.ts Normal file
View File

@@ -0,0 +1,28 @@
/// <reference path='fourslash.ts' />
// Should give completions for all dependencies in package.json
// @Filename: tests/test0.ts
//// import * as foo1 from "m/*import_as0*/
//// import foo2 = require("m/*import_equals0*/
//// var foo3 = require("m/*require0*/
// @Filename: package.json
//// {
//// "dependencies": { "module": "latest" },
//// "devDependencies": { "dev-module": "latest" },
//// "optionalDependencies": { "optional-module": "latest" },
//// "peerDependencies": { "peer-module": "latest" }
//// }
const kinds = ["import_as", "import_equals", "require"];
for (const kind of kinds) {
goTo.marker(kind + "0");
verify.importModuleCompletionListContains("module");
verify.importModuleCompletionListContains("dev-module");
verify.importModuleCompletionListContains("optional-module");
verify.importModuleCompletionListContains("peer-module");
verify.not.importModuleCompletionListItemsCountIsGreaterThan(4);
}