Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into strictChecks

Browse Source
This commit is contained in:
Anders Hejlsberg
2017-03-05 16:31:22 -08:00
parent cda741d14a b1520345be
commit a4e80b5004
47 changed files with 288 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jakefile.js
+9 -3
View File
@@ -328,8 +328,14 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, opts
if (opts.stripInternal) {
options += " --stripInternal";
}
options += " --target es5 --lib es5,scripthost --noUnusedLocals --noUnusedParameters";
options += " --target es5";
if (opts.lib) {
options += " --lib " + opts.lib
}
else {
options += " --lib es5,scripthost"
}
options += " --noUnusedLocals --noUnusedParameters";
var cmd = host + " " + compilerPath + " " + options + " ";
cmd = cmd + sources.join(" ");
@@ -1110,7 +1116,7 @@ desc("Compiles tslint rules to js");
task("build-rules", ["build-rules-start"].concat(tslintRulesOutFiles).concat(["build-rules-end"]));
tslintRulesFiles.forEach(function (ruleFile, i) {
compileFile(tslintRulesOutFiles[i], [ruleFile], [ruleFile], [], /*useBuiltCompiler*/ false,
{ noOutFile: true, generateDeclarations: false, outDir: path.join(builtLocalDirectory, "tslint") });
{ noOutFile: true, generateDeclarations: false, outDir: path.join(builtLocalDirectory, "tslint"), lib: "es6" });
});
desc("Emit the start of the build-rules fold");
scripts/parallel-lint.js
+2 -1
View File
@@ -1,5 +1,6 @@
var tslint = require("tslint");
var fs = require("fs");
var path = require("path");
function getLinterOptions() {
return {
@@ -9,7 +10,7 @@ function getLinterOptions() {
};
}
function getLinterConfiguration() {
return require("../tslint.json");
return tslint.Configuration.loadConfigurationFromPath(path.join(__dirname, "../tslint.json"));
}
function lintFileContents(options, configuration, path, contents) {
src/compiler/checker.ts
+8 -6
View File
@@ -143,7 +143,7 @@ namespace ts {
getAugmentedPropertiesOfType,
getRootSymbols,
getContextualType: node => {
node = getParseTreeNode(node, isExpression)
node = getParseTreeNode(node, isExpression);
return node ? getContextualType(node) : undefined;
},
getFullyQualifiedName,
@@ -16133,7 +16133,7 @@ namespace ts {
}
function checkDeclarationInitializer(declaration: VariableLikeDeclaration) {
const type = checkExpressionCached(declaration.initializer);
const type = getTypeOfExpression(declaration.initializer, /*cache*/ true);
return getCombinedNodeFlags(declaration) & NodeFlags.Const ||
getCombinedModifierFlags(declaration) & ModifierFlags.Readonly && !isParameterPropertyDeclaration(declaration) ||
isTypeAssertion(declaration.initializer) ? type : getWidenedLiteralType(type);
@@ -16206,10 +16206,12 @@ namespace ts {
// Returns the type of an expression. Unlike checkExpression, this function is simply concerned
// with computing the type and may not fully check all contained sub-expressions for errors.
function getTypeOfExpression(node: Expression) {
// A cache argument of true indicates that if the function performs a full type check, it is ok
// to cache the result.
function getTypeOfExpression(node: Expression, cache?: boolean) {
// Optimize for the common case of a call to a function with a single non-generic call
// signature where we can just fetch the return type without checking the arguments.
if (node.kind === SyntaxKind.CallExpression && (<CallExpression>node).expression.kind !== SyntaxKind.SuperKeyword) {
if (node.kind === SyntaxKind.CallExpression && (<CallExpression>node).expression.kind !== SyntaxKind.SuperKeyword && !isRequireCall(node, /*checkArgumentIsStringLiteral*/true)) {
const funcType = checkNonNullExpression((<CallExpression>node).expression);
const signature = getSingleCallSignature(funcType);
if (signature && !signature.typeParameters) {
@@ -16219,7 +16221,7 @@ namespace ts {
// Otherwise simply call checkExpression. Ideally, the entire family of checkXXX functions
// should have a parameter that indicates whether full error checking is required such that
// we can perform the optimizations locally.
return checkExpression(node);
return cache ? checkExpressionCached(node) : checkExpression(node);
}
// Checks an expression and returns its type. The contextualMapper parameter serves two purposes: When
@@ -20676,7 +20678,7 @@ namespace ts {
}
if (potentialNewTargetCollisions.length) {
forEach(potentialNewTargetCollisions, checkIfNewTargetIsCapturedInEnclosingScope)
forEach(potentialNewTargetCollisions, checkIfNewTargetIsCapturedInEnclosingScope);
potentialNewTargetCollisions.length = 0;
}
src/compiler/core.ts
+2 -2
View File
@@ -84,7 +84,7 @@ namespace ts {
this.index++;
return { value: this.selector(this.data, this.keys[index]), done: false };
}
return { value: undefined as never, done: true }
return { value: undefined as never, done: true };
}
}
@@ -140,7 +140,7 @@ namespace ts {
action(this.data[key], key);
}
}
}
};
}
export function createFileMap<T>(keyMapper?: (key: string) => string): FileMap<T> {
src/compiler/declarationEmitter.ts
+1 -1
View File
@@ -1164,7 +1164,7 @@ namespace ts {
emitTypeParameters(node.typeParameters);
const baseTypeNode = getClassExtendsHeritageClauseElement(node);
if (baseTypeNode) {
node.name
node.name;
emitHeritageClause(node.name, [baseTypeNode], /*isImplementsList*/ false);
}
emitHeritageClause(node.name, getClassImplementsHeritageClauseElements(node), /*isImplementsList*/ true);
src/compiler/moduleNameResolver.ts
+2 -2
View File
@@ -675,7 +675,7 @@ namespace ts {
}
export function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations {
return nodeModuleNameResolverWorker(moduleName, containingFile, compilerOptions, host, cache, /* jsOnly*/ false);
return nodeModuleNameResolverWorker(moduleName, containingFile, compilerOptions, host, cache, /*jsOnly*/ false);
}
/* @internal */
@@ -962,7 +962,7 @@ namespace ts {
const result = cache && cache.get(containingDirectory);
if (result) {
if (traceEnabled) {
trace(host, Diagnostics.Resolution_for_module_0_was_found_in_cache, moduleName)
trace(host, Diagnostics.Resolution_for_module_0_was_found_in_cache, moduleName);
}
return { value: result.resolvedModule && { path: result.resolvedModule.resolvedFileName, extension: result.resolvedModule.extension } };
}
src/compiler/transformer.ts
+2 -2
View File
@@ -121,13 +121,13 @@ namespace ts {
enableEmitNotification,
isSubstitutionEnabled,
isEmitNotificationEnabled,
get onSubstituteNode() { return onSubstituteNode },
get onSubstituteNode() { return onSubstituteNode; },
set onSubstituteNode(value) {
Debug.assert(state < TransformationState.Initialized, "Cannot modify transformation hooks after initialization has completed.");
Debug.assert(value !== undefined, "Value must not be 'undefined'");
onSubstituteNode = value;
},
get onEmitNode() { return onEmitNode },
get onEmitNode() { return onEmitNode; },
set onEmitNode(value) {
Debug.assert(state < TransformationState.Initialized, "Cannot modify transformation hooks after initialization has completed.");
Debug.assert(value !== undefined, "Value must not be 'undefined'");
src/compiler/transformers/es2015.ts
+1 -1
View File
@@ -2690,7 +2690,7 @@ namespace ts {
if (loopOutParameters.length) {
copyOutParameters(loopOutParameters, CopyDirection.ToOutParameter, statements);
}
addRange(statements, lexicalEnvironment)
addRange(statements, lexicalEnvironment);
loopBody = createBlock(statements, /*multiline*/ true);
}
src/compiler/transformers/module/module.ts
+1 -1
View File
@@ -1152,7 +1152,7 @@ namespace ts {
createIdentifier("__esModule"),
createLiteral(true)
)
)
);
}
else {
statement = createStatement(
src/compiler/types.ts
+1 -1
View File
@@ -3297,7 +3297,7 @@
}
export interface PluginImport {
name: string
name: string;
}
export type CompilerOptionsValue = string | number | boolean | (string | number)[] | string[] | MapLike<string[]> | PluginImport[];
src/harness/fourslash.ts
+4 -4
View File
@@ -585,7 +585,7 @@ namespace FourSlash {
}
private getGoToDefinition(): ts.DefinitionInfo[] {
return this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition)
return this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
}
public verifyGoToType(arg0: any, endMarkerNames?: string | string[]) {
@@ -926,7 +926,7 @@ namespace FourSlash {
function rangeToReferenceEntry(r: Range) {
let { isWriteAccess, isDefinition } = (r.marker && r.marker.data) || { isWriteAccess: false, isDefinition: false };
isWriteAccess = !!isWriteAccess; isDefinition = !!isDefinition;
return { fileName: r.fileName, textSpan: { start: r.start, length: r.end - r.start }, isWriteAccess, isDefinition }
return { fileName: r.fileName, textSpan: { start: r.start, length: r.end - r.start }, isWriteAccess, isDefinition };
}
}
@@ -2136,7 +2136,7 @@ namespace FourSlash {
const result = includeWhiteSpace
? actualText === expectedText
: this.removeWhitespace(actualText) === this.removeWhitespace(expectedText)
: this.removeWhitespace(actualText) === this.removeWhitespace(expectedText);
if (!result) {
this.raiseError(`Actual text doesn't match expected text. Actual:\n'${actualText}'\nExpected:\n'${expectedText}'`);
@@ -2173,7 +2173,7 @@ namespace FourSlash {
start: diagnostic.start,
length: diagnostic.length,
code: diagnostic.code
}
};
});
const dedupedDiagnositcs = ts.deduplicate(diagnosticsForCodeFix, ts.equalOwnProperties);
src/harness/harness.ts
+2 -2
View File
@@ -44,7 +44,7 @@ declare namespace NodeJS {
declare var window: {};
declare var XMLHttpRequest: {
new(): XMLHttpRequest;
}
};
interface XMLHttpRequest {
readonly readyState: number;
readonly responseText: string;
@@ -1017,7 +1017,7 @@ namespace Harness {
}
else {
if (!es6TestLibFileNameSourceFileMap.get(libFileName)) {
es6TestLibFileNameSourceFileMap.set(libFileName, createSourceFileAndAssertInvariants(libFileName, IO.readFile(libFileName), scriptTarget))
es6TestLibFileNameSourceFileMap.set(libFileName, createSourceFileAndAssertInvariants(libFileName, IO.readFile(libFileName), scriptTarget));
}
}
}
src/harness/harnessLanguageService.ts
+1 -1
View File
@@ -779,7 +779,7 @@ namespace Harness.LanguageService {
start: 0
});
return prev;
}
};
return proxy;
}
}),
src/harness/unittests/compileOnSave.ts
+1 -1
View File
@@ -496,7 +496,7 @@ namespace ts.projectSystem {
const emitOutput = host.readFile(path + ".js");
assert.equal(emitOutput, f.content + newLine, "content of emit output should be identical with the input + newline");
}
})
});
it("should emit specified file", () => {
const file1 = {
src/harness/unittests/printer.ts
+1 -1
View File
@@ -9,7 +9,7 @@ namespace ts {
Harness.Baseline.runBaseline(`printerApi/${prefix}.${name}.js`, () =>
printCallback(createPrinter({ newLine: NewLineKind.CarriageReturnLineFeed, ...options })));
});
}
};
}
describe("printFile", () => {
src/harness/unittests/textStorage.ts
+1 -1
View File
@@ -65,6 +65,6 @@ namespace ts.textStorage {
ts1.getLineInfo(0);
assert.isTrue(ts1.hasScriptVersionCache(), "have script version cache - 2");
})
});
});
}
src/harness/unittests/tsserverProjectSystem.ts
+9 -9
View File
@@ -628,7 +628,7 @@ namespace ts.projectSystem {
checkProjectActualFiles(service.configuredProjects[0], []);
checkProjectActualFiles(service.inferredProjects[0], [f1.path]);
})
});
it("create configured project without file list", () => {
const configFile: FileOrFolder = {
@@ -1181,7 +1181,7 @@ namespace ts.projectSystem {
const host = createServerHost([f1, f2, libFile]);
const service = createProjectService(host);
service.openExternalProject({ projectFileName: "/a/b/project", rootFiles: toExternalFiles([f1.path, f2.path]), options: {} })
service.openExternalProject({ projectFileName: "/a/b/project", rootFiles: toExternalFiles([f1.path, f2.path]), options: {} });
service.openClientFile(f1.path);
service.openClientFile(f2.path, "let x: string");
@@ -1213,7 +1213,7 @@ namespace ts.projectSystem {
const host = createServerHost([f1, f2, libFile]);
const service = createProjectService(host);
service.openExternalProject({ projectFileName: "/a/b/project", rootFiles: [{ fileName: f1.path }, { fileName: f2.path, hasMixedContent: true }], options: {} })
service.openExternalProject({ projectFileName: "/a/b/project", rootFiles: [{ fileName: f1.path }, { fileName: f2.path, hasMixedContent: true }], options: {} });
service.openClientFile(f1.path);
service.openClientFile(f2.path, "let somelongname: string");
@@ -2040,7 +2040,7 @@ namespace ts.projectSystem {
for (const f of [f2, f3]) {
const scriptInfo = projectService.getScriptInfoForNormalizedPath(server.toNormalizedPath(f.path));
assert.equal(scriptInfo.containingProjects.length, 0, `expect 0 containing projects for '${f.path}'`)
assert.equal(scriptInfo.containingProjects.length, 0, `expect 0 containing projects for '${f.path}'`);
}
});
@@ -2156,7 +2156,7 @@ namespace ts.projectSystem {
projectFileName,
rootFiles: [toExternalFile(f1.path)],
options: {}
})
});
projectService.openClientFile(f1.path, "let x = 1;\nlet y = 2;");
projectService.checkNumberOfProjects({ externalProjects: 1 });
@@ -3307,12 +3307,12 @@ namespace ts.projectSystem {
isCancellationRequested: () => false,
setRequest: requestId => {
if (expectedRequestId === undefined) {
assert.isTrue(false, "unexpected call")
assert.isTrue(false, "unexpected call");
}
assert.equal(requestId, expectedRequestId);
},
resetRequest: noop
}
};
const session = createSession(host, /*typingsInstaller*/ undefined, /*projectServiceEventHandler*/ undefined, cancellationToken);
expectedRequestId = session.getNextSeq();
@@ -3359,13 +3359,13 @@ namespace ts.projectSystem {
currentId = requestId;
},
resetRequest(requestId) {
assert.equal(requestId, currentId, "unexpected request id in cancellation")
assert.equal(requestId, currentId, "unexpected request id in cancellation");
currentId = undefined;
},
isCancellationRequested() {
return requestToCancel === currentId;
}
}
};
})();
const host = createServerHost([f1, config]);
const session = createSession(host, /*typingsInstaller*/ undefined, () => {}, cancellationToken);
src/harness/unittests/typingsInstaller.ts
+2 -2
View File
@@ -56,7 +56,7 @@ namespace ts.projectSystem {
path: "/a/config.js",
content: "export let x = 1"
};
const typesCache = "/cache"
const typesCache = "/cache";
const typesConfig = {
path: typesCache + "/node_modules/@types/config/index.d.ts",
content: "export let y: number;"
@@ -74,7 +74,7 @@ namespace ts.projectSystem {
super(host, { typesRegistry: createTypesRegistry("config"), globalTypingsCacheLocation: typesCache });
}
installWorker(_requestId: number, _args: string[], _cwd: string, _cb: server.typingsInstaller.RequestCompletedAction) {
assert(false, "should not be called")
assert(false, "should not be called");
}
})();
const service = createProjectService(host, { typingsInstaller: installer });
src/server/editorServices.ts
+2 -2
View File
@@ -140,7 +140,7 @@ namespace ts.server {
getScriptKind: _ => undefined,
hasMixedContent: (fileName, extraFileExtensions) => {
const mixedContentExtensions = ts.map(ts.filter(extraFileExtensions, item => item.isMixedContent), item => item.extension);
return forEach(mixedContentExtensions, extension => fileExtensionIs(fileName, extension))
return forEach(mixedContentExtensions, extension => fileExtensionIs(fileName, extension));
}
};
@@ -1377,7 +1377,7 @@ namespace ts.server {
// close projects that were missing in the input list
forEachKey(projectsToClose, externalProjectName => {
this.closeExternalProject(externalProjectName, /*suppressRefresh*/ true)
this.closeExternalProject(externalProjectName, /*suppressRefresh*/ true);
});
this.refreshInferredProjects();
src/server/project.ts
+2 -2
View File
@@ -723,7 +723,7 @@ namespace ts.server {
const fileName = resolvedTypeReferenceDirective.resolvedFileName;
const typeFilePath = toPath(fileName, currentDirectory, getCanonicalFileName);
referencedFiles.set(typeFilePath, true);
})
});
}
const allFileNames = arrayFrom(referencedFiles.keys()) as Path[];
@@ -745,7 +745,7 @@ namespace ts.server {
const id = nextId;
nextId++;
return makeInferredProjectName(id);
}
};
})();
private _isJsInferredProject = false;
src/server/scriptInfo.ts
+1 -1
View File
@@ -48,7 +48,7 @@ namespace ts.server {
public reloadFromFile(tempFileName?: string) {
if (this.svc || (tempFileName !== this.fileName)) {
this.reload(this.getFileText(tempFileName))
this.reload(this.getFileText(tempFileName));
}
else {
this.setText(undefined);
src/server/server.ts
+3 -3
View File
@@ -47,14 +47,14 @@ namespace ts.server {
if (process.env.XDG_CACHE_HOME) {
return process.env.XDG_CACHE_HOME;
}
const usersDir = platformIsDarwin ? "Users" : "home"
const usersDir = platformIsDarwin ? "Users" : "home";
const homePath = (os.homedir && os.homedir()) ||
process.env.HOME ||
((process.env.LOGNAME || process.env.USER) && `/${usersDir}/${process.env.LOGNAME || process.env.USER}`) ||
os.tmpdir();
const cacheFolder = platformIsDarwin
? "Library/Caches"
: ".cache"
: ".cache";
return combinePaths(normalizeSlashes(homePath), cacheFolder);
}
@@ -653,7 +653,7 @@ namespace ts.server {
// this drive is unsafe - return no-op watcher
return { close() { } };
}
}
};
}
// Override sys.write because fs.writeSync is not reliable on Node 4
src/server/session.ts
+5 -5
View File
@@ -226,7 +226,7 @@ namespace ts.server {
/**
* Represents operation that can schedule its next step to be executed later.
* Scheduling is done via instance of NextStep. If on current step subsequent step was not scheduled - operation is assumed to be completed.
* Scheduling is done via instance of NextStep. If on current step subsequent step was not scheduled - operation is assumed to be completed.
*/
class MultistepOperation {
private requestId: number;
@@ -239,7 +239,7 @@ namespace ts.server {
this.next = {
immediate: action => this.immediate(action),
delay: (ms, action) => this.delay(ms, action)
}
};
}
public startNew(action: (next: NextStep) => void) {
@@ -262,7 +262,7 @@ namespace ts.server {
private immediate(action: () => void) {
const requestId = this.requestId;
Debug.assert(requestId === this.operationHost.getCurrentRequestId(), "immediate: incorrect request id")
Debug.assert(requestId === this.operationHost.getCurrentRequestId(), "immediate: incorrect request id");
this.setImmediateId(this.operationHost.getServerHost().setImmediate(() => {
this.immediateId = undefined;
this.operationHost.executeWithRequestId(requestId, () => this.executeAction(action));
@@ -271,7 +271,7 @@ namespace ts.server {
private delay(ms: number, action: () => void) {
const requestId = this.requestId;
Debug.assert(requestId === this.operationHost.getCurrentRequestId(), "delay: incorrect request id")
Debug.assert(requestId === this.operationHost.getCurrentRequestId(), "delay: incorrect request id");
this.setTimerHandle(this.operationHost.getServerHost().setTimeout(() => {
this.timerHandle = undefined;
this.operationHost.executeWithRequestId(requestId, () => this.executeAction(action));
@@ -351,7 +351,7 @@ namespace ts.server {
logError: (err, cmd) => this.logError(err, cmd),
sendRequestCompletedEvent: requestId => this.sendRequestCompletedEvent(requestId),
isCancellationRequested: () => cancellationToken.isCancellationRequested()
}
};
this.errorCheck = new MultistepOperation(multistepOperationHost);
this.projectService = new ProjectService(host, logger, cancellationToken, useSingleInferredProject, typingsInstaller, this.eventHander);
this.gcTimer = new GcTimer(host, /*delay*/ 7000, logger);
src/server/typingsInstaller/nodeTypingsInstaller.ts
+1 -3
View File
@@ -61,9 +61,7 @@ namespace ts.server.typingsInstaller {
return combinePaths(normalizeSlashes(globalTypingsCacheLocation), `node_modules/${TypesRegistryPackageName}/index.json`);
}
type ExecSync = {
(command: string, options: { cwd: string, stdio?: "ignore" }): any
}
type ExecSync = (command: string, options: { cwd: string, stdio?: "ignore" }) => any;
export class NodeTypingsInstaller extends TypingsInstaller {
private readonly execSync: ExecSync;
src/server/watchGuard/watchGuard.ts
+1 -1
View File
@@ -11,7 +11,7 @@ const fs: { watch(directoryName: string, options: any, callback: () => {}): any
// This means that here we treat any result (success or exception) from fs.watch as success since it does not tear down the process.
// The only case that should be considered as failure - when watchGuard process crashes.
try {
const watcher = fs.watch(directoryName, { recursive: true }, () => ({}))
const watcher = fs.watch(directoryName, { recursive: true }, () => ({}));
watcher.close();
}
catch (_e) {
src/services/codefixes/importFixes.ts
+3 -3
View File
@@ -3,8 +3,8 @@ namespace ts.codefix {
type ImportCodeActionKind = "CodeChange" | "InsertingIntoExistingImport" | "NewImport";
interface ImportCodeAction extends CodeAction {
kind: ImportCodeActionKind,
moduleSpecifier?: string
kind: ImportCodeActionKind;
moduleSpecifier?: string;
}
enum ModuleSpecifierComparison {
@@ -75,7 +75,7 @@ namespace ts.codefix {
getAllActions() {
let result: ImportCodeAction[] = [];
for (const key in this.symbolIdToActionMap) {
result = concatenate(result, this.symbolIdToActionMap[key])
result = concatenate(result, this.symbolIdToActionMap[key]);
}
return result;
}
src/services/findAllReferences.ts
+2 -2
View File
@@ -422,7 +422,7 @@ namespace ts.FindAllReferences {
name,
textSpan: references[0].textSpan,
displayParts: [{ text: name, kind: ScriptElementKind.keyword }]
}
};
return [{ definition, references }];
}
@@ -613,7 +613,7 @@ namespace ts.FindAllReferences {
const result: Node[] = [];
for (const decl of classSymbol.members.get("__constructor").declarations) {
const ctrKeyword = ts.findChildOfKind(decl, ts.SyntaxKind.ConstructorKeyword, sourceFile)!
const ctrKeyword = ts.findChildOfKind(decl, ts.SyntaxKind.ConstructorKeyword, sourceFile)!;
Debug.assert(decl.kind === SyntaxKind.Constructor && !!ctrKeyword);
result.push(ctrKeyword);
}
src/services/jsDoc.ts
+1 -1
View File
@@ -107,7 +107,7 @@ namespace ts.JsDoc {
kind: ScriptElementKind.keyword,
kindModifiers: "",
sortText: "0"
}
};
}));
}
src/services/symbolDisplay.ts
+7 -5
View File
@@ -2,7 +2,7 @@
namespace ts.SymbolDisplay {
// TODO(drosen): use contextual SemanticMeaning.
export function getSymbolKind(typeChecker: TypeChecker, symbol: Symbol, location: Node): string {
const flags = symbol.getFlags();
const { flags } = symbol;
if (flags & SymbolFlags.Class) return getDeclarationOfKind(symbol, SyntaxKind.ClassExpression) ?
ScriptElementKind.localClassElement : ScriptElementKind.classElement;
@@ -11,10 +11,10 @@ namespace ts.SymbolDisplay {
if (flags & SymbolFlags.Interface) return ScriptElementKind.interfaceElement;
if (flags & SymbolFlags.TypeParameter) return ScriptElementKind.typeParameterElement;
const result = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeChecker, symbol, flags, location);
const result = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeChecker, symbol, location);
if (result === ScriptElementKind.unknown) {
if (flags & SymbolFlags.TypeParameter) return ScriptElementKind.typeParameterElement;
if (flags & SymbolFlags.EnumMember) return ScriptElementKind.variableElement;
if (flags & SymbolFlags.EnumMember) return ScriptElementKind.enumMemberElement;
if (flags & SymbolFlags.Alias) return ScriptElementKind.alias;
if (flags & SymbolFlags.Module) return ScriptElementKind.moduleElement;
}
@@ -22,7 +22,7 @@ namespace ts.SymbolDisplay {
return result;
}
function getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeChecker: TypeChecker, symbol: Symbol, flags: SymbolFlags, location: Node) {
function getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeChecker: TypeChecker, symbol: Symbol, location: Node) {
if (typeChecker.isUndefinedSymbol(symbol)) {
return ScriptElementKind.variableElement;
}
@@ -32,6 +32,7 @@ namespace ts.SymbolDisplay {
if (location.kind === SyntaxKind.ThisKeyword && isExpression(location)) {
return ScriptElementKind.parameterElement;
}
const { flags } = symbol;
if (flags & SymbolFlags.Variable) {
if (isFirstDeclarationOfSymbolParameter(symbol)) {
return ScriptElementKind.parameterElement;
@@ -93,7 +94,7 @@ namespace ts.SymbolDisplay {
const displayParts: SymbolDisplayPart[] = [];
let documentation: SymbolDisplayPart[];
const symbolFlags = symbol.flags;
let symbolKind = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeChecker, symbol, symbolFlags, location);
let symbolKind = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeChecker, symbol, location);
let hasAddedSymbolInfo: boolean;
const isThisExpression = location.kind === SyntaxKind.ThisKeyword && isExpression(location);
let type: Type;
@@ -319,6 +320,7 @@ namespace ts.SymbolDisplay {
}
}
if (symbolFlags & SymbolFlags.EnumMember) {
symbolKind = ScriptElementKind.enumMemberElement;
addPrefixForAnyFunctionOrVar(symbol, "enum member");
const declaration = symbol.declarations[0];
if (declaration.kind === SyntaxKind.EnumMember) {
src/services/types.ts
+1 -2
View File
@@ -706,8 +706,7 @@ namespace ts {
/** enum E */
export const enumElement = "enum";
// TODO: GH#9983
export const enumMemberElement = "const";
export const enumMemberElement = "enum member";
/**
* Inside module and script only
tests/baselines/reference/ambientRequireFunction.types
+1 -1
View File
@@ -3,7 +3,7 @@
const fs = require("fs");
>fs : typeof "fs"
>require("fs") : any
>require("fs") : typeof "fs"
>require : (moduleName: string) => any
>"fs" : "fs"
tests/baselines/reference/circularInferredTypeOfVariable.js
+44
View File
@@ -0,0 +1,44 @@
//// [circularInferredTypeOfVariable.ts]
// Repro from #14428
(async () => {
function foo(p: string[]): string[] {
return [];
}
function bar(p: string[]): string[] {
return [];
}
let a1: string[] | undefined = [];
while (true) {
let a2 = foo(a1!);
a1 = await bar(a2);
}
});
//// [circularInferredTypeOfVariable.js]
// Repro from #14428
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
(() => __awaiter(this, void 0, void 0, function* () {
function foo(p) {
return [];
}
function bar(p) {
return [];
}
let a1 = [];
while (true) {
let a2 = foo(a1);
a1 = yield bar(a2);
}
}));
tests/baselines/reference/circularInferredTypeOfVariable.symbols
+34
View File
@@ -0,0 +1,34 @@
=== tests/cases/compiler/circularInferredTypeOfVariable.ts ===
// Repro from #14428
(async () => {
function foo(p: string[]): string[] {
>foo : Symbol(foo, Decl(circularInferredTypeOfVariable.ts, 3, 14))
>p : Symbol(p, Decl(circularInferredTypeOfVariable.ts, 4, 17))
return [];
}
function bar(p: string[]): string[] {
>bar : Symbol(bar, Decl(circularInferredTypeOfVariable.ts, 6, 5))
>p : Symbol(p, Decl(circularInferredTypeOfVariable.ts, 8, 17))
return [];
}
let a1: string[] | undefined = [];
>a1 : Symbol(a1, Decl(circularInferredTypeOfVariable.ts, 12, 7))
while (true) {
let a2 = foo(a1!);
>a2 : Symbol(a2, Decl(circularInferredTypeOfVariable.ts, 15, 11))
>foo : Symbol(foo, Decl(circularInferredTypeOfVariable.ts, 3, 14))
>a1 : Symbol(a1, Decl(circularInferredTypeOfVariable.ts, 12, 7))
a1 = await bar(a2);
>a1 : Symbol(a1, Decl(circularInferredTypeOfVariable.ts, 12, 7))
>bar : Symbol(bar, Decl(circularInferredTypeOfVariable.ts, 6, 5))
>a2 : Symbol(a2, Decl(circularInferredTypeOfVariable.ts, 15, 11))
}
});
tests/baselines/reference/circularInferredTypeOfVariable.types
+47
View File
@@ -0,0 +1,47 @@
=== tests/cases/compiler/circularInferredTypeOfVariable.ts ===
// Repro from #14428
(async () => {
>(async () => { function foo(p: string[]): string[] { return []; } function bar(p: string[]): string[] { return []; } let a1: string[] | undefined = []; while (true) { let a2 = foo(a1!); a1 = await bar(a2); }}) : () => Promise<never>
>async () => { function foo(p: string[]): string[] { return []; } function bar(p: string[]): string[] { return []; } let a1: string[] | undefined = []; while (true) { let a2 = foo(a1!); a1 = await bar(a2); }} : () => Promise<never>
function foo(p: string[]): string[] {
>foo : (p: string[]) => string[]
>p : string[]
return [];
>[] : undefined[]
}
function bar(p: string[]): string[] {
>bar : (p: string[]) => string[]
>p : string[]
return [];
>[] : undefined[]
}
let a1: string[] | undefined = [];
>a1 : string[]
>[] : undefined[]
while (true) {
>true : true
let a2 = foo(a1!);
>a2 : string[]
>foo(a1!) : string[]
>foo : (p: string[]) => string[]
>a1! : string[]
>a1 : string[]
a1 = await bar(a2);
>a1 = await bar(a2) : string[]
>a1 : string[]
>await bar(a2) : string[]
>bar(a2) : string[]
>bar : (p: string[]) => string[]
>a2 : string[]
}
});
tests/baselines/reference/controlFlowIterationErrors.errors.txt
+1 -17
View File
@@ -6,15 +6,9 @@ tests/cases/conformance/controlFlow/controlFlowIterationErrors.ts(35,17): error
Type 'string' is not assignable to type 'number'.
tests/cases/conformance/controlFlow/controlFlowIterationErrors.ts(46,17): error TS2345: Argument of type 'string | number' is not assignable to parameter of type 'number'.
Type 'string' is not assignable to type 'number'.
tests/cases/conformance/controlFlow/controlFlowIterationErrors.ts(77,13): error TS7022: 'y' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer.
tests/cases/conformance/controlFlow/controlFlowIterationErrors.ts(77,26): error TS2345: Argument of type 'string | number | boolean' is not assignable to parameter of type 'string | number'.
Type 'true' is not assignable to type 'string | number'.
tests/cases/conformance/controlFlow/controlFlowIterationErrors.ts(88,13): error TS7022: 'y' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer.
tests/cases/conformance/controlFlow/controlFlowIterationErrors.ts(88,26): error TS2345: Argument of type 'string | number | boolean' is not assignable to parameter of type 'string | number'.
Type 'true' is not assignable to type 'string | number'.
==== tests/cases/conformance/controlFlow/controlFlowIterationErrors.ts (8 errors) ====
==== tests/cases/conformance/controlFlow/controlFlowIterationErrors.ts (4 errors) ====
let cond: boolean;
@@ -104,11 +98,6 @@ tests/cases/conformance/controlFlow/controlFlowIterationErrors.ts(88,26): error
x = "0";
while (cond) {
let y = asNumber(x);
~
!!! error TS7022: 'y' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer.
~
!!! error TS2345: Argument of type 'string | number | boolean' is not assignable to parameter of type 'string | number'.
!!! error TS2345: Type 'true' is not assignable to type 'string | number'.
x = y + 1;
x;
}
@@ -120,11 +109,6 @@ tests/cases/conformance/controlFlow/controlFlowIterationErrors.ts(88,26): error
while (cond) {
x;
let y = asNumber(x);
~
!!! error TS7022: 'y' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer.
~
!!! error TS2345: Argument of type 'string | number | boolean' is not assignable to parameter of type 'string | number'.
!!! error TS2345: Type 'true' is not assignable to type 'string | number'.
x = y + 1;
x;
}
tests/baselines/reference/implicitAnyFromCircularInference.errors.txt
+1 -4
View File
@@ -7,11 +7,10 @@ tests/cases/compiler/implicitAnyFromCircularInference.ts(18,10): error TS7024: F
tests/cases/compiler/implicitAnyFromCircularInference.ts(23,10): error TS7024: Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions.
tests/cases/compiler/implicitAnyFromCircularInference.ts(26,10): error TS7023: 'h' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions.
tests/cases/compiler/implicitAnyFromCircularInference.ts(28,14): error TS7023: 'foo' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions.
tests/cases/compiler/implicitAnyFromCircularInference.ts(41,5): error TS7022: 's' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer.
tests/cases/compiler/implicitAnyFromCircularInference.ts(46,9): error TS7023: 'x' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions.
==== tests/cases/compiler/implicitAnyFromCircularInference.ts (11 errors) ====
==== tests/cases/compiler/implicitAnyFromCircularInference.ts (10 errors) ====
// Error expected
var a: typeof a;
@@ -71,8 +70,6 @@ tests/cases/compiler/implicitAnyFromCircularInference.ts(46,9): error TS7023: 'x
class C {
// Error expected
s = foo(this);
~~~~~~~~~~~~~~
!!! error TS7022: 's' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer.
}
class D {
tests/baselines/reference/quickInfoDisplayPartsEnum1.baseline
+12 -12
View File
@@ -34,7 +34,7 @@
"position": 13
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 13,
@@ -95,7 +95,7 @@
"position": 21
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 21,
@@ -156,7 +156,7 @@
"position": 34
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 34,
@@ -357,7 +357,7 @@
"position": 71
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 71,
@@ -488,7 +488,7 @@
"position": 89
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 89,
@@ -619,7 +619,7 @@
"position": 107
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 107,
@@ -717,7 +717,7 @@
"position": 135
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 135,
@@ -778,7 +778,7 @@
"position": 143
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 143,
@@ -839,7 +839,7 @@
"position": 156
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 156,
@@ -1056,7 +1056,7 @@
"position": 205
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 205,
@@ -1195,7 +1195,7 @@
"position": 229
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 229,
@@ -1334,7 +1334,7 @@
"position": 253
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 253,
tests/baselines/reference/quickInfoDisplayPartsEnum2.baseline
+12 -12
View File
@@ -34,7 +34,7 @@
"position": 13
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 13,
@@ -99,7 +99,7 @@
"position": 23
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 23,
@@ -164,7 +164,7 @@
"position": 38
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 38,
@@ -369,7 +369,7 @@
"position": 77
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 77,
@@ -504,7 +504,7 @@
"position": 95
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 95,
@@ -639,7 +639,7 @@
"position": 113
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 113,
@@ -741,7 +741,7 @@
"position": 141
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 141,
@@ -806,7 +806,7 @@
"position": 151
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 151,
@@ -871,7 +871,7 @@
"position": 166
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 166,
@@ -1092,7 +1092,7 @@
"position": 217
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 217,
@@ -1235,7 +1235,7 @@
"position": 241
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 241,
@@ -1378,7 +1378,7 @@
"position": 265
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 265,
tests/baselines/reference/quickInfoDisplayPartsEnum3.baseline
+12 -12
View File
@@ -34,7 +34,7 @@
"position": 13
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 13,
@@ -99,7 +99,7 @@
"position": 23
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 23,
@@ -164,7 +164,7 @@
"position": 38
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 38,
@@ -369,7 +369,7 @@
"position": 77
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 77,
@@ -504,7 +504,7 @@
"position": 98
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 98,
@@ -639,7 +639,7 @@
"position": 119
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 119,
@@ -741,7 +741,7 @@
"position": 150
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 150,
@@ -806,7 +806,7 @@
"position": 160
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 160,
@@ -871,7 +871,7 @@
"position": 175
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 175,
@@ -1092,7 +1092,7 @@
"position": 226
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 226,
@@ -1235,7 +1235,7 @@
"position": 253
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 253,
@@ -1378,7 +1378,7 @@
"position": 280
},
"quickInfo": {
"kind": "var",
"kind": "enum member",
"kindModifiers": "",
"textSpan": {
"start": 280,
tests/cases/compiler/circularInferredTypeOfVariable.ts
+20
View File
@@ -0,0 +1,20 @@
// @target: es6
// Repro from #14428
(async () => {
function foo(p: string[]): string[] {
return [];
}
function bar(p: string[]): string[] {
return [];
}
let a1: string[] | undefined = [];
while (true) {
let a2 = foo(a1!);
a1 = await bar(a2);
}
});
tests/cases/fourslash/deleteClassWithEnumPresent.ts
+6 -6
View File
@@ -16,15 +16,15 @@ verify.navigationTree({
"childItems": [
{
"text": "a",
"kind": "const"
"kind": "enum member"
},
{
"text": "b",
"kind": "const"
"kind": "enum member"
},
{
"text": "c",
"kind": "const"
"kind": "enum member"
}
]
}
@@ -48,15 +48,15 @@ verify.navigationBar([
"childItems": [
{
"text": "a",
"kind": "const"
"kind": "enum member"
},
{
"text": "b",
"kind": "const"
"kind": "enum member"
},
{
"text": "c",
"kind": "const"
"kind": "enum member"
}
],
"indent": 1
tests/cases/fourslash/extendArrayInterfaceMember.ts
+1 -1
View File
@@ -10,7 +10,7 @@ verify.numberOfErrorsInCurrentFile(1);
// - Supplied parameters do not match any signature of call target.
// - Could not select overload for 'call' expression.
verify.quickInfoAt("y", "var y: any");
verify.quickInfoAt("y", "var y: number");
goTo.eof();
edit.insert("interface Array<T> { pop(def: T): T; }");
tests/cases/fourslash/navigationBarItemsInsideMethodsAndConstructors.ts
+4 -4
View File
@@ -36,7 +36,7 @@ verify.navigationTree({
"childItems": [
{
"text": "LocalEnumMemberInConstructor",
"kind": "const"
"kind": "enum member"
}
]
},
@@ -64,7 +64,7 @@ verify.navigationTree({
"childItems": [
{
"text": "LocalEnumMemberInMethod",
"kind": "const"
"kind": "enum member"
}
]
},
@@ -144,7 +144,7 @@ verify.navigationBar([
"childItems": [
{
"text": "LocalEnumMemberInConstructor",
"kind": "const"
"kind": "enum member"
}
],
"indent": 3
@@ -184,7 +184,7 @@ verify.navigationBar([
"childItems": [
{
"text": "LocalEnumMemberInMethod",
"kind": "const"
"kind": "enum member"
}
],
"indent": 3
tests/cases/fourslash/navigationBarItemsItems.ts
+6 -6
View File
@@ -130,15 +130,15 @@ verify.navigationTree({
"childItems": [
{
"text": "value1",
"kind": "const"
"kind": "enum member"
},
{
"text": "value2",
"kind": "const"
"kind": "enum member"
},
{
"text": "value3",
"kind": "const"
"kind": "enum member"
}
]
}
@@ -263,15 +263,15 @@ verify.navigationBar([
"childItems": [
{
"text": "value1",
"kind": "const"
"kind": "enum member"
},
{
"text": "value2",
"kind": "const"
"kind": "enum member"
},
{
"text": "value3",
"kind": "const"
"kind": "enum member"
}
],
"indent": 2
tests/cases/fourslash/quickInfoDisplayPartsEnum1.ts
+1 -1
View File
@@ -19,4 +19,4 @@
/////*25*/eInstance1 = /*26*/constE./*27*/e2;
/////*28*/eInstance1 = /*29*/constE./*30*/e3;
verify.baselineQuickInfo();
verify.baselineQuickInfo();
tests/cases/fourslash/server/navbar01.ts
+6 -6
View File
@@ -129,15 +129,15 @@ verify.navigationTree({
"childItems": [
{
"text": "value1",
"kind": "const"
"kind": "enum member"
},
{
"text": "value2",
"kind": "const"
"kind": "enum member"
},
{
"text": "value3",
"kind": "const"
"kind": "enum member"
}
]
}
@@ -262,15 +262,15 @@ verify.navigationBar([
"childItems": [
{
"text": "value1",
"kind": "const"
"kind": "enum member"
},
{
"text": "value2",
"kind": "const"
"kind": "enum member"
},
{
"text": "value3",
"kind": "const"
"kind": "enum member"
}
],
"indent": 2
tslint.json
+1 -1
View File
@@ -17,7 +17,7 @@
"double",
"avoid-escape"
],
"semicolon": [true, "ignore-bound-class-methods"],
"semicolon": [true, "always", "ignore-bound-class-methods"],
"whitespace": [true,
"check-branch",
"check-decl",