microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-10 06:41:59 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge branch 'completionEntryDetails' into javascriptLanguageservice

Browse Source 
Conflicts:
	src/services/services.ts
This commit is contained in:
Cyrus Najmabadi 2015-03-24 13:48:00 -07:00
commit f583fd451e
172 changed files with 1231 additions and 1062 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
src/compiler/checker.ts
View File

@ -10547,62 +10547,102 @@ module ts {
return false;
}
function getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[] {
function getSymbolsInScope(location: Node, meaning: SymbolFlags, predicate?: (symbol: Symbol) => boolean): Symbol[] {
let symbols: SymbolTable = {};
let memberFlags: NodeFlags = 0;
function copySymbol(symbol: Symbol, meaning: SymbolFlags) {
if (symbol.flags & meaning) {
let id = symbol.name;
if (!isReservedMemberName(id) && !hasProperty(symbols, id)) {
symbols[id] = symbol;
}
}
}
function copySymbols(source: SymbolTable, meaning: SymbolFlags) {
if (meaning) {
for (let id in source) {
if (hasProperty(source, id)) {
copySymbol(source[id], meaning);
}
}
}
}
if (isInsideWithStatementBody(location)) {
// We cannot answer semantic questions within a with block, do not proceed any further
return [];
}
while (location) {
if (location.locals && !isGlobalSourceFile(location)) {
copySymbols(location.locals, meaning);
}
switch (location.kind) {
case SyntaxKind.SourceFile:
if (!isExternalModule(<SourceFile>location)) break;
case SyntaxKind.ModuleDeclaration:
copySymbols(getSymbolOfNode(location).exports, meaning & SymbolFlags.ModuleMember);
break;
case SyntaxKind.EnumDeclaration:
copySymbols(getSymbolOfNode(location).exports, meaning & SymbolFlags.EnumMember);
break;
case SyntaxKind.ClassDeclaration:
case SyntaxKind.InterfaceDeclaration:
if (!(memberFlags & NodeFlags.Static)) {
copySymbols(getSymbolOfNode(location).members, meaning & SymbolFlags.Type);
}
break;
case SyntaxKind.FunctionExpression:
if ((<FunctionExpression>location).name) {
copySymbol(location.symbol, meaning);
}
break;
}
memberFlags = location.flags;
location = location.parent;
}
copySymbols(globals, meaning);
populateSymbols();
return mapToArray(symbols);
function populateSymbols() {
while (location) {
if (location.locals && !isGlobalSourceFile(location)) {
if (copySymbols(location.locals, meaning)) {
return;
}
}
switch (location.kind) {
case SyntaxKind.SourceFile:
if (!isExternalModule(<SourceFile>location)) {
break;
}
case SyntaxKind.ModuleDeclaration:
if (copySymbols(getSymbolOfNode(location).exports, meaning & SymbolFlags.ModuleMember)) {
return;
}
break;
case SyntaxKind.EnumDeclaration:
if (copySymbols(getSymbolOfNode(location).exports, meaning & SymbolFlags.EnumMember)) {
return;
}
break;
case SyntaxKind.ClassDeclaration:
case SyntaxKind.InterfaceDeclaration:
if (!(memberFlags & NodeFlags.Static)) {
if (copySymbols(getSymbolOfNode(location).members, meaning & SymbolFlags.Type)) {
return;
}
}
break;
case SyntaxKind.FunctionExpression:
if ((<FunctionExpression>location).name) {
if (copySymbol(location.symbol, meaning)) {
return;
}
}
break;
}
memberFlags = location.flags;
location = location.parent;
}
if (copySymbols(globals, meaning)) {
return;
}
}
// Returns 'true' if we should stop processing symbols.
function copySymbol(symbol: Symbol, meaning: SymbolFlags): boolean {
if (symbol.flags & meaning) {
let id = symbol.name;
if (!isReservedMemberName(id) && !hasProperty(symbols, id)) {
if (predicate) {
// If we were supplied a predicate function, then check if this symbol
// matches with it. If so, we're done and can immediately return.
// Otherwise, just ignore this symbol and keep going.
if (predicate(symbol)) {
symbols[id] = symbol;
return true;
}
}
else {
// If no predicate was supplied, then just add the symbol as is.
symbols[id] = symbol;
}
}
}
return false;
}
function copySymbols(source: SymbolTable, meaning: SymbolFlags): boolean {
if (meaning) {
for (let id in source) {
if (hasProperty(source, id)) {
if (copySymbol(source[id], meaning)) {
return true;
}
}
}
}
return false;
}
}
function isTypeDeclarationName(name: Node): boolean {

5
src/compiler/scanner.ts
View File

@ -256,6 +256,11 @@ module ts {
return tokenStrings[t];
}
/* @internal */
export function stringToToken(s: string): SyntaxKind {
return textToToken[s];
}
export function computeLineStarts(text: string): number[] {
let result: number[] = new Array();
let pos = 0;

5
src/compiler/types.ts
View File

@ -1092,7 +1092,10 @@ module ts {
getSignaturesOfType(type: Type, kind: SignatureKind): Signature[];
getIndexTypeOfType(type: Type, kind: IndexKind): Type;
getReturnTypeOfSignature(signature: Signature): Type;
getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
// If 'predicate' is supplied, then only the first symbol in scope matching the predicate
// will be returned. Otherwise, all symbols in scope will be returned.
getSymbolsInScope(location: Node, meaning: SymbolFlags, predicate?: (symbol: Symbol) => boolean): Symbol[];
getSymbolAtLocation(node: Node): Symbol;
getShorthandAssignmentValueSymbol(location: Node): Symbol;
getTypeAtLocation(node: Node): Type;

19
src/server/protocol.d.ts vendored
View File

@ -567,12 +567,29 @@ declare module ts.server.protocol {
* Optional modifiers for the kind (such as 'public').
*/
kindModifiers: string;
/**
* A string that is used for comparing completion items so that they can be ordered. This
* is often the same as the name but may be different in certain circumstances.
*/
sortText: string;
}
/**
* Additional completion entry details, available on demand
*/
export interface CompletionEntryDetails extends CompletionEntry {
export interface CompletionEntryDetails {
/**
* The symbol's name.
*/
name: string;
/**
* The symbol's kind (such as 'className' or 'parameterName').
*/
kind: string;
/**
* Optional modifiers for the kind (such as 'public').
*/
kindModifiers: string;
/**
* Display parts of the symbol (similar to quick info).
*/

321
src/services/services.ts
View File

@ -418,7 +418,10 @@ module ts {
function pushDocCommentLineText(docComments: SymbolDisplayPart[], text: string, blankLineCount: number) {
// Add the empty lines in between texts
while (blankLineCount--) docComments.push(textPart(""));
while (blankLineCount--) {
docComments.push(textPart(""));
}
docComments.push(textPart(text));
}
@ -1134,6 +1137,7 @@ module ts {
name: string;
kind: string; // see ScriptElementKind
kindModifiers: string; // see ScriptElementKindModifier, comma separated
sortText: string;
}
export interface CompletionEntryDetails {
@ -1302,6 +1306,7 @@ module ts {
// TODO: move these to enums
export class ScriptElementKind {
static unknown = "";
static warning = "warning";
// predefined type (void) or keyword (class)
static keyword = "keyword";
@ -1409,14 +1414,6 @@ module ts {
/// Language Service
interface CompletionSession {
fileName: string; // the file where the completion was requested
position: number; // position in the file where the completion was requested
entries: CompletionEntry[]; // entries for this completion
symbols: Map<Symbol>; // symbols by entry name map
typeChecker: TypeChecker; // the typeChecker used to generate this completion
}
interface FormattingOptions {
useTabs: boolean;
spacesPerTab: number;
@ -2105,7 +2102,8 @@ module ts {
keywordCompletions.push({
name: tokenToString(i),
kind: ScriptElementKind.keyword,
kindModifiers: ScriptElementKindModifier.none
kindModifiers: ScriptElementKindModifier.none,
sortText: "0"
});
}
@ -2180,7 +2178,6 @@ module ts {
let typeInfoResolver: TypeChecker;
let useCaseSensitivefileNames = false;
let cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken());
let activeCompletionSession: CompletionSession; // The current active completion session, used to get the completion entry details
// Check if the localized messages json is set, otherwise query the host for it
if (!localizedDiagnosticMessages && host.getLocalizedDiagnosticMessages) {
@ -2621,20 +2618,42 @@ module ts {
return undefined;
}
// TODO(drosen): Right now we just permit *all* semantic meanings when calling 'getSymbolKind'
// which is permissible given that it is backwards compatible; but really we should consider
// passing the meaning for the node so that we don't report that a suggestion for a value is an interface.
// We COULD also just do what 'getSymbolModifiers' does, which is to use the first declaration.
// TODO(drosen): Right now we just permit *all* semantic meanings when calling
// 'getSymbolKind' which is permissible given that it is backwards compatible; but
// really we should consider passing the meaning for the node so that we don't report
// that a suggestion for a value is an interface. We COULD also just do what
// 'getSymbolModifiers' does, which is to use the first declaration.
// Use a 'sortText' of 0' so that all symbol completion entries come before any other
// entries (like JavaScript identifier entries).
return {
name: displayName,
kind: getSymbolKind(symbol, typeChecker, location),
kindModifiers: getSymbolModifiers(symbol)
kindModifiers: getSymbolModifiers(symbol),
sortText: "0",
};
}
function getCompletionsAtPosition(fileName: string, position: number): CompletionInfo {
synchronizeHostData();
// If symbolName is undefined, all symbols at the specified are returned. If symbolName
// is not undefined, then the first symbol with that name at the specified position
// will be returned. Calling without symbolName is useful when you want the entire
// list of symbols (like for getCompletionsAtPosition). Calling with a symbolName is
// useful when you want information about a single symbol (like for getCompletionEntryDetails).
function getCompletionData(fileName: string, position: number, symbolName?: string) {
let result = getCompletionDataWorker(fileName, position, symbolName);
if (!result) {
return undefined;
}
if (result.symbols && symbolName) {
var target = program.getCompilerOptions().target;
result.symbols = filter(result.symbols, s => getValidCompletionEntryDisplayNameForSymbol(s, target) === symbolName);
}
return result;
}
function getCompletionDataWorker(fileName: string, position: number, symbolName: string) {
let syntacticStart = new Date().getTime();
let sourceFile = getValidSourceFile(fileName);
@ -2686,83 +2705,33 @@ module ts {
isRightOfDot = true;
}
// Clear the current activeCompletionSession for this session
activeCompletionSession = {
fileName: fileName,
position: position,
entries: [],
symbols: {},
typeChecker: typeInfoResolver
};
log("getCompletionsAtPosition: Syntactic work: " + (new Date().getTime() - syntacticStart));
let location = getTouchingPropertyName(sourceFile, position);
// Populate the completion list
var target = program.getCompilerOptions().target;
let semanticStart = new Date().getTime();
let isMemberCompletion: boolean;
let isNewIdentifierLocation: boolean;
let symbols: Symbol[] = [];
if (isRightOfDot) {
if (isJavaScript(fileName)) {
// If this is JavaScript, then just present a simple identifier list.
if (!tryGetJavaScriptMemberCompletionEntries()) {
return undefined;
}
}
else {
if (!tryGetTypeScriptMemberCompletionEntries()) {
return undefined;
}
}
getTypeScriptMemberSymbols();
}
else {
// For JavaScript or TypeScript, if we're not after a dot, then just try to get the
// global symbols in scope. These results should be valid for either language as
// the set of symbols that can be referenced from this location.
if (!tryGetGlobalCompletionEntries()) {
if (!tryGetGlobalSymbols()) {
return undefined;
}
}
// Add keywords if this is not a member completion list
if (!isMemberCompletion) {
addRange(activeCompletionSession.entries, keywordCompletions);
}
log("getCompletionsAtPosition: Semantic work: " + (new Date().getTime() - semanticStart));
return {
isMemberCompletion,
isNewIdentifierLocation,
entries: activeCompletionSession.entries
};
return { symbols, isMemberCompletion, isNewIdentifierLocation, location, isRightOfDot };
function tryGetJavaScriptMemberCompletionEntries(): boolean {
let allIdentifiers: Map<string> = {};
for (let sourceFile of program.getSourceFiles()) {
let nameTable = getNameTable(sourceFile);
for (let name in nameTable) {
allIdentifiers[name] = name;
}
}
var target = program.getCompilerOptions().target;
for (let name in allIdentifiers) {
let displayName = getValidCompletionEntryDisplayName(name, target);
if (displayName) {
activeCompletionSession.entries.push({
name: displayName,
kind: ScriptElementKind.unknown,
kindModifiers: ""
});
}
}
return true;
}
function tryGetTypeScriptMemberCompletionEntries(): boolean {
function getTypeScriptMemberSymbols(): void {
// Right of dot member completion list
let symbols: Symbol[] = [];
isMemberCompletion = true;
isNewIdentifierLocation = false;
@ -2793,12 +2762,9 @@ module ts {
}
});
}
getCompletionEntriesFromSymbols(symbols);
return true;
}
function tryGetGlobalCompletionEntries(): boolean {
function tryGetGlobalSymbols(): boolean {
let containingObjectLiteral = getContainingObjectLiteralApplicableForCompletion(previousToken);
if (containingObjectLiteral) {
// Object literal expression, look up possible property names from contextual type
@ -2813,8 +2779,7 @@ module ts {
let contextualTypeMembers = typeInfoResolver.getPropertiesOfType(contextualType);
if (contextualTypeMembers && contextualTypeMembers.length > 0) {
// Add filtered items to the completion list
let filteredMembers = filterContextualMembersList(contextualTypeMembers, containingObjectLiteral.properties);
getCompletionEntriesFromSymbols(filteredMembers);
symbols = filterContextualMembersList(contextualTypeMembers, containingObjectLiteral.properties);
}
}
else if (getAncestor(previousToken, SyntaxKind.ImportClause)) {
@ -2826,8 +2791,7 @@ module ts {
let importDeclaration = <ImportDeclaration>getAncestor(previousToken, SyntaxKind.ImportDeclaration);
Debug.assert(importDeclaration !== undefined);
let exports = typeInfoResolver.getExportsOfExternalModule(importDeclaration);
let filteredExports = filterModuleExports(exports, importDeclaration);
getCompletionEntriesFromSymbols(filteredExports);
symbols = filterModuleExports(exports, importDeclaration);
}
}
else {
@ -2838,21 +2802,17 @@ module ts {
/// TODO filter meaning based on the current context
let scopeNode = getScopeNode(previousToken, position, sourceFile);
let symbolMeanings = SymbolFlags.Type | SymbolFlags.Value | SymbolFlags.Namespace | SymbolFlags.Alias;
let symbols = typeInfoResolver.getSymbolsInScope(scopeNode, symbolMeanings);
getCompletionEntriesFromSymbols(symbols);
// Filter down to the symbol that matches the symbolName if we were given one.
let predicate = symbolName !== undefined
? (s: Symbol) => getValidCompletionEntryDisplayNameForSymbol(s, target) === symbolName
: undefined;
symbols = typeInfoResolver.getSymbolsInScope(scopeNode, symbolMeanings, predicate);
}
return true;
}
return {
isMemberCompletion,
isNewIdentifierLocation,
isBuilder: isNewIdentifierDefinitionLocation, // temporary property used to match VS implementation
entries: activeCompletionSession.entries
};
/**
* Finds the first node that "embraces" the position, so that one may
* accurately aggregate locals from the closest containing scope.
@ -2865,22 +2825,6 @@ module ts {
return scope;
}
function getCompletionEntriesFromSymbols(symbols: Symbol[]): void {
let session = activeCompletionSession;
let start = new Date().getTime();
forEach(symbols, symbol => {
let entry = createCompletionEntry(symbol, session.typeChecker, location);
if (entry) {
let id = escapeIdentifier(entry.name);
if (!lookUp(session.symbols, id)) {
session.entries.push(entry);
session.symbols[id] = symbol;
}
}
});
log("getCompletionsAtPosition: getCompletionEntriesFromSymbols: " + (new Date().getTime() - start));
}
function isCompletionListBlocker(previousToken: Node): boolean {
let start = new Date().getTime();
let result = isInStringOrRegularExpressionOrTemplateLiteral(previousToken) ||
@ -2934,7 +2878,7 @@ module ts {
case SyntaxKind.EqualsToken:
return containingNodeKind === SyntaxKind.VariableDeclaration // let x = a|
|| containingNodeKind === SyntaxKind.BinaryExpression; // x = a|
|| containingNodeKind === SyntaxKind.BinaryExpression; // x = a|
case SyntaxKind.TemplateHead:
return containingNodeKind === SyntaxKind.TemplateExpression; // `aa ${|
@ -3051,7 +2995,7 @@ module ts {
case SyntaxKind.SemicolonToken:
return containingNodeKind === SyntaxKind.PropertySignature &&
(previousToken.parent.parent.kind === SyntaxKind.InterfaceDeclaration || // interface a { f; |
previousToken.parent.parent.kind === SyntaxKind.TypeLiteral); // let x : { a; |
previousToken.parent.parent.kind === SyntaxKind.TypeLiteral); // let x : { a; |
case SyntaxKind.LessThanToken:
return containingNodeKind === SyntaxKind.ClassDeclaration || // class A< |
@ -3167,38 +3111,110 @@ module ts {
}
}
function getCompletionEntryDetails(fileName: string, position: number, entryName: string): CompletionEntryDetails {
// Note: No need to call synchronizeHostData, as we have captured all the data we need
// in the getCompletionsAtPosition earlier
let sourceFile = getValidSourceFile(fileName);
let session = activeCompletionSession;
// Ensure that the current active completion session is still valid for this request
if (!session || session.fileName !== fileName || session.position !== position) {
function getCompletionsAtPosition(fileName: string, position: number): CompletionInfo {
synchronizeHostData();
let completionData = getCompletionData(fileName, position);
if (!completionData) {
return undefined;
}
let symbol = lookUp(activeCompletionSession.symbols, escapeIdentifier(entryName));
if (symbol) {
let location = getTouchingPropertyName(sourceFile, position);
let completionEntry = createCompletionEntry(symbol, session.typeChecker, location);
// TODO(drosen): Right now we just permit *all* semantic meanings when calling 'getSymbolKind'
// which is permissible given that it is backwards compatible; but really we should consider
// passing the meaning for the node so that we don't report that a suggestion for a value is an interface.
// We COULD also just do what 'getSymbolModifiers' does, which is to use the first declaration.
Debug.assert(session.typeChecker.getTypeOfSymbolAtLocation(symbol, location) !== undefined, "Could not find type for symbol");
let displayPartsDocumentationsAndSymbolKind = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, getValidSourceFile(fileName), location, session.typeChecker, location, SemanticMeaning.All);
return {
name: entryName,
kind: displayPartsDocumentationsAndSymbolKind.symbolKind,
kindModifiers: completionEntry.kindModifiers,
displayParts: displayPartsDocumentationsAndSymbolKind.displayParts,
documentation: displayPartsDocumentationsAndSymbolKind.documentation
};
let { symbols, isMemberCompletion, isNewIdentifierLocation, location, isRightOfDot } = completionData;
let entries: CompletionEntry[];
if (isRightOfDot && isJavaScript(fileName)) {
entries = getCompletionEntriesFromSymbols(symbols);
addRange(entries, getJavaScriptCompletionEntries());
}
else {
// No symbol, it is a keyword
if (!symbols || symbols.length === 0) {
return undefined;
}
entries = getCompletionEntriesFromSymbols(symbols);
}
// Add keywords if this is not a member completion list
if (!isMemberCompletion) {
addRange(entries, keywordCompletions);
}
return { isMemberCompletion, isNewIdentifierLocation, entries };
function getJavaScriptCompletionEntries(): CompletionEntry[] {
let entries: CompletionEntry[] = [];
let allIdentifiers: Map<string> = {};
for (let sourceFile of program.getSourceFiles()) {
let nameTable = getNameTable(sourceFile);
for (let name in nameTable) {
allIdentifiers[name] = name;
}
}
var target = program.getCompilerOptions().target;
for (let name in allIdentifiers) {
let displayName = getValidCompletionEntryDisplayName(name, target);
if (displayName) {
// Use '1' so that all javascript identifier entries sort after Symbol entries.
entries.push({
name: displayName,
kind: ScriptElementKind.warning,
kindModifiers: "",
sortText: "1"
});
}
}
return entries;
}
function getCompletionEntriesFromSymbols(symbols: Symbol[]): CompletionEntry[] {
let start = new Date().getTime();
var entries: CompletionEntry[] = [];
if (symbols) {
var nameToSymbol: Map<Symbol> = {};
for (let symbol of symbols) {
let entry = createCompletionEntry(symbol, typeInfoResolver, location);
if (entry) {
let id = escapeIdentifier(entry.name);
if (!lookUp(nameToSymbol, id)) {
entries.push(entry);
nameToSymbol[id] = symbol;
}
}
}
}
log("getCompletionsAtPosition: getCompletionEntriesFromSymbols: " + (new Date().getTime() - start));
return entries;
}
}
function getCompletionEntryDetails(fileName: string, position: number, entryName: string): CompletionEntryDetails {
synchronizeHostData();
// Look up a completion symbol with this name.
let completionData = getCompletionData(fileName, position, entryName);
if (completionData) {
let { symbols, location } = completionData;
if (symbols && symbols.length > 0) {
let symbol = symbols[0];
let displayPartsDocumentationsAndSymbolKind = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, getValidSourceFile(fileName), location, typeInfoResolver, location, SemanticMeaning.All);
return {
name: entryName,
kind: displayPartsDocumentationsAndSymbolKind.symbolKind,
kindModifiers: getSymbolModifiers(symbol),
displayParts: displayPartsDocumentationsAndSymbolKind.displayParts,
documentation: displayPartsDocumentationsAndSymbolKind.documentation
};
}
}
// Didn't find a symbol with this name. See if we can find a keyword instead.
let keywordCompletion = forEach(keywordCompletions, c => c.name === entryName);
if (keywordCompletion) {
return {
name: entryName,
kind: ScriptElementKind.keyword,
@ -3207,6 +3223,8 @@ module ts {
documentation: undefined
};
}
return undefined;
}
// TODO(drosen): use contextual SemanticMeaning.
@ -3305,12 +3323,14 @@ module ts {
typeResolver: TypeChecker, location: Node,
// TODO(drosen): Currently completion entry details passes the SemanticMeaning.All instead of using semanticMeaning of location
semanticMeaning = getMeaningFromLocation(location)) {
let displayParts: SymbolDisplayPart[] = [];
let documentation: SymbolDisplayPart[];
let symbolFlags = symbol.flags;
let symbolKind = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, symbolFlags, typeResolver, location);
let hasAddedSymbolInfo: boolean;
let type: Type;
// Class at constructor site need to be shown as constructor apart from property,method, vars
if (symbolKind !== ScriptElementKind.unknown || symbolFlags & SymbolFlags.Class || symbolFlags & SymbolFlags.Alias) {
// If it is accessor they are allowed only if location is at name of the accessor
@ -3362,9 +3382,7 @@ module ts {
}
else if (symbolFlags & SymbolFlags.Alias) {
symbolKind = ScriptElementKind.alias;
displayParts.push(punctuationPart(SyntaxKind.OpenParenToken));
displayParts.push(textPart(symbolKind));
displayParts.push(punctuationPart(SyntaxKind.CloseParenToken));
pushTypePart(symbolKind);
displayParts.push(spacePart());
if (useConstructSignatures) {
displayParts.push(keywordPart(SyntaxKind.NewKeyword));
@ -3600,14 +3618,29 @@ module ts {
function addPrefixForAnyFunctionOrVar(symbol: Symbol, symbolKind: string) {
addNewLineIfDisplayPartsExist();
if (symbolKind) {
displayParts.push(punctuationPart(SyntaxKind.OpenParenToken));
displayParts.push(textPart(symbolKind));
displayParts.push(punctuationPart(SyntaxKind.CloseParenToken));
pushTypePart(symbolKind);
displayParts.push(spacePart());
addFullSymbolName(symbol);
}
}
function pushTypePart(symbolKind: string) {
switch (symbolKind) {
case ScriptElementKind.variableElement:
case ScriptElementKind.functionElement:
case ScriptElementKind.letElement:
case ScriptElementKind.constElement:
case ScriptElementKind.constructorImplementationElement:
displayParts.push(textOrKeywordPart(symbolKind));
return;
default:
displayParts.push(punctuationPart(SyntaxKind.OpenParenToken));
displayParts.push(textOrKeywordPart(symbolKind));
displayParts.push(punctuationPart(SyntaxKind.CloseParenToken));
return;
}
}
function addSignatureDisplayParts(signature: Signature, allSignatures: Signature[], flags?: TypeFormatFlags) {
displayParts.push.apply(displayParts, signatureToDisplayParts(typeResolver, signature, enclosingDeclaration, flags | TypeFormatFlags.WriteTypeArgumentsOfSignature));
if (allSignatures.length > 1) {

7
src/services/utilities.ts
View File

@ -611,6 +611,13 @@ module ts {
return displayPart(tokenToString(kind), SymbolDisplayPartKind.operator);
}
export function textOrKeywordPart(text: string) {
var kind = stringToToken(text);
return kind === undefined
? textPart(text)
: keywordPart(kind);
}
export function textPart(text: string) {
return displayPart(text, SymbolDisplayPartKind.text);
}

4
tests/baselines/reference/APISample_compile.js
View File

@ -860,7 +860,7 @@ declare module "typescript" {
getSignaturesOfType(type: Type, kind: SignatureKind): Signature[];
getIndexTypeOfType(type: Type, kind: IndexKind): Type;
getReturnTypeOfSignature(signature: Signature): Type;
getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
getSymbolsInScope(location: Node, meaning: SymbolFlags, predicate?: (symbol: Symbol) => boolean): Symbol[];
getSymbolAtLocation(node: Node): Symbol;
getShorthandAssignmentValueSymbol(location: Node): Symbol;
getTypeAtLocation(node: Node): Type;
@ -1759,6 +1759,7 @@ declare module "typescript" {
name: string;
kind: string;
kindModifiers: string;
sortText: string;
}
interface CompletionEntryDetails {
name: string;
@ -1901,6 +1902,7 @@ declare module "typescript" {
}
class ScriptElementKind {
static unknown: string;
static warning: string;
static keyword: string;
static scriptElement: string;
static moduleElement: string;

13
tests/baselines/reference/APISample_compile.types
View File

@ -2632,12 +2632,15 @@ declare module "typescript" {
>Signature : Signature
>Type : Type
getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
>getSymbolsInScope : (location: Node, meaning: SymbolFlags) => Symbol[]
getSymbolsInScope(location: Node, meaning: SymbolFlags, predicate?: (symbol: Symbol) => boolean): Symbol[];
>getSymbolsInScope : (location: Node, meaning: SymbolFlags, predicate?: (symbol: Symbol) => boolean) => Symbol[]
>location : Node
>Node : Node
>meaning : SymbolFlags
>SymbolFlags : SymbolFlags
>predicate : (symbol: Symbol) => boolean
>symbol : Symbol
>Symbol : Symbol
>Symbol : Symbol
getSymbolAtLocation(node: Node): Symbol;
@ -5646,6 +5649,9 @@ declare module "typescript" {
kindModifiers: string;
>kindModifiers : string
sortText: string;
>sortText : string
}
interface CompletionEntryDetails {
>CompletionEntryDetails : CompletionEntryDetails
@ -5915,6 +5921,9 @@ declare module "typescript" {
static unknown: string;
>unknown : string
static warning: string;
>warning : string
static keyword: string;
>keyword : string

4
tests/baselines/reference/APISample_linter.js
View File

@ -891,7 +891,7 @@ declare module "typescript" {
getSignaturesOfType(type: Type, kind: SignatureKind): Signature[];
getIndexTypeOfType(type: Type, kind: IndexKind): Type;
getReturnTypeOfSignature(signature: Signature): Type;
getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
getSymbolsInScope(location: Node, meaning: SymbolFlags, predicate?: (symbol: Symbol) => boolean): Symbol[];
getSymbolAtLocation(node: Node): Symbol;
getShorthandAssignmentValueSymbol(location: Node): Symbol;
getTypeAtLocation(node: Node): Type;
@ -1790,6 +1790,7 @@ declare module "typescript" {
name: string;
kind: string;
kindModifiers: string;
sortText: string;
}
interface CompletionEntryDetails {
name: string;
@ -1932,6 +1933,7 @@ declare module "typescript" {
}
class ScriptElementKind {
static unknown: string;
static warning: string;
static keyword: string;
static scriptElement: string;
static moduleElement: string;

13
tests/baselines/reference/APISample_linter.types
View File

@ -2778,12 +2778,15 @@ declare module "typescript" {
>Signature : Signature
>Type : Type
getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
>getSymbolsInScope : (location: Node, meaning: SymbolFlags) => Symbol[]
getSymbolsInScope(location: Node, meaning: SymbolFlags, predicate?: (symbol: Symbol) => boolean): Symbol[];
>getSymbolsInScope : (location: Node, meaning: SymbolFlags, predicate?: (symbol: Symbol) => boolean) => Symbol[]
>location : Node
>Node : Node
>meaning : SymbolFlags
>SymbolFlags : SymbolFlags
>predicate : (symbol: Symbol) => boolean
>symbol : Symbol
>Symbol : Symbol
>Symbol : Symbol
getSymbolAtLocation(node: Node): Symbol;
@ -5792,6 +5795,9 @@ declare module "typescript" {
kindModifiers: string;
>kindModifiers : string
sortText: string;
>sortText : string
}
interface CompletionEntryDetails {
>CompletionEntryDetails : CompletionEntryDetails
@ -6061,6 +6067,9 @@ declare module "typescript" {
static unknown: string;
>unknown : string
static warning: string;
>warning : string
static keyword: string;
>keyword : string

4
tests/baselines/reference/APISample_transform.js
View File

@ -892,7 +892,7 @@ declare module "typescript" {
getSignaturesOfType(type: Type, kind: SignatureKind): Signature[];
getIndexTypeOfType(type: Type, kind: IndexKind): Type;
getReturnTypeOfSignature(signature: Signature): Type;
getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
getSymbolsInScope(location: Node, meaning: SymbolFlags, predicate?: (symbol: Symbol) => boolean): Symbol[];
getSymbolAtLocation(node: Node): Symbol;
getShorthandAssignmentValueSymbol(location: Node): Symbol;
getTypeAtLocation(node: Node): Type;
@ -1791,6 +1791,7 @@ declare module "typescript" {
name: string;
kind: string;
kindModifiers: string;
sortText: string;
}
interface CompletionEntryDetails {
name: string;
@ -1933,6 +1934,7 @@ declare module "typescript" {
}
class ScriptElementKind {
static unknown: string;
static warning: string;
static keyword: string;
static scriptElement: string;
static moduleElement: string;

13
tests/baselines/reference/APISample_transform.types
View File

@ -2728,12 +2728,15 @@ declare module "typescript" {
>Signature : Signature
>Type : Type
getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
>getSymbolsInScope : (location: Node, meaning: SymbolFlags) => Symbol[]
getSymbolsInScope(location: Node, meaning: SymbolFlags, predicate?: (symbol: Symbol) => boolean): Symbol[];
>getSymbolsInScope : (location: Node, meaning: SymbolFlags, predicate?: (symbol: Symbol) => boolean) => Symbol[]
>location : Node
>Node : Node
>meaning : SymbolFlags
>SymbolFlags : SymbolFlags
>predicate : (symbol: Symbol) => boolean
>symbol : Symbol
>Symbol : Symbol
>Symbol : Symbol
getSymbolAtLocation(node: Node): Symbol;
@ -5742,6 +5745,9 @@ declare module "typescript" {
kindModifiers: string;
>kindModifiers : string
sortText: string;
>sortText : string
}
interface CompletionEntryDetails {
>CompletionEntryDetails : CompletionEntryDetails
@ -6011,6 +6017,9 @@ declare module "typescript" {
static unknown: string;
>unknown : string
static warning: string;
>warning : string
static keyword: string;
>keyword : string

4
tests/baselines/reference/APISample_watcher.js
View File

@ -929,7 +929,7 @@ declare module "typescript" {
getSignaturesOfType(type: Type, kind: SignatureKind): Signature[];
getIndexTypeOfType(type: Type, kind: IndexKind): Type;
getReturnTypeOfSignature(signature: Signature): Type;
getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
getSymbolsInScope(location: Node, meaning: SymbolFlags, predicate?: (symbol: Symbol) => boolean): Symbol[];
getSymbolAtLocation(node: Node): Symbol;
getShorthandAssignmentValueSymbol(location: Node): Symbol;
getTypeAtLocation(node: Node): Type;
@ -1828,6 +1828,7 @@ declare module "typescript" {
name: string;
kind: string;
kindModifiers: string;
sortText: string;
}
interface CompletionEntryDetails {
name: string;
@ -1970,6 +1971,7 @@ declare module "typescript" {
}
class ScriptElementKind {
static unknown: string;
static warning: string;
static keyword: string;
static scriptElement: string;
static moduleElement: string;

13
tests/baselines/reference/APISample_watcher.types
View File

@ -2901,12 +2901,15 @@ declare module "typescript" {
>Signature : Signature
>Type : Type
getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
>getSymbolsInScope : (location: Node, meaning: SymbolFlags) => Symbol[]
getSymbolsInScope(location: Node, meaning: SymbolFlags, predicate?: (symbol: Symbol) => boolean): Symbol[];
>getSymbolsInScope : (location: Node, meaning: SymbolFlags, predicate?: (symbol: Symbol) => boolean) => Symbol[]
>location : Node
>Node : Node
>meaning : SymbolFlags
>SymbolFlags : SymbolFlags
>predicate : (symbol: Symbol) => boolean
>symbol : Symbol
>Symbol : Symbol
>Symbol : Symbol
getSymbolAtLocation(node: Node): Symbol;
@ -5915,6 +5918,9 @@ declare module "typescript" {
kindModifiers: string;
>kindModifiers : string
sortText: string;
>sortText : string
}
interface CompletionEntryDetails {
>CompletionEntryDetails : CompletionEntryDetails
@ -6184,6 +6190,9 @@ declare module "typescript" {
static unknown: string;
>unknown : string
static warning: string;
>warning : string
static keyword: string;
>keyword : string

20
tests/cases/fourslash/arrayCallAndConstructTypings.ts
View File

@ -13,31 +13,31 @@
goTo.marker('1');
verify.quickInfoIs('(var) a1: any[]');
verify.quickInfoIs('var a1: any[]');
goTo.marker('2');
verify.quickInfoIs('(var) a2: any[]');
verify.quickInfoIs('var a2: any[]');
goTo.marker('3');
verify.quickInfoIs('(var) a3: boolean[]');
verify.quickInfoIs('var a3: boolean[]');
goTo.marker('4');
verify.quickInfoIs('(var) a4: boolean[]');
verify.quickInfoIs('var a4: boolean[]');
goTo.marker('5');
verify.quickInfoIs('(var) a5: string[]');
verify.quickInfoIs('var a5: string[]');
goTo.marker('6');
verify.quickInfoIs('(var) a6: any[]');
verify.quickInfoIs('var a6: any[]');
goTo.marker('7');
verify.quickInfoIs('(var) a7: any[]');
verify.quickInfoIs('var a7: any[]');
goTo.marker('8');
verify.quickInfoIs('(var) a8: boolean[]');
verify.quickInfoIs('var a8: boolean[]');
goTo.marker('9');
verify.quickInfoIs('(var) a9: boolean[]');
verify.quickInfoIs('var a9: boolean[]');
goTo.marker('10');
verify.quickInfoIs('(var) a10: string[]');
verify.quickInfoIs('var a10: string[]');

2
tests/cases/fourslash/augmentedTypesClass2.ts
View File

@ -7,7 +7,7 @@
////r./*2*/
goTo.marker('1');
verify.not.completionListContains('y', '(var) y: number');
verify.not.completionListContains('y', 'var y: number');
edit.backspace(4);
goTo.marker('2');
verify.completionListContains('foo', '(method) c5b.foo(): void');

2
tests/cases/fourslash/augmentedTypesModule1.ts
View File

@ -12,4 +12,4 @@ verify.completionListContains('I');
verify.not.completionListContains('foo');
goTo.marker('2');
verify.quickInfoIs('(var) r: number');
verify.quickInfoIs('var r: number');

4
tests/cases/fourslash/augmentedTypesModule2.ts
View File

@ -6,7 +6,7 @@
////var /*2*/r = m2f/*3*/;
goTo.marker('11');
verify.quickInfoIs('(function) m2f(x: number): void\nmodule m2f');
verify.quickInfoIs('function m2f(x: number): void\nmodule m2f');
goTo.marker('1');
verify.completionListContains('I');
@ -16,7 +16,7 @@ verify.not.completionListContains('foo');
edit.backspace(1);
goTo.marker('2');
verify.quickInfoIs('(var) r: (x: number) => void');
verify.quickInfoIs('var r: (x: number) => void');
goTo.marker('3');
edit.insert('(');

2
tests/cases/fourslash/augmentedTypesModule3.ts
View File

@ -13,7 +13,7 @@ verify.not.completionListContains('foo');
edit.backspace(1);
goTo.marker('2');
verify.quickInfoIs("(var) r: typeof m2g");
verify.quickInfoIs("var r: typeof m2g");
goTo.marker('3');
edit.insert('(');

4
tests/cases/fourslash/augmentedTypesModule4.ts
View File

@ -7,7 +7,7 @@
////var /*4*/r2 = m3d./*3*/
goTo.marker('1');
verify.quickInfoIs('(var) r: m3d');
verify.quickInfoIs('var r: m3d');
goTo.marker('2');
verify.completionListContains('foo');
@ -18,4 +18,4 @@ verify.completionListContains('y');
edit.insert('y;');
goTo.marker('4');
verify.quickInfoIs('(var) r2: number');
verify.quickInfoIs('var r2: number');

4
tests/cases/fourslash/augmentedTypesModule5.ts
View File

@ -7,7 +7,7 @@
////var /*4*/r2 = m3e./*3*/
goTo.marker('1');
verify.quickInfoIs('(var) r: m3e');
verify.quickInfoIs('var r: m3e');
goTo.marker('2');
verify.completionListContains('foo');
@ -19,4 +19,4 @@ verify.completionListContains('y');
edit.insert('y;');
goTo.marker('4');
verify.quickInfoIs('(var) r2: number');
verify.quickInfoIs('var r2: number');

2
tests/cases/fourslash/augmentedTypesModule6.ts
View File

@ -20,7 +20,7 @@ goTo.marker('3');
verify.currentSignatureHelpIs('m3f(): m3f');
goTo.marker('4');
verify.quickInfoIs('(var) r: m3f');
verify.quickInfoIs('var r: m3f');
goTo.marker('5');
verify.completionListContains('foo');

24
tests/cases/fourslash/automaticConstructorToggling.ts
View File

@ -17,41 +17,41 @@ var D = 'D'
goTo.marker(B);
edit.insert('constructor(val: T) { }');
goTo.marker('Asig');
verify.quickInfoIs("(constructor) A<string>(): A<string>");
verify.quickInfoIs("constructor A<string>(): A<string>");
goTo.marker('Bsig');
verify.quickInfoIs("(constructor) B<string>(val: string): B<string>");
verify.quickInfoIs("constructor B<string>(val: string): B<string>");
goTo.marker('Csig');
verify.quickInfoIs("(constructor) C<string>(val: string): C<string>");
verify.quickInfoIs("constructor C<string>(val: string): C<string>");
goTo.marker('Dsig');
verify.quickInfoIs("(constructor) D<T>(val: T): D<T>"); // Cannot resolve signature
verify.quickInfoIs("constructor D<T>(val: T): D<T>"); // Cannot resolve signature
goTo.marker(C);
edit.deleteAtCaret('constructor(val: T) { }'.length);
goTo.marker('Asig');
verify.quickInfoIs("(constructor) A<string>(): A<string>");
verify.quickInfoIs("constructor A<string>(): A<string>");
goTo.marker('Bsig');
verify.quickInfoIs("(constructor) B<string>(val: string): B<string>");
verify.quickInfoIs("constructor B<string>(val: string): B<string>");
goTo.marker('Csig');
verify.quickInfoIs("(constructor) C<T>(): C<T>"); // Cannot resolve signature
verify.quickInfoIs("constructor C<T>(): C<T>"); // Cannot resolve signature
goTo.marker('Dsig');
verify.quickInfoIs("(constructor) D<T>(val: T): D<T>"); // Cannot resolve signature
verify.quickInfoIs("constructor D<T>(val: T): D<T>"); // Cannot resolve signature
goTo.marker(D);
edit.deleteAtCaret("val: T".length);
goTo.marker('Asig');
verify.quickInfoIs("(constructor) A<string>(): A<string>");
verify.quickInfoIs("constructor A<string>(): A<string>");
goTo.marker('Bsig');
verify.quickInfoIs("(constructor) B<string>(val: string): B<string>");
verify.quickInfoIs("constructor B<string>(val: string): B<string>");
goTo.marker('Csig');
verify.quickInfoIs("(constructor) C<T>(): C<T>"); // Cannot resolve signature
verify.quickInfoIs("constructor C<T>(): C<T>"); // Cannot resolve signature
goTo.marker('Dsig');
verify.quickInfoIs("(constructor) D<string>(): D<string>");
verify.quickInfoIs("constructor D<string>(): D<string>");

10
tests/cases/fourslash/bestCommonTypeObjectLiterals1.ts
View File

@ -22,13 +22,13 @@
////var /*5*/c3 = [a2, b2, i];
goTo.marker('1');
verify.quickInfoIs('(var) c: {\n name: string;\n age: number;\n}[]');
verify.quickInfoIs('var c: {\n name: string;\n age: number;\n}[]');
goTo.marker('2');
verify.quickInfoIs('(var) c1: {\n name: string;\n age: number;\n}[]');
verify.quickInfoIs('var c1: {\n name: string;\n age: number;\n}[]');
goTo.marker('3');
verify.quickInfoIs('(var) c2: ({\n\
verify.quickInfoIs('var c2: ({\n\
name: string;\n\
age: number;\n\
address: string;\n\
@ -39,8 +39,8 @@ verify.quickInfoIs('(var) c2: ({\n\
})[]');
goTo.marker('4');
verify.quickInfoIs('(var) c2a: {\n name: string;\n age: number;\n}[]');
verify.quickInfoIs('var c2a: {\n name: string;\n age: number;\n}[]');
goTo.marker('5');
verify.quickInfoIs('(var) c3: I[]');
verify.quickInfoIs('var c3: I[]');

2
tests/cases/fourslash/cloduleWithRecursiveReference.ts
View File

@ -13,5 +13,5 @@
edit.insert('');
goTo.marker();
verify.quickInfoIs('(var) M.C.C: typeof M.C');
verify.quickInfoIs('var M.C.C: typeof M.C');
verify.numberOfErrorsInCurrentFile(0);

52
tests/cases/fourslash/commentsClass.ts
View File

@ -65,13 +65,13 @@ goTo.marker('1');
verify.quickInfoIs("class c2", "This is class c2 without constuctor");
goTo.marker('2');
verify.quickInfoIs("(var) i2: c2", "");
verify.quickInfoIs("var i2: c2", "");
goTo.marker('3');
verify.currentSignatureHelpDocCommentIs("");
goTo.marker('4');
verify.quickInfoIs("(var) i2_c: typeof c2", "");
verify.quickInfoIs("var i2_c: typeof c2", "");
goTo.marker('5');
verify.quickInfoIs("class c2", "This is class c2 without constuctor");
@ -80,13 +80,13 @@ goTo.marker('6');
verify.quickInfoIs("class c3", "");
goTo.marker('7');
verify.quickInfoIs("(var) i3: c3", "");
verify.quickInfoIs("var i3: c3", "");
goTo.marker('8');
verify.currentSignatureHelpDocCommentIs("Constructor comment");
goTo.marker('9');
verify.quickInfoIs("(var) i3_c: typeof c3", "");
verify.quickInfoIs("var i3_c: typeof c3", "");
goTo.marker('10');
verify.quickInfoIs("class c3", "");
@ -95,13 +95,13 @@ goTo.marker('11');
verify.quickInfoIs("class c4", "Class comment");
goTo.marker('12');
verify.quickInfoIs("(var) i4: c4", "");
verify.quickInfoIs("var i4: c4", "");
goTo.marker('13');
verify.currentSignatureHelpDocCommentIs("Constructor comment");
goTo.marker('14');
verify.quickInfoIs("(var) i4_c: typeof c4", "");
verify.quickInfoIs("var i4_c: typeof c4", "");
goTo.marker('15');
verify.quickInfoIs("class c4", "Class comment");
@ -110,13 +110,13 @@ goTo.marker('16');
verify.quickInfoIs("class c5", "Class with statics");
goTo.marker('17');
verify.quickInfoIs("(var) i5: c5", "");
verify.quickInfoIs("var i5: c5", "");
goTo.marker('18');
verify.currentSignatureHelpDocCommentIs("");
goTo.marker('19');
verify.quickInfoIs("(var) i5_c: typeof c5", "");
verify.quickInfoIs("var i5_c: typeof c5", "");
goTo.marker('20');
verify.quickInfoIs("class c5", "Class with statics");
@ -125,52 +125,52 @@ goTo.marker('21');
verify.quickInfoIs("class c6", "class with statics and constructor");
goTo.marker('22');
verify.quickInfoIs("(var) i6: c6", "");
verify.quickInfoIs("var i6: c6", "");
goTo.marker('23');
verify.currentSignatureHelpDocCommentIs("constructor comment");
goTo.marker('24');
verify.quickInfoIs("(var) i6_c: typeof c6", "");
verify.quickInfoIs("var i6_c: typeof c6", "");
goTo.marker('25');
verify.quickInfoIs("class c6", "class with statics and constructor");
goTo.marker('26');
verify.completionListContains("c2", "class c2", "This is class c2 without constuctor");
verify.completionListContains("i2", "(var) i2: c2", "");
verify.completionListContains("i2_c", "(var) i2_c: typeof c2", "");
verify.completionListContains("i2", "var i2: c2", "");
verify.completionListContains("i2_c", "var i2_c: typeof c2", "");
verify.completionListContains("c3", "class c3", "");
verify.completionListContains("i3", "(var) i3: c3", "");
verify.completionListContains("i3_c", "(var) i3_c: typeof c3", "");
verify.completionListContains("i3", "var i3: c3", "");
verify.completionListContains("i3_c", "var i3_c: typeof c3", "");
verify.completionListContains("c4", "class c4", "Class comment");
verify.completionListContains("i4", "(var) i4: c4", "");
verify.completionListContains("i4_c", "(var) i4_c: typeof c4", "");
verify.completionListContains("i4", "var i4: c4", "");
verify.completionListContains("i4_c", "var i4_c: typeof c4", "");
verify.completionListContains("c5", "class c5", "Class with statics");
verify.completionListContains("i5", "(var) i5: c5", "");
verify.completionListContains("i5_c", "(var) i5_c: typeof c5");
verify.completionListContains("i5", "var i5: c5", "");
verify.completionListContains("i5_c", "var i5_c: typeof c5");
verify.completionListContains("c6", "class c6", "class with statics and constructor");
verify.completionListContains("i6", "(var) i6: c6", "");
verify.completionListContains("i6_c", "(var) i6_c: typeof c6", "");
verify.completionListContains("i6", "var i6: c6", "");
verify.completionListContains("i6_c", "var i6_c: typeof c6", "");
goTo.marker('27');
verify.currentSignatureHelpDocCommentIs("constructor for a");
verify.currentParameterHelpArgumentDocCommentIs("this is my a");
goTo.marker('28');
verify.quickInfoIs("(constructor) c2(): c2", "");
verify.quickInfoIs("constructor c2(): c2", "");
goTo.marker('29');
verify.quickInfoIs("(constructor) c3(): c3", "Constructor comment");
verify.quickInfoIs("constructor c3(): c3", "Constructor comment");
goTo.marker('30');
verify.quickInfoIs("(constructor) c4(): c4", "Constructor comment");
verify.quickInfoIs("constructor c4(): c4", "Constructor comment");
goTo.marker('31');
verify.quickInfoIs("(constructor) c5(): c5", "");
verify.quickInfoIs("constructor c5(): c5", "");
goTo.marker('32');
verify.quickInfoIs("(constructor) c6(): c6", "constructor comment");
verify.quickInfoIs("constructor c6(): c6", "constructor comment");
goTo.marker('33');
verify.quickInfoIs("(constructor) m.m2.c1(): m.m2.c1", "constructor comment");
verify.quickInfoIs("constructor m.m2.c1(): m.m2.c1", "constructor comment");

86
tests/cases/fourslash/commentsClassMembers.ts
View File

@ -332,7 +332,7 @@ goTo.marker('25q');
verify.quickInfoIs("(method) c1.pp2(b: number): number", "sum with property");
goTo.marker('26');
verify.quickInfoIs("(constructor) c1(): c1", "Constructor method");
verify.quickInfoIs("constructor c1(): c1", "Constructor method");
goTo.marker('27');
verify.quickInfoIs("(property) c1.s1: number", "s1 is static property of c1");
@ -500,15 +500,15 @@ goTo.marker('63q');
verify.quickInfoIs("(method) c1.nc_s2(b: number): number", "");
goTo.marker('64');
verify.quickInfoIs("(var) i1: c1", "");
verify.quickInfoIs("var i1: c1", "");
goTo.marker('65');
verify.currentSignatureHelpDocCommentIs("Constructor method");
goTo.marker('65q');
verify.quickInfoIs("(constructor) c1(): c1", "Constructor method");
verify.quickInfoIs("constructor c1(): c1", "Constructor method");
goTo.marker('66');
verify.quickInfoIs("(var) i1_p: number", "");
verify.quickInfoIs("var i1_p: number", "");
goTo.marker('67');
verify.quickInfoIs("(property) c1.p1: number", "p1 is property of c1");
@ -520,13 +520,13 @@ verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
goTo.marker('68');
verify.quickInfoIs("(var) i1_f: (b: number) => number", "");
verify.quickInfoIs("var i1_f: (b: number) => number", "");
goTo.marker('69');
verify.quickInfoIs("(method) c1.p2(b: number): number", "sum with property");
goTo.marker('70');
verify.quickInfoIs("(var) i1_r: number", "");
verify.quickInfoIs("var i1_r: number", "");
goTo.marker('71');
verify.currentSignatureHelpDocCommentIs("sum with property");
@ -535,28 +535,28 @@ goTo.marker('71q');
verify.quickInfoIs("(method) c1.p2(b: number): number", "sum with property");
goTo.marker('72');
verify.quickInfoIs("(var) i1_prop: number", "");
verify.quickInfoIs("var i1_prop: number", "");
goTo.marker('73');
verify.quickInfoIs("(property) c1.p3: number", "getter property\nsetter property");
goTo.marker('74');
verify.quickInfoIs("(property) c1.p3: number", "getter property\nsetter property");
goTo.marker('75');
verify.quickInfoIs("(var) i1_prop: number", "");
verify.quickInfoIs("var i1_prop: number", "");
goTo.marker('76');
verify.quickInfoIs("(var) i1_nc_p: number", "");
verify.quickInfoIs("var i1_nc_p: number", "");
goTo.marker('77');
verify.quickInfoIs("(property) c1.nc_p1: number", "");
goTo.marker('78');
verify.quickInfoIs("(var) i1_ncf: (b: number) => number", "");
verify.quickInfoIs("var i1_ncf: (b: number) => number", "");
goTo.marker('79');
verify.quickInfoIs("(method) c1.nc_p2(b: number): number", "");
goTo.marker('80');
verify.quickInfoIs("(var) i1_ncr: number", "");
verify.quickInfoIs("var i1_ncr: number", "");
goTo.marker('81');
verify.currentSignatureHelpDocCommentIs("");
@ -565,16 +565,16 @@ goTo.marker('81q');
verify.quickInfoIs("(method) c1.nc_p2(b: number): number", "");
goTo.marker('82');
verify.quickInfoIs("(var) i1_ncprop: number", "");
verify.quickInfoIs("var i1_ncprop: number", "");
goTo.marker('83');
verify.quickInfoIs("(property) c1.nc_p3: number", "");
goTo.marker('84');
verify.quickInfoIs("(property) c1.nc_p3: number", "");
goTo.marker('85');
verify.quickInfoIs("(var) i1_ncprop: number", "");
verify.quickInfoIs("var i1_ncprop: number", "");
goTo.marker('86');
verify.quickInfoIs("(var) i1_s_p: number", "");
verify.quickInfoIs("var i1_s_p: number", "");
goTo.marker('87');
verify.quickInfoIs("class c1", "This is comment for c1");
@ -590,13 +590,13 @@ verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
goTo.marker('89');
verify.quickInfoIs("(var) i1_s_f: (b: number) => number", "");
verify.quickInfoIs("var i1_s_f: (b: number) => number", "");
goTo.marker('90');
verify.quickInfoIs("(method) c1.s2(b: number): number", "static sum with property");
goTo.marker('91');
verify.quickInfoIs("(var) i1_s_r: number", "");
verify.quickInfoIs("var i1_s_r: number", "");
goTo.marker('92');
verify.currentSignatureHelpDocCommentIs("static sum with property");
@ -605,28 +605,28 @@ goTo.marker('92q');
verify.quickInfoIs("(method) c1.s2(b: number): number", "static sum with property");
goTo.marker('93');
verify.quickInfoIs("(var) i1_s_prop: number", "");
verify.quickInfoIs("var i1_s_prop: number", "");
goTo.marker('94');
verify.quickInfoIs("(property) c1.s3: number", "static getter property\nsetter property");
goTo.marker('95');
verify.quickInfoIs("(property) c1.s3: number", "static getter property\nsetter property");
goTo.marker('96');
verify.quickInfoIs("(var) i1_s_prop: number", "");
verify.quickInfoIs("var i1_s_prop: number", "");
goTo.marker('97');
verify.quickInfoIs("(var) i1_s_nc_p: number", "");
verify.quickInfoIs("var i1_s_nc_p: number", "");
goTo.marker('98');
verify.quickInfoIs("(property) c1.nc_s1: number", "");
goTo.marker('99');
verify.quickInfoIs("(var) i1_s_ncf: (b: number) => number", "");
verify.quickInfoIs("var i1_s_ncf: (b: number) => number", "");
goTo.marker('100');
verify.quickInfoIs("(method) c1.nc_s2(b: number): number", "");
goTo.marker('101');
verify.quickInfoIs("(var) i1_s_ncr: number", "");
verify.quickInfoIs("var i1_s_ncr: number", "");
goTo.marker('102');
verify.currentSignatureHelpDocCommentIs("");
@ -635,41 +635,41 @@ goTo.marker('102q');
verify.quickInfoIs("(method) c1.nc_s2(b: number): number", "");
goTo.marker('103');
verify.quickInfoIs("(var) i1_s_ncprop: number", "");
verify.quickInfoIs("var i1_s_ncprop: number", "");
goTo.marker('104');
verify.quickInfoIs("(property) c1.nc_s3: number", "");
goTo.marker('105');
verify.quickInfoIs("(property) c1.nc_s3: number", "");
goTo.marker('106');
verify.quickInfoIs("(var) i1_s_ncprop: number", "");
verify.quickInfoIs("var i1_s_ncprop: number", "");
goTo.marker('107');
verify.quickInfoIs("(var) i1_c: typeof c1", "");
verify.quickInfoIs("var i1_c: typeof c1", "");
goTo.marker('108');
verify.quickInfoIs("class c1", "This is comment for c1");
goTo.marker('109');
verify.completionListContains("c1", "class c1", "This is comment for c1");
verify.completionListContains("i1", "(var) i1: c1", "");
verify.completionListContains("i1_p", "(var) i1_p: number", "");
verify.completionListContains("i1_f", "(var) i1_f: (b: number) => number", "");
verify.completionListContains("i1_r", "(var) i1_r: number", "");
verify.completionListContains("i1_prop", "(var) i1_prop: number", "");
verify.completionListContains("i1_nc_p", "(var) i1_nc_p: number", "");
verify.completionListContains("i1_ncf", "(var) i1_ncf: (b: number) => number", "");
verify.completionListContains("i1_ncr", "(var) i1_ncr: number", "");
verify.completionListContains("i1_ncprop", "(var) i1_ncprop: number", "");
verify.completionListContains("i1_s_p", "(var) i1_s_p: number", "");
verify.completionListContains("i1_s_f", "(var) i1_s_f: (b: number) => number", "");
verify.completionListContains("i1_s_r", "(var) i1_s_r: number", "");
verify.completionListContains("i1_s_prop", "(var) i1_s_prop: number", "");
verify.completionListContains("i1_s_nc_p", "(var) i1_s_nc_p: number", "");
verify.completionListContains("i1_s_ncf", "(var) i1_s_ncf: (b: number) => number", "");
verify.completionListContains("i1_s_ncr", "(var) i1_s_ncr: number", "");
verify.completionListContains("i1_s_ncprop", "(var) i1_s_ncprop: number", "");
verify.completionListContains("i1", "var i1: c1", "");
verify.completionListContains("i1_p", "var i1_p: number", "");
verify.completionListContains("i1_f", "var i1_f: (b: number) => number", "");
verify.completionListContains("i1_r", "var i1_r: number", "");
verify.completionListContains("i1_prop", "var i1_prop: number", "");
verify.completionListContains("i1_nc_p", "var i1_nc_p: number", "");
verify.completionListContains("i1_ncf", "var i1_ncf: (b: number) => number", "");
verify.completionListContains("i1_ncr", "var i1_ncr: number", "");
verify.completionListContains("i1_ncprop", "var i1_ncprop: number", "");
verify.completionListContains("i1_s_p", "var i1_s_p: number", "");
verify.completionListContains("i1_s_f", "var i1_s_f: (b: number) => number", "");
verify.completionListContains("i1_s_r", "var i1_s_r: number", "");
verify.completionListContains("i1_s_prop", "var i1_s_prop: number", "");
verify.completionListContains("i1_s_nc_p", "var i1_s_nc_p: number", "");
verify.completionListContains("i1_s_ncf", "var i1_s_ncf: (b: number) => number", "");
verify.completionListContains("i1_s_ncr", "var i1_s_ncr: number", "");
verify.completionListContains("i1_s_ncprop", "var i1_s_ncprop: number", "");
verify.completionListContains("i1_c", "(var) i1_c: typeof c1", "");
verify.completionListContains("i1_c", "var i1_c: typeof c1", "");
goTo.marker('110');
verify.quickInfoIs("(property) cProperties.p2: number", "setter only property");
@ -703,4 +703,4 @@ goTo.marker('118');
verify.quickInfoIs("(local var) bbbb: number", "");
goTo.marker('119');
verify.quickInfoIs("(constructor) cWithConstructorProperty(a: number): cWithConstructorProperty", "this is class cWithConstructorProperty's constructor");
verify.quickInfoIs("constructor cWithConstructorProperty(a: number): cWithConstructorProperty", "this is class cWithConstructorProperty's constructor");

64
tests/cases/fourslash/commentsCommentParsing.ts
View File

@ -205,81 +205,81 @@
goTo.marker('1');
verify.currentSignatureHelpDocCommentIs("");
goTo.marker('1q');
verify.quickInfoIs("(function) simple(): void", "");
verify.quickInfoIs("function simple(): void", "");
goTo.marker('2');
verify.currentSignatureHelpDocCommentIs("");
goTo.marker('2q');
verify.quickInfoIs("(function) multiLine(): void", "");
verify.quickInfoIs("function multiLine(): void", "");
goTo.marker('3');
verify.currentSignatureHelpDocCommentIs("this is eg of single line jsdoc style comment ");
goTo.marker('3q');
verify.quickInfoIs("(function) jsDocSingleLine(): void", "this is eg of single line jsdoc style comment ");
verify.quickInfoIs("function jsDocSingleLine(): void", "this is eg of single line jsdoc style comment ");
goTo.marker('4');
verify.currentSignatureHelpDocCommentIs("this is multiple line jsdoc stule comment\nNew line1\nNew Line2");
goTo.marker('4q');
verify.quickInfoIs("(function) jsDocMultiLine(): void", "this is multiple line jsdoc stule comment\nNew line1\nNew Line2");
verify.quickInfoIs("function jsDocMultiLine(): void", "this is multiple line jsdoc stule comment\nNew line1\nNew Line2");
goTo.marker('5');
verify.currentSignatureHelpDocCommentIs("this is multiple line jsdoc stule comment\nNew line1\nNew Line2\nShoul mege this line as well\nand this too\nAnother this one too");
goTo.marker('5q');
verify.quickInfoIs("(function) jsDocMultiLineMerge(): void", "this is multiple line jsdoc stule comment\nNew line1\nNew Line2\nShoul mege this line as well\nand this too\nAnother this one too");
verify.quickInfoIs("function jsDocMultiLineMerge(): void", "this is multiple line jsdoc stule comment\nNew line1\nNew Line2\nShoul mege this line as well\nand this too\nAnother this one too");
goTo.marker('6');
verify.currentSignatureHelpDocCommentIs("jsdoc comment ");
goTo.marker('6q');
verify.quickInfoIs("(function) jsDocMixedComments1(): void", "jsdoc comment ");
verify.quickInfoIs("function jsDocMixedComments1(): void", "jsdoc comment ");
goTo.marker('7');
verify.currentSignatureHelpDocCommentIs("jsdoc comment \nanother jsDocComment");
goTo.marker('7q');
verify.quickInfoIs("(function) jsDocMixedComments2(): void", "jsdoc comment \nanother jsDocComment");
verify.quickInfoIs("function jsDocMixedComments2(): void", "jsdoc comment \nanother jsDocComment");
goTo.marker('8');
verify.currentSignatureHelpDocCommentIs("jsdoc comment \n* another jsDocComment");
goTo.marker('8q');
verify.quickInfoIs("(function) jsDocMixedComments3(): void", "jsdoc comment \n* another jsDocComment");
verify.quickInfoIs("function jsDocMixedComments3(): void", "jsdoc comment \n* another jsDocComment");
goTo.marker('9');
verify.currentSignatureHelpDocCommentIs("jsdoc comment \nanother jsDocComment");
goTo.marker('9q');
verify.quickInfoIs("(function) jsDocMixedComments4(): void", "jsdoc comment \nanother jsDocComment");
verify.quickInfoIs("function jsDocMixedComments4(): void", "jsdoc comment \nanother jsDocComment");
goTo.marker('10');
verify.currentSignatureHelpDocCommentIs("jsdoc comment \nanother jsDocComment");
goTo.marker('10q');
verify.quickInfoIs("(function) jsDocMixedComments5(): void", "jsdoc comment \nanother jsDocComment");
verify.quickInfoIs("function jsDocMixedComments5(): void", "jsdoc comment \nanother jsDocComment");
goTo.marker('11');
verify.currentSignatureHelpDocCommentIs("another jsDocComment\njsdoc comment ");
goTo.marker('11q');
verify.quickInfoIs("(function) jsDocMixedComments6(): void", "another jsDocComment\njsdoc comment ");
verify.quickInfoIs("function jsDocMixedComments6(): void", "another jsDocComment\njsdoc comment ");
goTo.marker('12');
verify.currentSignatureHelpDocCommentIs("");
goTo.marker('12q');
verify.quickInfoIs("(function) noHelpComment1(): void", "");
verify.quickInfoIs("function noHelpComment1(): void", "");
goTo.marker('13');
verify.currentSignatureHelpDocCommentIs("");
goTo.marker('13q');
verify.quickInfoIs("(function) noHelpComment2(): void", "");
verify.quickInfoIs("function noHelpComment2(): void", "");
goTo.marker('14');
verify.currentSignatureHelpDocCommentIs("");
goTo.marker('14q');
verify.quickInfoIs("(function) noHelpComment3(): void", "");
verify.quickInfoIs("function noHelpComment3(): void", "");
goTo.marker('15');
verify.completionListContains("sum", "(function) sum(a: number, b: number): number", "Adds two integers and returns the result");
verify.completionListContains("sum", "function sum(a: number, b: number): number", "Adds two integers and returns the result");
goTo.marker('16');
verify.currentSignatureHelpDocCommentIs("Adds two integers and returns the result");
verify.currentParameterHelpArgumentDocCommentIs("first number");
goTo.marker('16q');
verify.quickInfoIs("(function) sum(a: number, b: number): number", "Adds two integers and returns the result");
verify.quickInfoIs("function sum(a: number, b: number): number", "Adds two integers and returns the result");
goTo.marker('16aq');
verify.quickInfoIs("(parameter) a: number", "first number");
@ -298,7 +298,7 @@ goTo.marker('19');
verify.currentSignatureHelpDocCommentIs("This is multiplication function\n@anotherTag\n@anotherTag");
verify.currentParameterHelpArgumentDocCommentIs("first number");
goTo.marker('19q');
verify.quickInfoIs("(function) multiply(a: number, b: number, c?: number, d?: any, e?: any): void", "This is multiplication function\n@anotherTag\n@anotherTag");
verify.quickInfoIs("function multiply(a: number, b: number, c?: number, d?: any, e?: any): void", "This is multiplication function\n@anotherTag\n@anotherTag");
goTo.marker('19aq');
verify.quickInfoIs("(parameter) a: number", "first number");
@ -334,7 +334,7 @@ goTo.marker('25');
verify.currentSignatureHelpDocCommentIs("fn f1 with number");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('25q');
verify.quickInfoIs("(function) f1(a: number): any (+1 overload)", "fn f1 with number");
verify.quickInfoIs("function f1(a: number): any (+1 overload)", "fn f1 with number");
goTo.marker('25aq');
verify.quickInfoIs("(parameter) a: number", "");
@ -342,19 +342,19 @@ goTo.marker('26');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('26q');
verify.quickInfoIs("(function) f1(b: string): any (+1 overload)", "");
verify.quickInfoIs("function f1(b: string): any (+1 overload)", "");
goTo.marker('26aq');
verify.quickInfoIs("(parameter) b: string", "");
goTo.marker('27');
verify.completionListContains("multiply", "(function) multiply(a: number, b: number, c?: number, d?: any, e?: any): void", "This is multiplication function\n@anotherTag\n@anotherTag");
verify.completionListContains("f1", "(function) f1(a: number): any (+1 overload)", "fn f1 with number");
verify.completionListContains("multiply", "function multiply(a: number, b: number, c?: number, d?: any, e?: any): void", "This is multiplication function\n@anotherTag\n@anotherTag");
verify.completionListContains("f1", "function f1(a: number): any (+1 overload)", "fn f1 with number");
goTo.marker('28');
verify.currentSignatureHelpDocCommentIs("This is subtract function");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('28q');
verify.quickInfoIs("(function) subtract(a: number, b: number, c?: () => string, d?: () => string, e?: () => string, f?: () => string): void", "This is subtract function");
verify.quickInfoIs("function subtract(a: number, b: number, c?: () => string, d?: () => string, e?: () => string, f?: () => string): void", "This is subtract function");
goTo.marker('28aq');
verify.quickInfoIs("(parameter) a: number", "");
@ -392,7 +392,7 @@ goTo.marker('34');
verify.currentSignatureHelpDocCommentIs("this is square function\n@paramTag { number } a this is input number of paramTag\n@returnType { number } it is return type");
verify.currentParameterHelpArgumentDocCommentIs("this is input number");
goTo.marker('34q');
verify.quickInfoIs("(function) square(a: number): number", "this is square function\n@paramTag { number } a this is input number of paramTag\n@returnType { number } it is return type");
verify.quickInfoIs("function square(a: number): number", "this is square function\n@paramTag { number } a this is input number of paramTag\n@returnType { number } it is return type");
goTo.marker('34aq');
verify.quickInfoIs("(parameter) a: number", "this is input number");
@ -400,7 +400,7 @@ goTo.marker('35');
verify.currentSignatureHelpDocCommentIs("this is divide function\n@paramTag { number } g this is optional param g");
verify.currentParameterHelpArgumentDocCommentIs("this is a");
goTo.marker('35q');
verify.quickInfoIs("(function) divide(a: number, b: number): void", "this is divide function\n@paramTag { number } g this is optional param g");
verify.quickInfoIs("function divide(a: number, b: number): void", "this is divide function\n@paramTag { number } g this is optional param g");
goTo.marker('35aq');
verify.quickInfoIs("(parameter) a: number", "this is a");
@ -414,7 +414,7 @@ goTo.marker('37');
verify.currentSignatureHelpDocCommentIs("Function returns string concat of foo and bar");
verify.currentParameterHelpArgumentDocCommentIs("is string");
goTo.marker('37q');
verify.quickInfoIs("(function) fooBar(foo: string, bar: string): string", "Function returns string concat of foo and bar");
verify.quickInfoIs("function fooBar(foo: string, bar: string): string", "Function returns string concat of foo and bar");
goTo.marker('37aq');
verify.quickInfoIs("(parameter) foo: string", "is string");
@ -434,7 +434,7 @@ goTo.marker('40');
verify.currentSignatureHelpDocCommentIs("this is jsdoc style function with param tag as well as inline parameter help");
verify.currentParameterHelpArgumentDocCommentIs("it is first parameter\nthis is inline comment for a ");
goTo.marker('40q');
verify.quickInfoIs("(function) jsDocParamTest(a: number, b: number, c: number, d: number): number", "this is jsdoc style function with param tag as well as inline parameter help");
verify.quickInfoIs("function jsDocParamTest(a: number, b: number, c: number, d: number): number", "this is jsdoc style function with param tag as well as inline parameter help");
goTo.marker('40aq');
verify.quickInfoIs("(parameter) a: number", "it is first parameter\nthis is inline comment for a ");
@ -457,25 +457,25 @@ goTo.marker('43aq');
verify.quickInfoIs("(parameter) d: number", "");
goTo.marker('44');
verify.completionListContains("jsDocParamTest", "(function) jsDocParamTest(a: number, b: number, c: number, d: number): number", "this is jsdoc style function with param tag as well as inline parameter help");
verify.completionListContains("x", "(var) x: any", "This is a comment ");
verify.completionListContains("y", "(var) y: any", "This is a comment ");
verify.completionListContains("jsDocParamTest", "function jsDocParamTest(a: number, b: number, c: number, d: number): number", "this is jsdoc style function with param tag as well as inline parameter help");
verify.completionListContains("x", "var x: any", "This is a comment ");
verify.completionListContains("y", "var y: any", "This is a comment ");
goTo.marker('45');
verify.currentSignatureHelpDocCommentIs("This is function comment\nAnd properly aligned comment ");
goTo.marker('45q');
verify.quickInfoIs("(function) jsDocCommentAlignmentTest1(): void", "This is function comment\nAnd properly aligned comment ");
verify.quickInfoIs("function jsDocCommentAlignmentTest1(): void", "This is function comment\nAnd properly aligned comment ");
goTo.marker('46');
verify.currentSignatureHelpDocCommentIs("This is function comment\n And aligned with 4 space char margin");
goTo.marker('46q');
verify.quickInfoIs("(function) jsDocCommentAlignmentTest2(): void", "This is function comment\n And aligned with 4 space char margin");
verify.quickInfoIs("function jsDocCommentAlignmentTest2(): void", "This is function comment\n And aligned with 4 space char margin");
goTo.marker('47');
verify.currentSignatureHelpDocCommentIs("This is function comment\n And aligned with 4 space char margin");
verify.currentParameterHelpArgumentDocCommentIs("this is info about a\nspanning on two lines and aligned perfectly");
goTo.marker('47q');
verify.quickInfoIs("(function) jsDocCommentAlignmentTest3(a: string, b: any, c: any): void", "This is function comment\n And aligned with 4 space char margin");
verify.quickInfoIs("function jsDocCommentAlignmentTest3(a: string, b: any, c: any): void", "This is function comment\n And aligned with 4 space char margin");
goTo.marker('47aq');
verify.quickInfoIs("(parameter) a: string", "this is info about a\nspanning on two lines and aligned perfectly");

2
tests/cases/fourslash/commentsEnums.ts
View File

@ -20,7 +20,7 @@ goTo.marker('3');
verify.quickInfoIs("(enum member) Colors.FancyPink = 1", "Fancy name for 'pink'");
goTo.marker('4');
verify.quickInfoIs("(var) x: Colors", "");
verify.quickInfoIs("var x: Colors", "");
goTo.marker('5');
verify.completionListContains("Colors", "enum Colors", "Enum of colors");

30
tests/cases/fourslash/commentsExternalModules.ts
View File

@ -39,33 +39,33 @@ goTo.marker('1');
verify.quickInfoIs("module m1", "Module comment");
goTo.marker('2');
verify.completionListContains("b", "(var) m1.b: number", "b's comment");
verify.completionListContains("foo", "(function) foo(): number", "foo's comment");
verify.completionListContains("b", "var m1.b: number", "b's comment");
verify.completionListContains("foo", "function foo(): number", "foo's comment");
goTo.marker('3');
verify.currentSignatureHelpDocCommentIs("foo's comment");
goTo.marker('3q');
verify.quickInfoIs("(function) foo(): number", "foo's comment");
verify.quickInfoIs("function foo(): number", "foo's comment");
goTo.marker('4');
verify.completionListContains("m1", "module m1", "Module comment");
goTo.marker('5');
verify.memberListContains("b", "(var) m1.b: number", "b's comment");
verify.memberListContains("fooExport", "(function) m1.fooExport(): number", "exported function");
verify.memberListContains("b", "var m1.b: number", "b's comment");
verify.memberListContains("fooExport", "function m1.fooExport(): number", "exported function");
verify.memberListContains("m2", "module m1.m2");
goTo.marker('6');
verify.currentSignatureHelpDocCommentIs("exported function");
goTo.marker('6q');
verify.quickInfoIs("(function) m1.fooExport(): number", "exported function");
verify.quickInfoIs("function m1.fooExport(): number", "exported function");
goTo.marker('7');
verify.quickInfoIs("(var) myvar: m1.m2.c", "");
verify.quickInfoIs("var myvar: m1.m2.c", "");
goTo.marker('8');
verify.memberListContains("c", "(constructor) m1.m2.c(): m1.m2.c", "");
verify.memberListContains("i", "(var) m1.m2.i: m1.m2.c", "i");
verify.memberListContains("c", "constructor m1.m2.c(): m1.m2.c", "");
verify.memberListContains("i", "var m1.m2.i: m1.m2.c", "i");
goTo.file("commentsExternalModules_file1.ts");
goTo.marker('9');
@ -78,18 +78,18 @@ goTo.marker('11');
verify.memberListContains("m1", "module extMod.m1");
goTo.marker('12');
verify.memberListContains("b", "(var) extMod.m1.b: number", "b's comment");
verify.memberListContains("fooExport", "(function) extMod.m1.fooExport(): number", "exported function");
verify.memberListContains("b", "var extMod.m1.b: number", "b's comment");
verify.memberListContains("fooExport", "function extMod.m1.fooExport(): number", "exported function");
verify.memberListContains("m2", "module extMod.m1.m2");
goTo.marker('13');
verify.currentSignatureHelpDocCommentIs("exported function");
goTo.marker('13q');
verify.quickInfoIs("(function) extMod.m1.fooExport(): number", "exported function");
verify.quickInfoIs("function extMod.m1.fooExport(): number", "exported function");
goTo.marker('14');
verify.quickInfoIs("(var) newVar: extMod.m1.m2.c", "");
verify.quickInfoIs("var newVar: extMod.m1.m2.c", "");
goTo.marker('15');
verify.memberListContains("c", "(constructor) extMod.m1.m2.c(): extMod.m1.m2.c", "");
verify.memberListContains("i", "(var) extMod.m1.m2.i: extMod.m1.m2.c", "i");
verify.memberListContains("c", "constructor extMod.m1.m2.c(): extMod.m1.m2.c", "");
verify.memberListContains("i", "var extMod.m1.m2.i: extMod.m1.m2.c", "i");

24
tests/cases/fourslash/commentsFunction.ts
View File

@ -46,36 +46,36 @@ verify.currentSignatureHelpDocCommentIs("This is comment for function signature"
verify.currentParameterHelpArgumentDocCommentIs("this is comment for b");
goTo.marker('4');
verify.completionListContains('foo', '(function) foo(): void', 'This comment should appear for foo');
verify.completionListContains('foo', 'function foo(): void', 'This comment should appear for foo');
goTo.marker('5');
verify.completionListContains('fooWithParameters', '(function) fooWithParameters(a: string, b: number): void', 'This is comment for function signature');
verify.completionListContains('fooWithParameters', 'function fooWithParameters(a: string, b: number): void', 'This is comment for function signature');
goTo.marker('6');
verify.quickInfoIs("(function) foo(): void", "This comment should appear for foo");
verify.quickInfoIs("function foo(): void", "This comment should appear for foo");
goTo.marker('7');
verify.quickInfoIs("(function) foo(): void", "This comment should appear for foo");
verify.quickInfoIs("function foo(): void", "This comment should appear for foo");
goTo.marker('8');
verify.quickInfoIs("(function) fooWithParameters(a: string, b: number): void", "This is comment for function signature");
verify.quickInfoIs("function fooWithParameters(a: string, b: number): void", "This is comment for function signature");
goTo.marker('9');
verify.quickInfoIs("(function) fooWithParameters(a: string, b: number): void", "This is comment for function signature");
verify.quickInfoIs("function fooWithParameters(a: string, b: number): void", "This is comment for function signature");
goTo.marker('10');
verify.completionListContains('a', '(parameter) a: string', 'this is comment about a');
verify.completionListContains('b', '(parameter) b: number', 'this is comment for b');
goTo.marker('11');
verify.quickInfoIs("(var) lambdaFoo: (a: number, b: number) => number", "lamdaFoo var comment");
verify.quickInfoIs("var lambdaFoo: (a: number, b: number) => number", "lamdaFoo var comment");
goTo.marker('12');
verify.quickInfoIs("(var) lambddaNoVarComment: (a: number, b: number) => number", "");
verify.quickInfoIs("var lambddaNoVarComment: (a: number, b: number) => number", "");
goTo.marker('13');
verify.completionListContains('lambdaFoo', '(var) lambdaFoo: (a: number, b: number) => number', '');
verify.completionListContains('lambddaNoVarComment', '(var) lambddaNoVarComment: (a: number, b: number) => number', '');
verify.completionListContains('lambdaFoo', 'var lambdaFoo: (a: number, b: number) => number', '');
verify.completionListContains('lambddaNoVarComment', 'var lambddaNoVarComment: (a: number, b: number) => number', '');
goTo.marker('14');
verify.currentParameterHelpArgumentDocCommentIs("param a");
@ -101,7 +101,7 @@ goTo.marker('20');
verify.quickInfoIs('(local var) d: string', '');
goTo.marker('20a');
verify.quickInfoIs('(var) lambdaAnotherFunc: (a: number) => number', '');
verify.quickInfoIs('var lambdaAnotherFunc: (a: number) => number', '');
goTo.marker('21');
verify.quickInfoIs('(parameter) a: number', '');
goTo.marker('22');
@ -112,7 +112,7 @@ goTo.marker('24');
verify.quickInfoIs('(parameter) a: number', '');
goTo.marker('25');
verify.quickInfoIs('(function) anotherFunc(a: number): string', '');
verify.quickInfoIs('function anotherFunc(a: number): string', '');
goTo.marker('26');
verify.quickInfoIs('(parameter) a: number', '');
goTo.marker('27a');

12
tests/cases/fourslash/commentsImportDeclaration.ts
View File

@ -34,18 +34,18 @@ goTo.marker('6');
verify.memberListContains("m1", "module extMod.m1");
goTo.marker('7');
verify.memberListContains("b", "(var) extMod.m1.b: number", "b's comment");
verify.memberListContains("fooExport", "(function) extMod.m1.fooExport(): number", "exported function");
verify.memberListContains("b", "var extMod.m1.b: number", "b's comment");
verify.memberListContains("fooExport", "function extMod.m1.fooExport(): number", "exported function");
verify.memberListContains("m2", "module extMod.m1.m2");
goTo.marker('8');
verify.currentSignatureHelpDocCommentIs("exported function");
goTo.marker('8q');
verify.quickInfoIs("(function) extMod.m1.fooExport(): number", "exported function");
verify.quickInfoIs("function extMod.m1.fooExport(): number", "exported function");
goTo.marker('9');
verify.quickInfoIs("(var) newVar: extMod.m1.m2.c", "");
verify.quickInfoIs("var newVar: extMod.m1.m2.c", "");
goTo.marker('10');
verify.memberListContains("c", "(constructor) extMod.m1.m2.c(): extMod.m1.m2.c", "");
verify.memberListContains("i", "(var) extMod.m1.m2.i: extMod.m1.m2.c", "i");
verify.memberListContains("c", "constructor extMod.m1.m2.c(): extMod.m1.m2.c", "");
verify.memberListContains("i", "var extMod.m1.m2.i: extMod.m1.m2.c", "i");

44
tests/cases/fourslash/commentsInheritance.ts
View File

@ -251,7 +251,7 @@ goTo.marker('l5');
verify.currentSignatureHelpDocCommentIs("");
goTo.marker('1iq');
verify.quickInfoIs("(var) i1_i: i1", "");
verify.quickInfoIs("var i1_i: i1", "");
goTo.marker('2q');
verify.quickInfoIs("(method) i1.i1_f1(): void", "i1_f1");
goTo.marker('3q');
@ -300,7 +300,7 @@ goTo.marker('l10');
verify.currentSignatureHelpDocCommentIs("");
goTo.marker('6iq');
verify.quickInfoIs("(var) c1_i: c1", "");
verify.quickInfoIs("var c1_i: c1", "");
goTo.marker('7q');
verify.quickInfoIs("(method) c1.i1_f1(): void", "");
goTo.marker('8q');
@ -366,17 +366,17 @@ verify.quickInfoIs("(property) i1.nc_l1: () => void", "");
goTo.marker('16');
verify.completionListContains("i1", "interface i1", "i1 is interface with properties");
verify.completionListContains("i1_i", "(var) i1_i: i1", "");
verify.completionListContains("i1_i", "var i1_i: i1", "");
verify.completionListContains("c1", "class c1", "");
verify.completionListContains("c1_i", "(var) c1_i: c1", "");
verify.completionListContains("c1_i", "var c1_i: c1", "");
goTo.marker('16i');
verify.completionListContains("i1", "interface i1", "i1 is interface with properties");
goTo.marker('17iq');
verify.quickInfoIs("(var) c2_i: c2", "");
verify.quickInfoIs("var c2_i: c2", "");
goTo.marker('18iq');
verify.quickInfoIs("(var) c3_i: c3", "");
verify.quickInfoIs("var c3_i: c3", "");
goTo.marker('17');
verify.currentSignatureHelpDocCommentIs("c2 constructor");
@ -385,7 +385,7 @@ goTo.marker('18');
verify.currentSignatureHelpDocCommentIs("");
goTo.marker('18sq');
verify.quickInfoIs("(constructor) c2(a: number): c2", "c2 constructor");
verify.quickInfoIs("constructor c2(a: number): c2", "c2 constructor");
goTo.marker('18spropq');
verify.quickInfoIs("class c2", "");
@ -393,9 +393,9 @@ goTo.marker('18spropProp');
verify.quickInfoIs("(property) c2.c2_p1: number", "c2 c2_p1");
goTo.marker('17q');
verify.quickInfoIs("(constructor) c2(a: number): c2", "c2 constructor");
verify.quickInfoIs("constructor c2(a: number): c2", "c2 constructor");
goTo.marker('18q');
verify.quickInfoIs("(constructor) c3(): c3", "");
verify.quickInfoIs("constructor c3(): c3", "");
goTo.marker('19');
verify.memberListContains("c2_p1", "(property) c2.c2_p1: number", "c2 c2_p1");
@ -493,17 +493,17 @@ verify.quickInfoIs("(method) c2.nc_f1(): void", "");
goTo.marker('34');
verify.currentSignatureHelpDocCommentIs("c2 constructor");
goTo.marker('34iq');
verify.quickInfoIs("(var) c4_i: c4", "");
verify.quickInfoIs("var c4_i: c4", "");
goTo.marker('34q');
verify.quickInfoIs("(constructor) c4(a: number): c4", "c2 constructor");
verify.quickInfoIs("constructor c4(a: number): c4", "c2 constructor");
goTo.marker('35');
verify.completionListContains("c2", "class c2", "");
verify.completionListContains("c2_i", "(var) c2_i: c2", "");
verify.completionListContains("c2_i", "var c2_i: c2", "");
verify.completionListContains("c3", "class c3", "");
verify.completionListContains("c3_i", "(var) c3_i: c3", "");
verify.completionListContains("c3_i", "var c3_i: c3", "");
verify.completionListContains("c4", "class c4", "");
verify.completionListContains("c4_i", "(var) c4_i: c4", "");
verify.completionListContains("c4_i", "var c4_i: c4", "");
goTo.marker('36');
verify.memberListContains("i2_p1", "(property) i2.i2_p1: number", "i2_p1");
@ -536,9 +536,9 @@ goTo.marker('l40');
verify.currentSignatureHelpDocCommentIs("");
goTo.marker('36iq');
verify.quickInfoIs("(var) i2_i: i2", "");
verify.quickInfoIs("var i2_i: i2", "");
goTo.marker('37iq');
verify.quickInfoIs("(var) i3_i: i3", "");
verify.quickInfoIs("var i3_i: i3", "");
goTo.marker('37q');
verify.quickInfoIs("(method) i2.i2_f1(): void", "i2_f1");
goTo.marker('38q');
@ -652,16 +652,16 @@ verify.quickInfoIs("(property) i2.nc_l1: () => void", "");
goTo.marker('51');
verify.completionListContains("i2", "interface i2", "");
verify.completionListContains("i2_i", "(var) i2_i: i2", "");
verify.completionListContains("i2_i", "var i2_i: i2", "");
verify.completionListContains("i3", "interface i3", "");
verify.completionListContains("i3_i", "(var) i3_i: i3", "");
verify.completionListContains("i3_i", "var i3_i: i3", "");
goTo.marker('51i');
verify.completionListContains("i2", "interface i2", "");
verify.completionListContains("i3", "interface i3", "");
goTo.marker('52');
verify.quickInfoIs("(constructor) c5(): c5", "");
verify.quickInfoIs("constructor c5(): c5", "");
goTo.marker('53');
verify.quickInfoIs("class c5", "c5 class");
@ -670,10 +670,10 @@ goTo.marker('54');
verify.quickInfoIs("(property) c5.b: number", "");
goTo.marker('55');
verify.quickInfoIs("(constructor) c2(a: number): c2", "c2 constructor");
verify.quickInfoIs("constructor c2(a: number): c2", "c2 constructor");
goTo.marker('56');
verify.quickInfoIs("(constructor) c3(): c3", "");
verify.quickInfoIs("constructor c3(): c3", "");
goTo.marker('57');
verify.quickInfoIs("(constructor) c6(): c6", "");
verify.quickInfoIs("constructor c6(): c6", "");

80
tests/cases/fourslash/commentsInterface.ts
View File

@ -72,22 +72,22 @@ goTo.marker('1');
verify.quickInfoIs("interface i1", "this is interface 1");
goTo.marker('2');
verify.quickInfoIs("(var) i1_i: i1", "");
verify.quickInfoIs("var i1_i: i1", "");
goTo.marker('3');
verify.quickInfoIs("interface nc_i1", "");
goTo.marker('4');
verify.quickInfoIs("(var) nc_i1_i: nc_i1", "");
verify.quickInfoIs("var nc_i1_i: nc_i1", "");
goTo.marker('5');
verify.quickInfoIs("interface i2", "this is interface 2 with memebers");
goTo.marker('6');
verify.quickInfoIs("(var) i2_i: i2", "");
verify.quickInfoIs("var i2_i: i2", "");
goTo.marker('7');
verify.quickInfoIs("(var) i2_i_x: number", "");
verify.quickInfoIs("var i2_i_x: number", "");
goTo.marker('8');
verify.quickInfoIs("(property) i2.x: number", "this is x");
@ -99,13 +99,13 @@ verify.memberListContains("fnfoo", "(method) i2.fnfoo(b: number): string", "this
verify.memberListContains("nc_fnfoo", "(method) i2.nc_fnfoo(b: number): string", "");
goTo.marker('9');
verify.quickInfoIs("(var) i2_i_foo: (b: number) => string", "");
verify.quickInfoIs("var i2_i_foo: (b: number) => string", "");
goTo.marker('10');
verify.quickInfoIs("(property) i2.foo: (b: number) => string", "this is foo");
goTo.marker('11');
verify.quickInfoIs("(var) i2_i_foo_r: string", "");
verify.quickInfoIs("var i2_i_foo_r: string", "");
goTo.marker('12');
verify.currentSignatureHelpDocCommentIs("");
@ -114,38 +114,38 @@ goTo.marker('12q');
verify.quickInfoIs("(property) i2.foo: (b: number) => string", "");
goTo.marker('13');
verify.quickInfoIs("(var) i2_i_i2_si: number", "");
verify.quickInfoIs("var i2_i_i2_si: number", "");
goTo.marker('13q');
verify.quickInfoIs("(var) i2_i: i2", "");
verify.quickInfoIs("var i2_i: i2", "");
goTo.marker('14');
verify.quickInfoIs("(var) i2_i_i2_ii: number", "");
verify.quickInfoIs("var i2_i_i2_ii: number", "");
goTo.marker('14q');
verify.quickInfoIs("(var) i2_i: i2", "");
verify.quickInfoIs("var i2_i: i2", "");
goTo.marker('15');
verify.quickInfoIs("(var) i2_i_n: any", "");
verify.quickInfoIs("var i2_i_n: any", "");
goTo.marker('16');
verify.currentSignatureHelpDocCommentIs("new method");
verify.currentParameterHelpArgumentDocCommentIs("param");
goTo.marker('16q');
verify.quickInfoIs("(var) i2_i: new i2(i: i1) => any", "new method");
verify.quickInfoIs("var i2_i: new i2(i: i1) => any", "new method");
goTo.marker('17');
verify.quickInfoIs("(var) i2_i_nc_x: number", "");
verify.quickInfoIs("var i2_i_nc_x: number", "");
goTo.marker('18');
verify.quickInfoIs("(property) i2.nc_x: number", "");
goTo.marker('19');
verify.quickInfoIs("(var) i2_i_nc_foo: (b: number) => string", "");
verify.quickInfoIs("var i2_i_nc_foo: (b: number) => string", "");
goTo.marker('20');
verify.quickInfoIs("(property) i2.nc_foo: (b: number) => string", "");
goTo.marker('21');
verify.quickInfoIs("(var) i2_i_nc_foo_r: string", "");
verify.quickInfoIs("var i2_i_nc_foo_r: string", "");
goTo.marker('22');
verify.currentSignatureHelpDocCommentIs("");
@ -154,26 +154,26 @@ goTo.marker('22q');
verify.quickInfoIs("(property) i2.nc_foo: (b: number) => string", "");
goTo.marker('23');
verify.quickInfoIs("(var) i2_i_r: number", "");
verify.quickInfoIs("var i2_i_r: number", "");
goTo.marker('24');
verify.currentSignatureHelpDocCommentIs("this is call signature");
verify.currentParameterHelpArgumentDocCommentIs("paramhelp a");
goTo.marker('24q');
verify.quickInfoIs("(var) i2_i: i2(a: number, b: number) => number", "this is call signature");
verify.quickInfoIs("var i2_i: i2(a: number, b: number) => number", "this is call signature");
goTo.marker('25');
verify.currentSignatureHelpDocCommentIs("this is call signature");
verify.currentParameterHelpArgumentDocCommentIs("paramhelp b");
goTo.marker('26');
verify.quickInfoIs("(var) i2_i_fnfoo: (b: number) => string", "");
verify.quickInfoIs("var i2_i_fnfoo: (b: number) => string", "");
goTo.marker('27');
verify.quickInfoIs("(method) i2.fnfoo(b: number): string", "this is fnfoo");
goTo.marker('28');
verify.quickInfoIs("(var) i2_i_fnfoo_r: string", "");
verify.quickInfoIs("var i2_i_fnfoo_r: string", "");
goTo.marker('29');
verify.currentSignatureHelpDocCommentIs("this is fnfoo");
@ -182,13 +182,13 @@ goTo.marker('29q');
verify.quickInfoIs("(method) i2.fnfoo(b: number): string", "this is fnfoo");
goTo.marker('30');
verify.quickInfoIs("(var) i2_i_nc_fnfoo: (b: number) => string", "");
verify.quickInfoIs("var i2_i_nc_fnfoo: (b: number) => string", "");
goTo.marker('31');
verify.quickInfoIs("(method) i2.nc_fnfoo(b: number): string", "");
goTo.marker('32');
verify.quickInfoIs("(var) i2_i_nc_fnfoo_r: string", "");
verify.quickInfoIs("var i2_i_nc_fnfoo_r: string", "");
goTo.marker('33');
verify.currentSignatureHelpDocCommentIs("");
@ -198,25 +198,25 @@ verify.quickInfoIs("(method) i2.nc_fnfoo(b: number): string", "");
goTo.marker('34');
verify.completionListContains("i1", "interface i1", "this is interface 1");
verify.completionListContains("i1_i", "(var) i1_i: i1", "");
verify.completionListContains("i1_i", "var i1_i: i1", "");
verify.completionListContains("nc_i1", "interface nc_i1", "");
verify.completionListContains("nc_i1_i", "(var) nc_i1_i: nc_i1", "");
verify.completionListContains("nc_i1_i", "var nc_i1_i: nc_i1", "");
verify.completionListContains("i2", "interface i2", "this is interface 2 with memebers");
verify.completionListContains("i2_i", "(var) i2_i: i2", "");
verify.completionListContains("i2_i_x", "(var) i2_i_x: number", "");
verify.completionListContains("i2_i_foo", "(var) i2_i_foo: (b: number) => string", "");
verify.completionListContains("i2_i_foo_r", "(var) i2_i_foo_r: string", "");
verify.completionListContains("i2_i_i2_si", "(var) i2_i_i2_si: number", "");
verify.completionListContains("i2_i_i2_ii", "(var) i2_i_i2_ii: number", "");
verify.completionListContains("i2_i_n", "(var) i2_i_n: any", "");
verify.completionListContains("i2_i_nc_x", "(var) i2_i_nc_x: number", "");
verify.completionListContains("i2_i_nc_foo", "(var) i2_i_nc_foo: (b: number) => string", "");
verify.completionListContains("i2_i_nc_foo_r", "(var) i2_i_nc_foo_r: string", "");
verify.completionListContains("i2_i_r", "(var) i2_i_r: number", "");
verify.completionListContains("i2_i_fnfoo", "(var) i2_i_fnfoo: (b: number) => string", "");
verify.completionListContains("i2_i_fnfoo_r", "(var) i2_i_fnfoo_r: string", "");
verify.completionListContains("i2_i_nc_fnfoo", "(var) i2_i_nc_fnfoo: (b: number) => string", "");
verify.completionListContains("i2_i_nc_fnfoo_r", "(var) i2_i_nc_fnfoo_r: string", "");
verify.completionListContains("i2_i", "var i2_i: i2", "");
verify.completionListContains("i2_i_x", "var i2_i_x: number", "");
verify.completionListContains("i2_i_foo", "var i2_i_foo: (b: number) => string", "");
verify.completionListContains("i2_i_foo_r", "var i2_i_foo_r: string", "");
verify.completionListContains("i2_i_i2_si", "var i2_i_i2_si: number", "");
verify.completionListContains("i2_i_i2_ii", "var i2_i_i2_ii: number", "");
verify.completionListContains("i2_i_n", "var i2_i_n: any", "");
verify.completionListContains("i2_i_nc_x", "var i2_i_nc_x: number", "");
verify.completionListContains("i2_i_nc_foo", "var i2_i_nc_foo: (b: number) => string", "");
verify.completionListContains("i2_i_nc_foo_r", "var i2_i_nc_foo_r: string", "");
verify.completionListContains("i2_i_r", "var i2_i_r: number", "");
verify.completionListContains("i2_i_fnfoo", "var i2_i_fnfoo: (b: number) => string", "");
verify.completionListContains("i2_i_fnfoo_r", "var i2_i_fnfoo_r: string", "");
verify.completionListContains("i2_i_nc_fnfoo", "var i2_i_nc_fnfoo: (b: number) => string", "");
verify.completionListContains("i2_i_nc_fnfoo_r", "var i2_i_nc_fnfoo_r: string", "");
goTo.marker('34i');
verify.completionListContains("i1", "interface i1", "this is interface 1");
@ -227,10 +227,10 @@ goTo.marker('36');
verify.completionListContains("a", "(parameter) a: number", "i3_i a");
goTo.marker('40q');
verify.quickInfoIs("(var) i3_i: i3", "");
verify.quickInfoIs("var i3_i: i3", "");
goTo.marker('40');
verify.completionListContains("i3", "interface i3", "");
verify.completionListContains("i3_i", "(var) i3_i: i3", "");
verify.completionListContains("i3_i", "var i3_i: i3", "");
goTo.marker('41');
verify.quickInfoIs("(method) i3.f(a: number): string", "Function i3 f");

48
tests/cases/fourslash/commentsModules.ts
View File

@ -100,33 +100,33 @@ goTo.marker('1');
verify.quickInfoIs("module m1", "Module comment");
goTo.marker('2');
verify.completionListContains("b", "(var) m1.b: number", "b's comment");
verify.completionListContains("foo", "(function) foo(): number", "foo's comment");
verify.completionListContains("b", "var m1.b: number", "b's comment");
verify.completionListContains("foo", "function foo(): number", "foo's comment");
goTo.marker('3');
verify.currentSignatureHelpDocCommentIs("foo's comment");
goTo.marker('3q');
verify.quickInfoIs("(function) foo(): number", "foo's comment");
verify.quickInfoIs("function foo(): number", "foo's comment");
goTo.marker('4');
verify.completionListContains("m1", "module m1", "Module comment");
goTo.marker('5');
verify.memberListContains("b", "(var) m1.b: number", "b's comment");
verify.memberListContains("fooExport", "(function) m1.fooExport(): number", "exported function");
verify.memberListContains("b", "var m1.b: number", "b's comment");
verify.memberListContains("fooExport", "function m1.fooExport(): number", "exported function");
verify.memberListContains("m2", "module m1.m2");
verify.quickInfoIs("(function) m1.fooExport(): number", "exported function");
verify.quickInfoIs("function m1.fooExport(): number", "exported function");
goTo.marker('6');
verify.currentSignatureHelpDocCommentIs("exported function");
goTo.marker('7');
verify.quickInfoIs("(var) myvar: m1.m2.c", "");
verify.quickInfoIs("var myvar: m1.m2.c", "");
goTo.marker('8');
verify.quickInfoIs("(constructor) m1.m2.c(): m1.m2.c", "");
verify.memberListContains("c", "(constructor) m1.m2.c(): m1.m2.c", "");
verify.memberListContains("i", "(var) m1.m2.i: m1.m2.c", "i");
verify.quickInfoIs("constructor m1.m2.c(): m1.m2.c", "");
verify.memberListContains("c", "constructor m1.m2.c(): m1.m2.c", "");
verify.memberListContains("i", "var m1.m2.i: m1.m2.c", "i");
goTo.marker('9');
verify.completionListContains("m2", "module m2", "");
@ -137,8 +137,8 @@ verify.memberListContains("m3", "module m2.m3");
verify.quickInfoIs("module m2.m3", "module comment of m2.m3");
goTo.marker('11');
verify.quickInfoIs("(constructor) m2.m3.c(): m2.m3.c", "");
verify.memberListContains("c", "(constructor) m2.m3.c(): m2.m3.c", "");
verify.quickInfoIs("constructor m2.m3.c(): m2.m3.c", "");
verify.memberListContains("c", "constructor m2.m3.c(): m2.m3.c", "");
goTo.marker('12');
verify.completionListContains("m3", "module m3", "");
@ -153,8 +153,8 @@ verify.memberListContains("m5", "module m3.m4.m5");
verify.quickInfoIs("module m3.m4.m5", "module comment of m3.m4.m5");
goTo.marker('15');
verify.quickInfoIs("(constructor) m3.m4.m5.c(): m3.m4.m5.c", "");
verify.memberListContains("c", "(constructor) m3.m4.m5.c(): m3.m4.m5.c", "");
verify.quickInfoIs("constructor m3.m4.m5.c(): m3.m4.m5.c", "");
verify.memberListContains("c", "constructor m3.m4.m5.c(): m3.m4.m5.c", "");
goTo.marker('16');
verify.completionListContains("m4", "module m4", "");
@ -173,8 +173,8 @@ verify.memberListContains("m7", "module m4.m5.m6.m7");
verify.quickInfoIs("module m4.m5.m6.m7", "");
goTo.marker('20');
verify.memberListContains("c", "(constructor) m4.m5.m6.m7.c(): m4.m5.m6.m7.c", "");
verify.quickInfoIs("(constructor) m4.m5.m6.m7.c(): m4.m5.m6.m7.c", "");
verify.memberListContains("c", "constructor m4.m5.m6.m7.c(): m4.m5.m6.m7.c", "");
verify.quickInfoIs("constructor m4.m5.m6.m7.c(): m4.m5.m6.m7.c", "");
goTo.marker('21');
verify.completionListContains("m5", "module m5");
@ -193,8 +193,8 @@ verify.memberListContains("m8", "module m5.m6.m7.m8");
verify.quickInfoIs("module m5.m6.m7.m8", "module m8 comment");
goTo.marker('25');
verify.memberListContains("c", "(constructor) m5.m6.m7.m8.c(): m5.m6.m7.m8.c", "");
verify.quickInfoIs("(constructor) m5.m6.m7.m8.c(): m5.m6.m7.m8.c", "");
verify.memberListContains("c", "constructor m5.m6.m7.m8.c(): m5.m6.m7.m8.c", "");
verify.quickInfoIs("constructor m5.m6.m7.m8.c(): m5.m6.m7.m8.c", "");
goTo.marker('26');
verify.completionListContains("m6", "module m6");
@ -209,8 +209,8 @@ verify.memberListContains("m8", "module m6.m7.m8");
verify.quickInfoIs("module m6.m7.m8", "");
goTo.marker('29');
verify.memberListContains("c", "(constructor) m6.m7.m8.c(): m6.m7.m8.c", "");
verify.quickInfoIs("(constructor) m6.m7.m8.c(): m6.m7.m8.c", "");
verify.memberListContains("c", "constructor m6.m7.m8.c(): m6.m7.m8.c", "");
verify.quickInfoIs("constructor m6.m7.m8.c(): m6.m7.m8.c", "");
goTo.marker('30');
verify.completionListContains("m7", "module m7");
@ -225,15 +225,15 @@ verify.memberListContains("m9", "module m7.m8.m9");
verify.quickInfoIs("module m7.m8.m9", "module m9 comment");
goTo.marker('33');
verify.memberListContains("c", "(constructor) m7.m8.m9.c(): m7.m8.m9.c", "");
verify.quickInfoIs("(constructor) m7.m8.m9.c(): m7.m8.m9.c", "");
verify.memberListContains("c", "constructor m7.m8.m9.c(): m7.m8.m9.c", "");
verify.quickInfoIs("constructor m7.m8.m9.c(): m7.m8.m9.c", "");
goTo.marker('34');
verify.completionListContains("c", 'class c', "");
verify.quickInfoIs('class c', "");
goTo.marker('35');
verify.quickInfoIs("(var) myComplexVal: number", "");
verify.quickInfoIs("var myComplexVal: number", "");
goTo.marker('36');
verify.quickInfoIs("module complexM", "");
@ -242,7 +242,7 @@ goTo.marker('37');
verify.quickInfoIs("module complexM.m2", "");
goTo.marker('38');
verify.quickInfoIs("(constructor) complexM.m2.c(): complexM.m2.c", "");
verify.quickInfoIs("constructor complexM.m2.c(): complexM.m2.c", "");
goTo.marker('39');
verify.quickInfoIs("(method) complexM.m2.c.foo2(): complexM.m1.c", "");

186
tests/cases/fourslash/commentsOverloads.ts
View File

@ -226,15 +226,15 @@
////foo(null);
goTo.marker('1');
verify.quickInfoIs("(function) f1(a: number): number (+1 overload)", "this is signature 1");
verify.quickInfoIs("function f1(a: number): number (+1 overload)", "this is signature 1");
goTo.marker('2');
verify.quickInfoIs("(function) f1(b: string): number (+1 overload)", "");
verify.quickInfoIs("function f1(b: string): number (+1 overload)", "");
goTo.marker('3');
verify.quickInfoIs("(function) f1(a: number): number (+1 overload)", "this is signature 1");
verify.quickInfoIs("function f1(a: number): number (+1 overload)", "this is signature 1");
goTo.marker('4q');
verify.quickInfoIs("(function) f1(b: string): number (+1 overload)", "");
verify.quickInfoIs("function f1(b: string): number (+1 overload)", "");
goTo.marker('o4q');
verify.quickInfoIs("(function) f1(a: number): number (+1 overload)", "this is signature 1");
verify.quickInfoIs("function f1(a: number): number (+1 overload)", "this is signature 1");
goTo.marker('4');
verify.currentSignatureHelpDocCommentIs("");
@ -244,15 +244,15 @@ verify.currentSignatureHelpDocCommentIs("this is signature 1");
verify.currentParameterHelpArgumentDocCommentIs("param a");
goTo.marker('5');
verify.quickInfoIs("(function) f2(a: number): number (+1 overload)", "");
verify.quickInfoIs("function f2(a: number): number (+1 overload)", "");
goTo.marker('6');
verify.quickInfoIs("(function) f2(b: string): number (+1 overload)", "this is signature 2");
verify.quickInfoIs("function f2(b: string): number (+1 overload)", "this is signature 2");
goTo.marker('7');
verify.quickInfoIs("(function) f2(a: number): number (+1 overload)", "");
verify.quickInfoIs("function f2(a: number): number (+1 overload)", "");
goTo.marker('8q');
verify.quickInfoIs("(function) f2(b: string): number (+1 overload)", "this is signature 2");
verify.quickInfoIs("function f2(b: string): number (+1 overload)", "this is signature 2");
goTo.marker('o8q');
verify.quickInfoIs("(function) f2(a: number): number (+1 overload)", "");
verify.quickInfoIs("function f2(a: number): number (+1 overload)", "");
goTo.marker('8');
verify.currentSignatureHelpDocCommentIs("this is signature 2");
@ -263,15 +263,15 @@ verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("param a");
goTo.marker('9');
verify.quickInfoIs("(function) f3(a: number): number (+1 overload)", "");
verify.quickInfoIs("function f3(a: number): number (+1 overload)", "");
goTo.marker('10');
verify.quickInfoIs("(function) f3(b: string): number (+1 overload)", "");
verify.quickInfoIs("function f3(b: string): number (+1 overload)", "");
goTo.marker('11');
verify.quickInfoIs("(function) f3(a: number): number (+1 overload)", "");
verify.quickInfoIs("function f3(a: number): number (+1 overload)", "");
goTo.marker('12q');
verify.quickInfoIs("(function) f3(b: string): number (+1 overload)", "");
verify.quickInfoIs("function f3(b: string): number (+1 overload)", "");
goTo.marker('o12q');
verify.quickInfoIs("(function) f3(a: number): number (+1 overload)", "");
verify.quickInfoIs("function f3(a: number): number (+1 overload)", "");
goTo.marker('12');
verify.currentSignatureHelpDocCommentIs("");
@ -282,15 +282,15 @@ verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('13');
verify.quickInfoIs("(function) f4(a: number): number (+1 overload)", "this is signature 4 - with number parameter");
verify.quickInfoIs("function f4(a: number): number (+1 overload)", "this is signature 4 - with number parameter");
goTo.marker('14');
verify.quickInfoIs("(function) f4(b: string): number (+1 overload)", "this is signature 4 - with string parameter");
verify.quickInfoIs("function f4(b: string): number (+1 overload)", "this is signature 4 - with string parameter");
goTo.marker('15');
verify.quickInfoIs("(function) f4(a: number): number (+1 overload)", "this is signature 4 - with number parameter");
verify.quickInfoIs("function f4(a: number): number (+1 overload)", "this is signature 4 - with number parameter");
goTo.marker('16q');
verify.quickInfoIs("(function) f4(b: string): number (+1 overload)", "this is signature 4 - with string parameter");
verify.quickInfoIs("function f4(b: string): number (+1 overload)", "this is signature 4 - with string parameter");
goTo.marker('o16q');
verify.quickInfoIs("(function) f4(a: number): number (+1 overload)", "this is signature 4 - with number parameter");
verify.quickInfoIs("function f4(a: number): number (+1 overload)", "this is signature 4 - with number parameter");
goTo.marker('16');
verify.currentSignatureHelpDocCommentIs("this is signature 4 - with string parameter");
@ -301,44 +301,44 @@ verify.currentSignatureHelpDocCommentIs("this is signature 4 - with number param
verify.currentParameterHelpArgumentDocCommentIs("param a");
goTo.marker('17');
verify.completionListContains('f1', '(function) f1(a: number): number (+1 overload)', 'this is signature 1');
verify.completionListContains('f2', '(function) f2(a: number): number (+1 overload)', '');
verify.completionListContains('f3', '(function) f3(a: number): number (+1 overload)', '');
verify.completionListContains('f4', '(function) f4(a: number): number (+1 overload)', 'this is signature 4 - with number parameter');
verify.completionListContains('f1', 'function f1(a: number): number (+1 overload)', 'this is signature 1');
verify.completionListContains('f2', 'function f2(a: number): number (+1 overload)', '');
verify.completionListContains('f3', 'function f3(a: number): number (+1 overload)', '');
verify.completionListContains('f4', 'function f4(a: number): number (+1 overload)', 'this is signature 4 - with number parameter');
goTo.marker('18');
verify.completionListContains('i1', 'interface i1', '');
verify.completionListContains('i1_i', '(var) i1_i: new i1(b: number) => any (+1 overload)', '');
verify.completionListContains('i1_i', 'var i1_i: new i1(b: number) => any (+1 overload)', '');
verify.completionListContains('i2', 'interface i2', '');
verify.completionListContains('i2_i', '(var) i2_i: new i2(a: string) => any (+1 overload)', '');
verify.completionListContains('i2_i', 'var i2_i: new i2(a: string) => any (+1 overload)', '');
verify.completionListContains('i3', 'interface i3', '');
verify.completionListContains('i3_i', '(var) i3_i: new i3(a: string) => any (+1 overload)', 'new 1');
verify.completionListContains('i3_i', 'var i3_i: new i3(a: string) => any (+1 overload)', 'new 1');
verify.completionListContains('i4', 'interface i4', '');
verify.completionListContains('i4_i', '(var) i4_i: new i4(a: string) => any (+1 overload)', '');
verify.completionListContains('i4_i', 'var i4_i: new i4(a: string) => any (+1 overload)', '');
goTo.marker('19');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('19q');
verify.quickInfoIs("(var) i1_i: new i1(b: number) => any (+1 overload)", "");
verify.quickInfoIs("var i1_i: new i1(b: number) => any (+1 overload)", "");
goTo.marker('20');
verify.currentSignatureHelpDocCommentIs("new 1");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('20q');
verify.quickInfoIs("(var) i1_i: new i1(a: string) => any (+1 overload)", "new 1");
verify.quickInfoIs("var i1_i: new i1(a: string) => any (+1 overload)", "new 1");
goTo.marker('21');
verify.currentSignatureHelpDocCommentIs("this signature 1");
verify.currentParameterHelpArgumentDocCommentIs("param a");
goTo.marker('21q');
verify.quickInfoIs("(var) i1_i: i1(a: number) => number (+1 overload)", "this signature 1");
verify.quickInfoIs("var i1_i: i1(a: number) => number (+1 overload)", "this signature 1");
goTo.marker('22');
verify.currentSignatureHelpDocCommentIs("this is signature 2");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('22q');
verify.quickInfoIs("(var) i1_i: i1(b: string) => number (+1 overload)", "this is signature 2");
verify.quickInfoIs("var i1_i: i1(b: string) => number (+1 overload)", "this is signature 2");
goTo.marker('23');
verify.memberListContains('foo', '(method) i1.foo(a: number): number (+1 overload)', 'foo 1');
@ -398,73 +398,73 @@ goTo.marker('32');
verify.currentSignatureHelpDocCommentIs("new 2");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('32q');
verify.quickInfoIs("(var) i2_i: new i2(b: number) => any (+1 overload)", "new 2");
verify.quickInfoIs("var i2_i: new i2(b: number) => any (+1 overload)", "new 2");
goTo.marker('33');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('33q');
verify.quickInfoIs("(var) i2_i: new i2(a: string) => any (+1 overload)", "");
verify.quickInfoIs("var i2_i: new i2(a: string) => any (+1 overload)", "");
goTo.marker('34');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('34q');
verify.quickInfoIs("(var) i2_i: i2(a: number) => number (+1 overload)", "");
verify.quickInfoIs("var i2_i: i2(a: number) => number (+1 overload)", "");
goTo.marker('35');
verify.currentSignatureHelpDocCommentIs("this is signature 2");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('35q');
verify.quickInfoIs("(var) i2_i: i2(b: string) => number (+1 overload)", "this is signature 2");
verify.quickInfoIs("var i2_i: i2(b: string) => number (+1 overload)", "this is signature 2");
goTo.marker('36');
verify.currentSignatureHelpDocCommentIs("new 2");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('36q');
verify.quickInfoIs("(var) i3_i: new i3(b: number) => any (+1 overload)", "new 2");
verify.quickInfoIs("var i3_i: new i3(b: number) => any (+1 overload)", "new 2");
goTo.marker('37');
verify.currentSignatureHelpDocCommentIs("new 1");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('37q');
verify.quickInfoIs("(var) i3_i: new i3(a: string) => any (+1 overload)", "new 1");
verify.quickInfoIs("var i3_i: new i3(a: string) => any (+1 overload)", "new 1");
goTo.marker('38');
verify.currentSignatureHelpDocCommentIs("this is signature 1");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('38q');
verify.quickInfoIs("(var) i3_i: i3(a: number) => number (+1 overload)", "this is signature 1");
verify.quickInfoIs("var i3_i: i3(a: number) => number (+1 overload)", "this is signature 1");
goTo.marker('39');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('39q');
verify.quickInfoIs("(var) i3_i: i3(b: string) => number (+1 overload)", "");
verify.quickInfoIs("var i3_i: i3(b: string) => number (+1 overload)", "");
goTo.marker('40');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('40q');
verify.quickInfoIs("(var) i4_i: new i4(b: number) => any (+1 overload)", "");
verify.quickInfoIs("var i4_i: new i4(b: number) => any (+1 overload)", "");
goTo.marker('41');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('41q');
verify.quickInfoIs("(var) i4_i: new i4(a: string) => any (+1 overload)", "");
verify.quickInfoIs("var i4_i: new i4(a: string) => any (+1 overload)", "");
goTo.marker('42');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('42q');
verify.quickInfoIs("(var) i4_i: i4(a: number) => number (+1 overload)", "");
verify.quickInfoIs("var i4_i: i4(a: number) => number (+1 overload)", "");
goTo.marker('43');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('43q');
verify.quickInfoIs("(var) i4_i: i4(b: string) => number (+1 overload)", "");
verify.quickInfoIs("var i4_i: i4(b: string) => number (+1 overload)", "");
goTo.marker('44');
verify.memberListContains('prop1', '(method) c.prop1(a: number): number (+1 overload)', '');
@ -537,61 +537,61 @@ goTo.marker('55');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('55q');
verify.quickInfoIs("(constructor) c1(a: number): c1 (+1 overload)", "");
verify.quickInfoIs("constructor c1(a: number): c1 (+1 overload)", "");
goTo.marker('56');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('56q');
verify.quickInfoIs("(constructor) c1(b: string): c1 (+1 overload)", "");
verify.quickInfoIs("constructor c1(b: string): c1 (+1 overload)", "");
goTo.marker('57');
verify.currentSignatureHelpDocCommentIs("c2 1");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('57q');
verify.quickInfoIs("(constructor) c2(a: number): c2 (+1 overload)", "c2 1");
verify.quickInfoIs("constructor c2(a: number): c2 (+1 overload)", "c2 1");
goTo.marker('58');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('58q');
verify.quickInfoIs("(constructor) c2(b: string): c2 (+1 overload)", "");
verify.quickInfoIs("constructor c2(b: string): c2 (+1 overload)", "");
goTo.marker('59');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('59q');
verify.quickInfoIs("(constructor) c3(a: number): c3 (+1 overload)", "");
verify.quickInfoIs("constructor c3(a: number): c3 (+1 overload)", "");
goTo.marker('60');
verify.currentSignatureHelpDocCommentIs("c3 2");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('60q');
verify.quickInfoIs("(constructor) c3(b: string): c3 (+1 overload)", "c3 2");
verify.quickInfoIs("constructor c3(b: string): c3 (+1 overload)", "c3 2");
goTo.marker('61');
verify.currentSignatureHelpDocCommentIs("c4 1");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('61q');
verify.quickInfoIs("(constructor) c4(a: number): c4 (+1 overload)", "c4 1");
verify.quickInfoIs("constructor c4(a: number): c4 (+1 overload)", "c4 1");
goTo.marker('62');
verify.currentSignatureHelpDocCommentIs("c4 2");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('62q');
verify.quickInfoIs("(constructor) c4(b: string): c4 (+1 overload)", "c4 2");
verify.quickInfoIs("constructor c4(b: string): c4 (+1 overload)", "c4 2");
goTo.marker('63');
verify.currentSignatureHelpDocCommentIs("c5 1");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('63q');
verify.quickInfoIs("(constructor) c5(a: number): c5 (+1 overload)", "c5 1");
verify.quickInfoIs("constructor c5(a: number): c5 (+1 overload)", "c5 1");
goTo.marker('64');
verify.currentSignatureHelpDocCommentIs("c5 2");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('64q');
verify.quickInfoIs("(constructor) c5(b: string): c5 (+1 overload)", "c5 2");
verify.quickInfoIs("constructor c5(b: string): c5 (+1 overload)", "c5 2");
goTo.marker('65');
verify.completionListContains("c", "class c", "");
@ -600,92 +600,92 @@ verify.completionListContains("c2", "class c2", "");
verify.completionListContains("c3", "class c3", "");
verify.completionListContains("c4", "class c4", "");
verify.completionListContains("c5", "class c5", "");
verify.completionListContains("c_i", "(var) c_i: c", "");
verify.completionListContains("c1_i_1", "(var) c1_i_1: c1", "");
verify.completionListContains("c2_i_1", "(var) c2_i_1: c2", "");
verify.completionListContains("c3_i_1", "(var) c3_i_1: c3", "");
verify.completionListContains("c4_i_1", "(var) c4_i_1: c4", "");
verify.completionListContains("c5_i_1", "(var) c5_i_1: c5", "");
verify.completionListContains("c1_i_2", "(var) c1_i_2: c1", "");
verify.completionListContains("c2_i_2", "(var) c2_i_2: c2", "");
verify.completionListContains("c3_i_2", "(var) c3_i_2: c3", "");
verify.completionListContains("c4_i_2", "(var) c4_i_2: c4", "");
verify.completionListContains("c5_i_2", "(var) c5_i_2: c5", "");
verify.completionListContains('multiOverload', '(function) multiOverload(a: number): string (+2 overloads)', 'This is multiOverload F1 1');
verify.completionListContains('ambientF1', '(function) ambientF1(a: number): string (+2 overloads)', 'This is ambient F1 1');
verify.completionListContains("c_i", "var c_i: c", "");
verify.completionListContains("c1_i_1", "var c1_i_1: c1", "");
verify.completionListContains("c2_i_1", "var c2_i_1: c2", "");
verify.completionListContains("c3_i_1", "var c3_i_1: c3", "");
verify.completionListContains("c4_i_1", "var c4_i_1: c4", "");
verify.completionListContains("c5_i_1", "var c5_i_1: c5", "");
verify.completionListContains("c1_i_2", "var c1_i_2: c1", "");
verify.completionListContains("c2_i_2", "var c2_i_2: c2", "");
verify.completionListContains("c3_i_2", "var c3_i_2: c3", "");
verify.completionListContains("c4_i_2", "var c4_i_2: c4", "");
verify.completionListContains("c5_i_2", "var c5_i_2: c5", "");
verify.completionListContains('multiOverload', 'function multiOverload(a: number): string (+2 overloads)', 'This is multiOverload F1 1');
verify.completionListContains('ambientF1', 'function ambientF1(a: number): string (+2 overloads)', 'This is ambient F1 1');
goTo.marker('66');
verify.quickInfoIs("(var) c1_i_1: c1", "");
verify.quickInfoIs("var c1_i_1: c1", "");
goTo.marker('67');
verify.quickInfoIs("(var) c2_i_2: c2", "");
verify.quickInfoIs("var c2_i_2: c2", "");
goTo.marker('68');
verify.quickInfoIs("(var) c3_i_2: c3", "");
verify.quickInfoIs("var c3_i_2: c3", "");
goTo.marker('69');
verify.quickInfoIs("(var) c4_i_1: c4", "");
verify.quickInfoIs("var c4_i_1: c4", "");
goTo.marker('70');
verify.quickInfoIs("(var) c5_i_1: c5", "");
verify.quickInfoIs("var c5_i_1: c5", "");
goTo.marker('71');
verify.quickInfoIs("(function) multiOverload(a: number): string (+2 overloads)", "This is multiOverload F1 1");
verify.quickInfoIs("function multiOverload(a: number): string (+2 overloads)", "This is multiOverload F1 1");
goTo.marker('72');
verify.quickInfoIs("(function) multiOverload(b: string): string (+2 overloads)", "This is multiOverload F1 2");
verify.quickInfoIs("function multiOverload(b: string): string (+2 overloads)", "This is multiOverload F1 2");
goTo.marker('73');
verify.quickInfoIs("(function) multiOverload(c: boolean): string (+2 overloads)", "This is multiOverload F1 3");
verify.quickInfoIs("function multiOverload(c: boolean): string (+2 overloads)", "This is multiOverload F1 3");
goTo.marker('74');
verify.quickInfoIs("(function) ambientF1(a: number): string (+2 overloads)", "This is ambient F1 1");
verify.quickInfoIs("function ambientF1(a: number): string (+2 overloads)", "This is ambient F1 1");
goTo.marker('75');
verify.quickInfoIs("(function) ambientF1(b: string): string (+2 overloads)", "This is ambient F1 2");
verify.quickInfoIs("function ambientF1(b: string): string (+2 overloads)", "This is ambient F1 2");
goTo.marker('76');
verify.quickInfoIs("(function) ambientF1(c: boolean): boolean (+2 overloads)", "This is ambient F1 3");
verify.quickInfoIs("function ambientF1(c: boolean): boolean (+2 overloads)", "This is ambient F1 3");
goTo.marker('77');
verify.quickInfoIs("(parameter) aa: i3", "");
goTo.marker('78');
verify.quickInfoIs("(constructor) c1(a: number): c1 (+1 overload)", "");
verify.quickInfoIs("constructor c1(a: number): c1 (+1 overload)", "");
goTo.marker('79');
verify.quickInfoIs("(constructor) c1(b: string): c1 (+1 overload)", "");
verify.quickInfoIs("constructor c1(b: string): c1 (+1 overload)", "");
goTo.marker('80');
verify.quickInfoIs("(constructor) c1(a: number): c1 (+1 overload)", "");
verify.quickInfoIs("constructor c1(a: number): c1 (+1 overload)", "");
goTo.marker('81');
verify.quickInfoIs("(constructor) c2(a: number): c2 (+1 overload)", "c2 1");
verify.quickInfoIs("constructor c2(a: number): c2 (+1 overload)", "c2 1");
goTo.marker('82');
verify.quickInfoIs("(constructor) c2(b: string): c2 (+1 overload)", "");
verify.quickInfoIs("constructor c2(b: string): c2 (+1 overload)", "");
goTo.marker('83');
verify.quickInfoIs("(constructor) c2(a: number): c2 (+1 overload)", "c2 1");
verify.quickInfoIs("constructor c2(a: number): c2 (+1 overload)", "c2 1");
goTo.marker('84');
verify.quickInfoIs("(constructor) c3(a: number): c3 (+1 overload)", "");
verify.quickInfoIs("constructor c3(a: number): c3 (+1 overload)", "");
goTo.marker('85');
verify.quickInfoIs("(constructor) c3(b: string): c3 (+1 overload)", "c3 2");
verify.quickInfoIs("constructor c3(b: string): c3 (+1 overload)", "c3 2");
goTo.marker('86');
verify.quickInfoIs("(constructor) c3(a: number): c3 (+1 overload)", "");
verify.quickInfoIs("constructor c3(a: number): c3 (+1 overload)", "");
goTo.marker('87');
verify.quickInfoIs("(constructor) c4(a: number): c4 (+1 overload)", "c4 1");
verify.quickInfoIs("constructor c4(a: number): c4 (+1 overload)", "c4 1");
goTo.marker('88');
verify.quickInfoIs("(constructor) c4(b: string): c4 (+1 overload)", "c4 2");
verify.quickInfoIs("constructor c4(b: string): c4 (+1 overload)", "c4 2");
goTo.marker('89');
verify.quickInfoIs("(constructor) c4(a: number): c4 (+1 overload)", "c4 1");
verify.quickInfoIs("constructor c4(a: number): c4 (+1 overload)", "c4 1");
goTo.marker('90');
verify.quickInfoIs("(constructor) c5(a: number): c5 (+1 overload)", "c5 1");
verify.quickInfoIs("constructor c5(a: number): c5 (+1 overload)", "c5 1");
goTo.marker('91');
verify.quickInfoIs("(constructor) c5(b: string): c5 (+1 overload)", "c5 2");
verify.quickInfoIs("constructor c5(b: string): c5 (+1 overload)", "c5 2");
goTo.marker('92');
verify.quickInfoIs("(constructor) c5(a: number): c5 (+1 overload)", "c5 1");
verify.quickInfoIs("constructor c5(a: number): c5 (+1 overload)", "c5 1");
goTo.marker('93');
verify.quickInfoIs("(method) c.prop1(a: number): number (+1 overload)", "");

38
tests/cases/fourslash/commentsVariables.ts
View File

@ -42,59 +42,59 @@
////var x = fo/*15*/o2;
goTo.marker('1');
verify.quickInfoIs("(var) myVariable: number", "This is my variable");
verify.quickInfoIs("var myVariable: number", "This is my variable");
goTo.marker('2');
verify.completionListContains("myVariable", "(var) myVariable: number", "This is my variable");
verify.completionListContains("myVariable", "var myVariable: number", "This is my variable");
goTo.marker('3');
verify.completionListContains("myVariable", "(var) myVariable: number", "This is my variable");
verify.completionListContains("d", "(var) d: number", "d variable");
verify.completionListContains("myVariable", "var myVariable: number", "This is my variable");
verify.completionListContains("d", "var d: number", "d variable");
goTo.marker('4');
verify.completionListContains("foo", "(function) foo(): void", "foos comment");
verify.completionListContains("fooVar", "(var) fooVar: () => void", "fooVar comment");
verify.completionListContains("foo", "function foo(): void", "foos comment");
verify.completionListContains("fooVar", "var fooVar: () => void", "fooVar comment");
goTo.marker('5');
verify.currentSignatureHelpDocCommentIs("foos comment");
goTo.marker('5q');
verify.quickInfoIs("(function) foo(): void", "foos comment");
verify.quickInfoIs("function foo(): void", "foos comment");
goTo.marker('6');
verify.currentSignatureHelpDocCommentIs("");
goTo.marker('6q');
verify.quickInfoIs("(var) fooVar: () => void", "");
verify.quickInfoIs("var fooVar: () => void", "");
goTo.marker('7');
verify.completionListContains("foo", "(function) foo(): void", "foos comment");
verify.completionListContains("fooVar", "(var) fooVar: () => void", "fooVar comment");
verify.completionListContains("foo", "function foo(): void", "foos comment");
verify.completionListContains("fooVar", "var fooVar: () => void", "fooVar comment");
goTo.marker('8');
verify.currentSignatureHelpDocCommentIs("foos comment");
goTo.marker('8q');
verify.quickInfoIs("(function) foo(): void", "foos comment");
verify.quickInfoIs("function foo(): void", "foos comment");
goTo.marker('9');
verify.currentSignatureHelpDocCommentIs("");
goTo.marker('9q');
verify.quickInfoIs("(var) fooVar: () => void", "");
verify.quickInfoIs("var fooVar: () => void", "");
goTo.marker('9aq');
verify.quickInfoIs("(var) fooVar: () => void", "fooVar comment");
verify.quickInfoIs("var fooVar: () => void", "fooVar comment");
goTo.marker('10');
verify.completionListContains("i", "(var) i: c", "instance comment");
verify.completionListContains("i", "var i: c", "instance comment");
goTo.marker('11');
verify.completionListContains("i1_i", "(var) i1_i: i1", "interface instance comments");
verify.completionListContains("i1_i", "var i1_i: i1", "interface instance comments");
goTo.marker('12');
verify.quickInfoIs("(var) fooVar: () => void", "fooVar comment");
verify.quickInfoIs("var fooVar: () => void", "fooVar comment");
goTo.marker('13');
verify.quickInfoIs("(var) fooVar: () => void", "fooVar comment");
verify.quickInfoIs("var fooVar: () => void", "fooVar comment");
goTo.marker('14');
verify.quickInfoIs("(function) foo(): void", "foos comment");
verify.quickInfoIs("function foo(): void", "foos comment");
goTo.marker('15');
verify.quickInfoIs("(function) foo2(a: number): void (+1 overload)", "");
verify.quickInfoIs("function foo2(a: number): void (+1 overload)", "");

2
tests/cases/fourslash/completionEntryForConst.ts
View File

@ -4,4 +4,4 @@
/////**/
goTo.marker();
verify.completionListContains("c", "(const) c: string", /*documentation*/ undefined, "const");
verify.completionListContains("c", "const c: string", /*documentation*/ undefined, "const");

2
tests/cases/fourslash/completionListForGenericInstance1.ts
View File

@ -7,4 +7,4 @@
////i/**/
goTo.marker();
verify.completionListContains('i', '(var) i: Iterator<string, number>');
verify.completionListContains('i', 'var i: Iterator<string, number>');

2
tests/cases/fourslash/completionListInNamedFunctionExpression.ts
View File

@ -27,4 +27,4 @@ goTo.marker("referenceInsideFunctionExpression");
verify.quickInfoIs("(local function) foo(): number");
goTo.marker("referenceInGlobalScope");
verify.quickInfoIs("(function) foo(a: number): string");
verify.quickInfoIs("function foo(a: number): string");

2
tests/cases/fourslash/completionListOnPrivateVariableInModule.ts
View File

@ -3,4 +3,4 @@
//// module Foo { var testing = ""; test/**/ }
goTo.marker();
verify.completionListContains('testing', '(var) testing: string');
verify.completionListContains('testing', 'var testing: string');

12
tests/cases/fourslash/completionListWithModulesFromModule.ts
View File

@ -278,16 +278,16 @@ function goToMarkAndVerifyShadow()
// from a shadow module with no export
goTo.marker('shadowModuleWithNoExport');
verify.completionListContains('shwvar', '(var) shwvar: string');
verify.completionListContains('shwfn', '(function) shwfn(shadow: any): void');
verify.completionListContains('shwvar', 'var shwvar: string');
verify.completionListContains('shwfn', 'function shwfn(shadow: any): void');
verify.completionListContains('shwcls', 'class shwcls');
verify.completionListContains('shwint', 'interface shwint');
goToMarkAndVerifyShadow();
// from a shadow module with export
goTo.marker('shadowModuleWithExport');
verify.completionListContains('shwvar', '(var) mod4.shwvar: string');
verify.completionListContains('shwfn', '(function) mod4.shwfn(shadow: any): void');
verify.completionListContains('shwvar', 'var mod4.shwvar: string');
verify.completionListContains('shwfn', 'function mod4.shwfn(shadow: any): void');
verify.completionListContains('shwcls', 'class mod4.shwcls');
verify.completionListContains('shwint', 'interface mod4.shwint');
goToMarkAndVerifyShadow();
@ -297,8 +297,8 @@ goTo.marker('moduleWithImport');
verify.completionListContains('mod1', 'module mod1');
verify.completionListContains('mod2', 'module mod2');
verify.completionListContains('mod3', 'module mod3');
verify.completionListContains('shwvar', '(var) shwvar: number');
verify.completionListContains('shwfn', '(function) shwfn(): void');
verify.completionListContains('shwvar', 'var shwvar: number');
verify.completionListContains('shwfn', 'function shwfn(): void');
verify.completionListContains('shwcls', 'class shwcls');
verify.completionListContains('shwint', 'interface shwint');

40
tests/cases/fourslash/completionListWithModulesInsideModuleScope.ts
View File

@ -229,21 +229,21 @@ function goToMarkAndGeneralVerify(marker: string)
{
goTo.marker(marker);
verify.completionListContains('mod1var', '(var) mod1var: number');
verify.completionListContains('mod1fn', '(function) mod1fn(): void');
verify.completionListContains('mod1var', 'var mod1var: number');
verify.completionListContains('mod1fn', 'function mod1fn(): void');
verify.completionListContains('mod1cls', 'class mod1cls');
verify.completionListContains('mod1int', 'interface mod1int');
verify.completionListContains('mod1mod', 'module mod1mod');
verify.completionListContains('mod1evar', '(var) mod1.mod1evar: number');
verify.completionListContains('mod1efn', '(function) mod1.mod1efn(): void');
verify.completionListContains('mod1evar', 'var mod1.mod1evar: number');
verify.completionListContains('mod1efn', 'function mod1.mod1efn(): void');
verify.completionListContains('mod1ecls', 'class mod1.mod1ecls');
verify.completionListContains('mod1eint', 'interface mod1.mod1eint');
verify.completionListContains('mod1emod', 'module mod1.mod1emod');
verify.completionListContains('mod1eexvar', '(var) mod1.mod1eexvar: number');
verify.completionListContains('mod1eexvar', 'var mod1.mod1eexvar: number');
verify.completionListContains('mod2', 'module mod2');
verify.completionListContains('mod3', 'module mod3');
verify.completionListContains('shwvar', '(var) shwvar: number');
verify.completionListContains('shwfn', '(function) shwfn(): void');
verify.completionListContains('shwvar', 'var shwvar: number');
verify.completionListContains('shwfn', 'function shwfn(): void');
verify.completionListContains('shwcls', 'class shwcls');
verify.completionListContains('shwint', 'interface shwint');
@ -289,13 +289,13 @@ goToMarkAndGeneralVerify('interface');
// from module in mod1
goToMarkAndGeneralVerify('module');
verify.completionListContains('m1X', '(var) m1X: number');
verify.completionListContains('m1Func', '(function) m1Func(): void');
verify.completionListContains('m1X', 'var m1X: number');
verify.completionListContains('m1Func', 'function m1Func(): void');
verify.completionListContains('m1Class', 'class m1Class');
verify.completionListContains('m1Int', 'interface m1Int');
verify.completionListContains('m1Mod', 'module m1Mod');
verify.completionListContains('m1eX', '(var) mod1mod.m1eX: number');
verify.completionListContains('m1eFunc', '(function) mod1mod.m1eFunc(): void');
verify.completionListContains('m1eX', 'var mod1mod.m1eX: number');
verify.completionListContains('m1eFunc', 'function mod1mod.m1eFunc(): void');
verify.completionListContains('m1eClass', 'class mod1mod.m1eClass');
verify.completionListContains('m1eInt', 'interface mod1mod.m1eInt');
verify.completionListContains('m1eMod', 'module mod1mod.m1eMod');
@ -315,29 +315,29 @@ goToMarkAndGeneralVerify('exportedInterface');
// from exported module in mod1
goToMarkAndGeneralVerify('exportedModule');
verify.completionListContains('mX', '(var) mX: number');
verify.completionListContains('mFunc', '(function) mFunc(): void');
verify.completionListContains('mX', 'var mX: number');
verify.completionListContains('mFunc', 'function mFunc(): void');
verify.completionListContains('mClass', 'class mClass');
verify.completionListContains('mInt', 'interface mInt');
verify.completionListContains('mMod', 'module mMod');
verify.completionListContains('meX', '(var) mod1.mod1emod.meX: number');
verify.completionListContains('meFunc', '(function) mod1.mod1emod.meFunc(): void');
verify.completionListContains('meX', 'var mod1.mod1emod.meX: number');
verify.completionListContains('meFunc', 'function mod1.mod1emod.meFunc(): void');
verify.completionListContains('meClass', 'class mod1.mod1emod.meClass');
verify.completionListContains('meInt', 'interface mod1.mod1emod.meInt');
verify.completionListContains('meMod', 'module mod1.mod1emod.meMod');
// from extended module
goTo.marker('extendedModule');
verify.completionListContains('mod1evar', '(var) mod1.mod1evar: number');
verify.completionListContains('mod1efn', '(function) mod1.mod1efn(): void');
verify.completionListContains('mod1evar', 'var mod1.mod1evar: number');
verify.completionListContains('mod1efn', 'function mod1.mod1efn(): void');
verify.completionListContains('mod1ecls', 'class mod1.mod1ecls');
verify.completionListContains('mod1eint', 'interface mod1.mod1eint');
verify.completionListContains('mod1emod', 'module mod1.mod1emod');
verify.completionListContains('mod1eexvar', '(var) mod1.mod1eexvar: number');
verify.completionListContains('mod1eexvar', 'var mod1.mod1eexvar: number');
verify.completionListContains('mod2', 'module mod2');
verify.completionListContains('mod3', 'module mod3');
verify.completionListContains('shwvar', '(var) shwvar: number');
verify.completionListContains('shwfn', '(function) shwfn(): void');
verify.completionListContains('shwvar', 'var shwvar: number');
verify.completionListContains('shwfn', 'function shwfn(): void');
verify.completionListContains('shwcls', 'class shwcls');
verify.completionListContains('shwint', 'interface shwint');

4
tests/cases/fourslash/completionListWithModulesOutsideModuleScope.ts
View File

@ -263,8 +263,8 @@ goToMarkAndGeneralVerify('global');
verify.completionListContains('mod1', 'module mod1');
verify.completionListContains('mod2', 'module mod2');
verify.completionListContains('mod3', 'module mod3');
verify.completionListContains('shwvar', '(var) shwvar: number');
verify.completionListContains('shwfn', '(function) shwfn(): void');
verify.completionListContains('shwvar', 'var shwvar: number');
verify.completionListContains('shwfn', 'function shwfn(): void');
verify.completionListContains('shwcls', 'class shwcls');
verify.completionListContains('shwint', 'interface shwint');

4
tests/cases/fourslash/completionListWithModulesOutsideModuleScope2.ts
View File

@ -238,8 +238,8 @@ function goToMarkerAndVerify(marker: string)
verify.completionListContains('mod1');
verify.completionListContains('mod2');
verify.completionListContains('mod3');
verify.completionListContains('shwvar', '(var) shwvar: number');
verify.completionListContains('shwfn', '(function) shwfn(): void');
verify.completionListContains('shwvar', 'var shwvar: number');
verify.completionListContains('shwfn', 'function shwfn(): void');
verify.completionListContains('shwcls', 'class shwcls');
verify.completionListContains('shwint', 'interface shwint');

26
tests/cases/fourslash/constQuickInfoAndCompletionList.ts
View File

@ -10,28 +10,28 @@
//// /*7*/
////}
goTo.marker('1');
verify.quickInfoIs("(const) a: number");
verify.quickInfoIs("const a: number");
goTo.marker('2');
verify.completionListContains("a", "(const) a: number");
verify.quickInfoIs("(const) a: number");
verify.completionListContains("a", "const a: number");
verify.quickInfoIs("const a: number");
goTo.marker('3');
verify.completionListContains("a", "(const) a: number");
verify.completionListContains("a", "const a: number");
goTo.marker('4');
verify.quickInfoIs("(const) b: number");
verify.quickInfoIs("const b: number");
goTo.marker('5');
verify.completionListContains("a", "(const) a: number");
verify.completionListContains("b", "(const) b: number");
verify.quickInfoIs("(const) b: number");
verify.completionListContains("a", "const a: number");
verify.completionListContains("b", "const b: number");
verify.quickInfoIs("const b: number");
goTo.marker('6');
verify.completionListContains("a", "(const) a: number");
verify.completionListContains("b", "(const) b: number");
verify.quickInfoIs("(const) a: number");
verify.completionListContains("a", "const a: number");
verify.completionListContains("b", "const b: number");
verify.quickInfoIs("const a: number");
goTo.marker('7');
verify.completionListContains("a", "(const) a: number");
verify.completionListContains("b", "(const) b: number");
verify.completionListContains("a", "const a: number");
verify.completionListContains("b", "const b: number");

6
tests/cases/fourslash/constructorQuickInfo.ts
View File

@ -7,10 +7,10 @@
////var x/*3*/3 = new SS;
goTo.marker('1');
verify.quickInfoIs('(var) x1: SS<number>');
verify.quickInfoIs('var x1: SS<number>');
goTo.marker('2');
verify.quickInfoIs('(var) x2: SS<{}>');
verify.quickInfoIs('var x2: SS<{}>');
goTo.marker('3');
verify.quickInfoIs('(var) x3: SS<{}>');
verify.quickInfoIs('var x3: SS<{}>');

72
tests/cases/fourslash/contextualTyping.ts
View File

@ -204,55 +204,55 @@ verify.quickInfoIs("(parameter) i: number");
goTo.marker('3');
verify.quickInfoIs("(parameter) i: number");
goTo.marker('4');
verify.quickInfoIs("(var) C2T5.foo: (i: number, s: string) => number");
verify.quickInfoIs("var C2T5.foo: (i: number, s: string) => number");
goTo.marker('5');
verify.quickInfoIs("(parameter) i: number");
goTo.marker('6');
verify.quickInfoIs("(parameter) i: number");
goTo.marker('7');
verify.quickInfoIs("(var) c3t1: (s: string) => string");
verify.quickInfoIs("var c3t1: (s: string) => string");
goTo.marker('8');
verify.quickInfoIs("(parameter) s: string");
goTo.marker('9');
verify.quickInfoIs("(parameter) s: string");
goTo.marker('10');
verify.quickInfoIs("(var) c3t2: IFoo");
verify.quickInfoIs("var c3t2: IFoo");
goTo.marker('11');
verify.quickInfoIs("(var) c3t3: number[]");
verify.quickInfoIs("var c3t3: number[]");
goTo.marker('12');
verify.quickInfoIs("(var) c3t4: () => IFoo");
verify.quickInfoIs("var c3t4: () => IFoo");
goTo.marker('13');
verify.quickInfoIs("(var) c3t5: (n: number) => IFoo");
verify.quickInfoIs("var c3t5: (n: number) => IFoo");
goTo.marker('14');
verify.quickInfoIs("(parameter) n: number");
goTo.marker('15');
verify.quickInfoIs("(var) c3t6: (n: number, s: string) => IFoo");
verify.quickInfoIs("var c3t6: (n: number, s: string) => IFoo");
goTo.marker('16');
verify.quickInfoIs("(parameter) n: number");
goTo.marker('17');
verify.quickInfoIs("(parameter) s: string");
goTo.marker('18');
verify.quickInfoIs("(var) c3t7: {\n (n: number): number;\n (s1: string): number;\n}");
verify.quickInfoIs("var c3t7: {\n (n: number): number;\n (s1: string): number;\n}");
goTo.marker('20');
verify.quickInfoIs("(var) c3t8: (n: number, s: string) => number");
verify.quickInfoIs("var c3t8: (n: number, s: string) => number");
goTo.marker('21');
verify.quickInfoIs("(parameter) n: number");
goTo.marker('22');
verify.quickInfoIs("(var) c3t9: number[][]");
verify.quickInfoIs("var c3t9: number[][]");
goTo.marker('23');
verify.quickInfoIs("(var) c3t10: IFoo[]");
verify.quickInfoIs("var c3t10: IFoo[]");
goTo.marker('24');
verify.quickInfoIs("(var) c3t11: ((n: number, s: string) => string)[]");
verify.quickInfoIs("var c3t11: ((n: number, s: string) => string)[]");
goTo.marker('25');
verify.quickInfoIs("(parameter) n: number");
goTo.marker('26');
verify.quickInfoIs("(parameter) s: string");
goTo.marker('27');
verify.quickInfoIs("(var) c3t12: IBar");
verify.quickInfoIs("var c3t12: IBar");
goTo.marker('28');
verify.quickInfoIs("(property) foo: IFoo");
goTo.marker('29');
verify.quickInfoIs("(var) c3t13: IFoo");
verify.quickInfoIs("var c3t13: IFoo");
goTo.marker('30');
verify.quickInfoIs("(property) f: (i: number, s: string) => string");
goTo.marker('31');
@ -260,7 +260,7 @@ verify.quickInfoIs("(parameter) i: number");
goTo.marker('32');
verify.quickInfoIs("(parameter) s: string");
goTo.marker('33');
verify.quickInfoIs("(var) c3t14: IFoo");
verify.quickInfoIs("var c3t14: IFoo");
goTo.marker('34');
verify.quickInfoIs("(property) a: undefined[]");
goTo.marker('35');
@ -270,19 +270,19 @@ verify.quickInfoIs("(parameter) i: number");
goTo.marker('37');
verify.quickInfoIs("(parameter) s: string");
goTo.marker('38');
verify.quickInfoIs("(var) C5T5.foo: (i: number, s: string) => string");
verify.quickInfoIs("var C5T5.foo: (i: number, s: string) => string");
goTo.marker('39');
verify.quickInfoIs("(parameter) i: number");
goTo.marker('40');
verify.quickInfoIs("(parameter) s: string");
goTo.marker('41');
verify.quickInfoIs("(var) c6t5: (n: number) => IFoo");
verify.quickInfoIs("var c6t5: (n: number) => IFoo");
goTo.marker('42');
verify.quickInfoIs("(parameter) n: number");
goTo.marker('43');
verify.quickInfoIs("(var) c7t2: IFoo[]");
verify.quickInfoIs("var c7t2: IFoo[]");
goTo.marker('44');
verify.quickInfoIs("(var) c7t2: IFoo[]");
verify.quickInfoIs("var c7t2: IFoo[]");
goTo.marker('45');
verify.quickInfoIs("(property) t1: (s: string) => string");
goTo.marker('46');
@ -338,53 +338,53 @@ verify.quickInfoIs("(property) a: undefined[]");
goTo.marker('71');
verify.quickInfoIs("(parameter) n: number");
goTo.marker('72');
verify.quickInfoIs("(var) c10t5: () => (n: number) => IFoo");
verify.quickInfoIs("var c10t5: () => (n: number) => IFoo");
goTo.marker('73');
verify.quickInfoIs("(parameter) n: number");
goTo.marker('74');
verify.quickInfoIs("(parameter) n: number");
goTo.marker('75');
verify.quickInfoIs("(var) c12t1: (s: string) => string");
verify.quickInfoIs("var c12t1: (s: string) => string");
goTo.marker('76');
verify.quickInfoIs("(parameter) s: string");
goTo.marker('77');
verify.quickInfoIs("(var) c12t2: IFoo");
verify.quickInfoIs("var c12t2: IFoo");
goTo.marker('78');
verify.quickInfoIs("(var) c12t3: number[]");
verify.quickInfoIs("var c12t3: number[]");
goTo.marker('79');
verify.quickInfoIs("(var) c12t4: () => IFoo");
verify.quickInfoIs("var c12t4: () => IFoo");
goTo.marker('80');
verify.quickInfoIs("(var) c12t5: (n: number) => IFoo");
verify.quickInfoIs("var c12t5: (n: number) => IFoo");
goTo.marker('81');
verify.quickInfoIs("(parameter) n: number");
goTo.marker('82');
verify.quickInfoIs("(var) c12t6: (n: number, s: string) => IFoo");
verify.quickInfoIs("var c12t6: (n: number, s: string) => IFoo");
goTo.marker('83');
verify.quickInfoIs("(parameter) n: number");
goTo.marker('84');
verify.quickInfoIs("(parameter) s: string");
goTo.marker('85');
verify.quickInfoIs("(var) c12t7: (n: number, s: string) => number");
verify.quickInfoIs("var c12t7: (n: number, s: string) => number");
goTo.marker('86');
verify.quickInfoIs("(var) c12t8: (n: number, s: string) => number");
verify.quickInfoIs("var c12t8: (n: number, s: string) => number");
goTo.marker('87');
verify.quickInfoIs("(parameter) n: number");
goTo.marker('88');
verify.quickInfoIs("(var) c12t9: number[][]");
verify.quickInfoIs("var c12t9: number[][]");
goTo.marker('89');
verify.quickInfoIs("(var) c12t10: IFoo[]");
verify.quickInfoIs("var c12t10: IFoo[]");
goTo.marker('90');
verify.quickInfoIs("(var) c12t11: ((n: number, s: string) => string)[]");
verify.quickInfoIs("var c12t11: ((n: number, s: string) => string)[]");
goTo.marker('91');
verify.quickInfoIs("(parameter) n: number");
goTo.marker('92');
verify.quickInfoIs("(parameter) s: string");
goTo.marker('93');
verify.quickInfoIs("(var) c12t12: IBar");
verify.quickInfoIs("var c12t12: IBar");
goTo.marker('94');
verify.quickInfoIs("(property) foo: IFoo");
goTo.marker('95');
verify.quickInfoIs("(var) c12t13: IFoo");
verify.quickInfoIs("var c12t13: IFoo");
goTo.marker('96');
verify.quickInfoIs("(property) f: (i: number, s: string) => string");
goTo.marker('97');
@ -392,11 +392,11 @@ verify.quickInfoIs("(parameter) i: number");
goTo.marker('98');
verify.quickInfoIs("(parameter) s: string");
goTo.marker('99');
verify.quickInfoIs("(var) c12t14: IFoo");
verify.quickInfoIs("var c12t14: IFoo");
goTo.marker('100');
verify.quickInfoIs("(property) a: undefined[]");
goTo.marker('101');
verify.quickInfoIs("(function) EF1(a: number, b: number): number");
verify.quickInfoIs("function EF1(a: number, b: number): number");
goTo.marker('102');
verify.quickInfoIs("(parameter) a: any");
goTo.marker('103');
@ -404,7 +404,7 @@ verify.quickInfoIs("(parameter) b: any");
goTo.marker('110');
verify.quickInfoIs("(property) Point.origin: Point");
goTo.marker('111');
verify.quickInfoIs("(constructor) Point(x: number, y: number): Point");
verify.quickInfoIs("constructor Point(x: number, y: number): Point");
goTo.marker('112');
verify.quickInfoIs("(method) Point.add(dx: number, dy: number): Point");
goTo.marker('113');

12
tests/cases/fourslash/contextualTypingOfArrayLiterals1.ts
View File

@ -31,19 +31,19 @@
verify.not.errorExistsBetweenMarkers('1', '6');
goTo.marker('1');
verify.quickInfoIs('(var) x: any[]');
verify.quickInfoIs('var x: any[]');
goTo.marker('2');
verify.quickInfoIs('(var) r: C');
verify.quickInfoIs('var r: C');
goTo.marker('3');
verify.quickInfoIs('(var) r3: C');
verify.quickInfoIs('var r3: C');
goTo.marker('4');
verify.quickInfoIs('(var) r4: C');
verify.quickInfoIs('var r4: C');
goTo.marker('5');
verify.quickInfoIs('(var) x5: C[]');
verify.quickInfoIs('var x5: C[]');
goTo.marker('6');
verify.quickInfoIs('(var) r5: C');
verify.quickInfoIs('var r5: C');

2
tests/cases/fourslash/derivedTypeIndexerWithGenericConstraints.ts
View File

@ -25,5 +25,5 @@
////var result2 = r2.x;
goTo.marker('');
verify.quickInfoIs('(var) r: CollectionItem');
verify.quickInfoIs('var r: CollectionItem');
verify.numberOfErrorsInCurrentFile(0);

2
tests/cases/fourslash/duplicateIndexers.ts
View File

@ -9,4 +9,4 @@
////var /**/r = i[1];
goTo.marker();
verify.quickInfoIs('(var) r: string');
verify.quickInfoIs('var r: string');

4
tests/cases/fourslash/emptyArrayInference.ts
View File

@ -4,7 +4,7 @@
////var y/*2*/y = true ? [1] : [];
goTo.marker('1');
verify.quickInfoIs('(var) xx: number[]');
verify.quickInfoIs('var xx: number[]');
goTo.marker('2');
verify.quickInfoIs('(var) yy: number[]');
verify.quickInfoIs('var yy: number[]');

2
tests/cases/fourslash/enumAddition.ts
View File

@ -5,4 +5,4 @@
goTo.marker();
verify.quickInfoExists();
verify.quickInfoIs('(var) t: number');
verify.quickInfoIs('var t: number');

2
tests/cases/fourslash/errorsAfterResolvingVariableDeclOfMergedVariableAndClassDecl.ts
View File

@ -16,7 +16,7 @@ verify.numberOfErrorsInCurrentFile(0);
goTo.marker("1");
edit.backspace(1);
edit.insert(" ");
verify.quickInfoIs("(var) M.C.C: typeof M.C");
verify.quickInfoIs("var M.C.C: typeof M.C");
// Verify there are no errors
verify.numberOfErrorsInCurrentFile(0);

4
tests/cases/fourslash/exportEqualTypes.ts
View File

@ -17,9 +17,9 @@
goTo.marker('1');
verify.quickInfoIs("import test = require('exportEqualTypes_file0')");
goTo.marker('2');
verify.quickInfoIs('(var) r1: Date');
verify.quickInfoIs('var r1: Date');
goTo.marker('3');
verify.quickInfoIs('(var) r2: string');
verify.quickInfoIs('var r2: string');
goTo.marker('4');
verify.memberListContains('foo');
verify.numberOfErrorsInCurrentFile(0);

4
tests/cases/fourslash/extendArray.ts
View File

@ -9,7 +9,7 @@
////var /*2*/r2 = x2[0];
goTo.marker('1');
verify.quickInfoIs('(var) r: string');
verify.quickInfoIs('var r: string');
goTo.marker('2');
verify.quickInfoIs('(var) r2: string');
verify.quickInfoIs('var r2: string');

4
tests/cases/fourslash/extendArrayInterfaceMember.ts
View File

@ -11,12 +11,12 @@ verify.numberOfErrorsInCurrentFile(1);
// - Could not select overload for 'call' expression.
goTo.marker("y");
verify.quickInfoIs("(var) y: any");
verify.quickInfoIs("var y: any");
goTo.eof();
edit.insert("interface Array<T> { pop(def: T): T; }");
verify.not.errorExistsBetweenMarkers("1", "2");
goTo.marker("y");
verify.quickInfoIs("(var) y: number");
verify.quickInfoIs("var y: number");
verify.numberOfErrorsInCurrentFile(0);

2
tests/cases/fourslash/extendInterfaceOverloadedMethod.ts
View File

@ -15,5 +15,5 @@
edit.insert('');
goTo.marker();
verify.quickInfoIs('(var) x: void');
verify.quickInfoIs('var x: void');
verify.numberOfErrorsInCurrentFile(0);

2
tests/cases/fourslash/extendsTArray.ts
View File

@ -11,5 +11,5 @@
////y.length;
goTo.marker();
verify.quickInfoIs('(var) y: Date[]');
verify.quickInfoIs('var y: Date[]');
verify.numberOfErrorsInCurrentFile(0);

10
tests/cases/fourslash/externalModuleWithExportAssignment.ts
View File

@ -33,7 +33,7 @@ goTo.marker('1');
verify.quickInfoIs('import a1 = require("externalModuleWithExportAssignment_file0")');
goTo.marker('2');
verify.quickInfoIs("(var) a: {\n (): a1.connectExport;\n test1: a1.connectModule;\n test2(): a1.connectModule;\n}", undefined);
verify.quickInfoIs("var a: {\n (): a1.connectExport;\n test1: a1.connectModule;\n test2(): a1.connectModule;\n}", undefined);
goTo.marker('3');
verify.quickInfoIs("(property) test1: a1.connectModule(res: any, req: any, next: any) => void", undefined);
@ -49,13 +49,13 @@ goTo.marker('5');
verify.currentSignatureHelpIs("test2(): a1.connectModule");
goTo.marker('6');
verify.quickInfoIs("(var) r1: a1.connectModule", undefined);
verify.quickInfoIs("var r1: a1.connectModule", undefined);
goTo.marker('7');
verify.currentSignatureHelpIs("a(): a1.connectExport");
goTo.marker('8');
verify.quickInfoIs("(var) r2: a1.connectExport", undefined);
verify.quickInfoIs("var r2: a1.connectExport", undefined);
goTo.marker('9');
verify.quickInfoIs("(property) test1: a1.connectModule(res: any, req: any, next: any) => void", undefined);
@ -71,13 +71,13 @@ goTo.marker('11');
verify.currentSignatureHelpIs("test2(): a1.connectModule");
goTo.marker('12');
verify.quickInfoIs("(var) r3: a1.connectModule", undefined);
verify.quickInfoIs("var r3: a1.connectModule", undefined);
goTo.marker('13');
verify.currentSignatureHelpIs("a1(): a1.connectExport");
goTo.marker('14');
verify.quickInfoIs("(var) r4: a1.connectExport", undefined);
verify.quickInfoIs("var r4: a1.connectExport", undefined);
goTo.marker('15');
verify.not.completionListContains("test1", "(property) test1: a1.connectModule", undefined);

2
tests/cases/fourslash/forIn.ts
View File

@ -5,4 +5,4 @@
goTo.marker();
verify.quickInfoIs('(var) p: any', "");
verify.quickInfoIs('var p: any', "");

2
tests/cases/fourslash/funduleWithRecursiveReference.ts
View File

@ -11,5 +11,5 @@
edit.insert('');
goTo.marker();
verify.quickInfoIs('(var) M.C.C: typeof M.C');
verify.quickInfoIs('var M.C.C: typeof M.C');
verify.numberOfErrorsInCurrentFile(0);

2
tests/cases/fourslash/genericCallSignaturesInNonGenericTypes1.ts
View File

@ -16,4 +16,4 @@
////var /**/b = _(a);
goTo.marker();
verify.quickInfoIs('(var) b: WrappedArray<number>');
verify.quickInfoIs('var b: WrappedArray<number>');

2
tests/cases/fourslash/genericCallSignaturesInNonGenericTypes2.ts
View File

@ -13,4 +13,4 @@
////var /**/b = _(a); // WrappedArray<any>, should be WrappedArray<number>
goTo.marker();
verify.quickInfoIs('(var) b: WrappedArray<number>');
verify.quickInfoIs('var b: WrappedArray<number>');

4
tests/cases/fourslash/genericCallsWithOptionalParams1.ts
View File

@ -13,7 +13,7 @@
////var /*2*/r2 = utils.fold(c, (s, t) => t);
goTo.marker('1');
verify.quickInfoIs('(var) r: string');
verify.quickInfoIs('var r: string');
goTo.marker('2');
verify.quickInfoIs('(var) r2: string');
verify.quickInfoIs('var r2: string');

30
tests/cases/fourslash/genericCombinators1.ts
View File

@ -64,38 +64,38 @@ verify.quickInfoIs('(parameter) x: B<any>');
goTo.marker('5');
verify.quickInfoIs('(parameter) x: number');
goTo.marker('6');
verify.quickInfoIs('(var) c3: Collection<Collection<number>>');
verify.quickInfoIs('var c3: Collection<Collection<number>>');
goTo.marker('7');
verify.quickInfoIs('(parameter) x: A');
goTo.marker('8');
verify.quickInfoIs('(parameter) x: any'); // Specialized to any because no type argument was specified
goTo.marker('9');
verify.quickInfoIs('(var) r1a: Collection<string>');
verify.quickInfoIs('var r1a: Collection<string>');
goTo.marker('10');
verify.quickInfoIs('(var) r1b: Collection<string>');
verify.quickInfoIs('var r1b: Collection<string>');
goTo.marker('11');
verify.quickInfoIs('(var) r2a: Collection<number>');
verify.quickInfoIs('var r2a: Collection<number>');
goTo.marker('12');
verify.quickInfoIs('(var) r2b: Collection<number>');
verify.quickInfoIs('var r2b: Collection<number>');
goTo.marker('13');
verify.quickInfoIs('(var) r3a: Collection<A>');
verify.quickInfoIs('var r3a: Collection<A>');
goTo.marker('14');
verify.quickInfoIs('(var) r3b: Collection<A>');
verify.quickInfoIs('var r3b: Collection<A>');
goTo.marker('15');
verify.quickInfoIs('(var) r4a: Collection<any>');
verify.quickInfoIs('var r4a: Collection<any>');
goTo.marker('17');
verify.quickInfoIs('(var) r5a: Collection<string>');
verify.quickInfoIs('var r5a: Collection<string>');
goTo.marker('18');
verify.quickInfoIs('(var) r5b: Collection<string>');
verify.quickInfoIs('var r5b: Collection<string>');
goTo.marker('19');
verify.quickInfoIs('(var) r6a: Collection<number>');
verify.quickInfoIs('var r6a: Collection<number>');
goTo.marker('20');
verify.quickInfoIs('(var) r6b: Collection<number>');
verify.quickInfoIs('var r6b: Collection<number>');
goTo.marker('21');
verify.quickInfoIs('(var) r7a: Collection<A>');
verify.quickInfoIs('var r7a: Collection<A>');
goTo.marker('22');
verify.quickInfoIs('(var) r7b: Collection<A>');
verify.quickInfoIs('var r7b: Collection<A>');
goTo.marker('23');
verify.quickInfoIs('(var) r8a: Collection<string>');
verify.quickInfoIs('var r8a: Collection<string>');
verify.errorExistsBetweenMarkers('error1', 'error2');

28
tests/cases/fourslash/genericCombinators2.ts
View File

@ -95,40 +95,40 @@ goTo.marker('8b');
verify.quickInfoIs('(parameter) y: any'); // Specialized to any because no type argument was specified
goTo.marker('9');
verify.quickInfoIs('(var) r1a: Collection<number, string>');
verify.quickInfoIs('var r1a: Collection<number, string>');
goTo.marker('10');
verify.quickInfoIs('(var) r1b: Collection<number, string>');
verify.quickInfoIs('var r1b: Collection<number, string>');
goTo.marker('11');
verify.quickInfoIs('(var) r2a: Collection<Collection<number, number>, number>');
verify.quickInfoIs('var r2a: Collection<Collection<number, number>, number>');
goTo.marker('12');
verify.quickInfoIs('(var) r2b: Collection<Collection<number, number>, number>');
verify.quickInfoIs('var r2b: Collection<Collection<number, number>, number>');
goTo.marker('13');
verify.quickInfoIs('(var) r3a: Collection<number, {}>');
verify.quickInfoIs('var r3a: Collection<number, {}>');
goTo.marker('14');
verify.quickInfoIs('(var) r3b: Collection<number, {}>');
verify.quickInfoIs('var r3b: Collection<number, {}>');
goTo.marker('15');
verify.quickInfoIs('(var) r4a: Collection<number, any>');
verify.quickInfoIs('var r4a: Collection<number, any>');
goTo.marker('17');
verify.quickInfoIs('(var) r5a: Collection<T, V>'); // This is actually due to an error because toFixed does not return a Date
verify.quickInfoIs('var r5a: Collection<T, V>'); // This is actually due to an error because toFixed does not return a Date
goTo.marker('18');
verify.quickInfoIs('(var) r5b: Collection<number, Date>');
verify.quickInfoIs('var r5b: Collection<number, Date>');
goTo.marker('19');
verify.quickInfoIs('(var) r6a: Collection<Collection<number, number>, Date>');
verify.quickInfoIs('var r6a: Collection<Collection<number, number>, Date>');
goTo.marker('20');
verify.quickInfoIs('(var) r6b: Collection<Collection<number, number>, Date>');
verify.quickInfoIs('var r6b: Collection<Collection<number, number>, Date>');
goTo.marker('21');
verify.quickInfoIs('(var) r7a: Collection<T, V>'); // This call is an error because y.foo() does not return a string
verify.quickInfoIs('var r7a: Collection<T, V>'); // This call is an error because y.foo() does not return a string
goTo.marker('22');
verify.quickInfoIs('(var) r7b: Collection<T, V>'); // This call is an error because y.foo() does not return a string
verify.quickInfoIs('var r7b: Collection<T, V>'); // This call is an error because y.foo() does not return a string
goTo.marker('23');
verify.quickInfoIs('(var) r8a: Collection<number, string>');
verify.quickInfoIs('var r8a: Collection<number, string>');
verify.errorExistsBetweenMarkers('error1', 'error2');
verify.errorExistsBetweenMarkers('17error1', '17error2');

2
tests/cases/fourslash/genericCombinators3.ts
View File

@ -24,4 +24,4 @@ goTo.marker('1c');
verify.quickInfoIs('(method) Combinators.map<number, string, string>(c: Collection<number, string>, f: (x: number, y: string) => string): Collection<number, string> (+1 overload)');
goTo.marker('9');
verify.quickInfoIs('(var) r1a: Collection<number, string>');
verify.quickInfoIs('var r1a: Collection<number, string>');

4
tests/cases/fourslash/genericDerivedTypeAcrossModuleBoundary1.ts
View File

@ -17,7 +17,7 @@
////var /*2*/n3 = new N.D2();
goTo.marker('1');
verify.quickInfoIs('(var) n2: N.D2<number>');
verify.quickInfoIs('var n2: N.D2<number>');
goTo.marker('2')
verify.quickInfoIs('(var) n3: N.D2<{}>');
verify.quickInfoIs('var n3: N.D2<{}>');

4
tests/cases/fourslash/genericFunctionReturnType.ts
View File

@ -12,10 +12,10 @@
// verify.currentSignatureHelpIs('foo(x: number, y: string): (a: string) => number');
goTo.marker('2');
verify.quickInfoIs('(var) r: (a: string) => number');
verify.quickInfoIs('var r: (a: string) => number');
goTo.marker('3');
verify.currentSignatureHelpIs('r(a: string): number');
goTo.marker('4');
verify.quickInfoIs('(var) r2: number');
verify.quickInfoIs('var r2: number');

4
tests/cases/fourslash/genericFunctionReturnType2.ts
View File

@ -15,10 +15,10 @@ goTo.marker('1');
verify.currentSignatureHelpIs('foo(x: number): (a: number) => number');
goTo.marker('2');
verify.quickInfoIs('(var) r: (a: number) => number');
verify.quickInfoIs('var r: (a: number) => number');
goTo.marker('3');
verify.currentSignatureHelpIs('r(a: number): number');
goTo.marker('4');
verify.quickInfoIs('(var) r2: number');
verify.quickInfoIs('var r2: number');

90
tests/cases/fourslash/genericInterfacePropertyInference1.ts
View File

@ -90,98 +90,98 @@
verify.numberOfErrorsInCurrentFile(0);
goTo.marker('a1');
verify.quickInfoIs('(var) f_r1: number');
verify.quickInfoIs('var f_r1: number');
goTo.marker('a2');
verify.quickInfoIs('(var) f_r2: string');
verify.quickInfoIs('var f_r2: string');
goTo.marker('a3');
verify.quickInfoIs('(var) f_r3: any');
verify.quickInfoIs('var f_r3: any');
goTo.marker('a4');
verify.quickInfoIs('(var) f_r5: Foo<number>');
verify.quickInfoIs('var f_r5: Foo<number>');
goTo.marker('a5');
verify.quickInfoIs('(var) f_r8: I');
verify.quickInfoIs('var f_r8: I');
goTo.marker('a6');
verify.quickInfoIs('(var) f_r12: {\n x: number;\n}');
verify.quickInfoIs('var f_r12: {\n x: number;\n}');
goTo.marker('a7');
verify.quickInfoIs('(var) f_r14: {\n x: any;\n}');
verify.quickInfoIs('var f_r14: {\n x: any;\n}');
goTo.marker('a8');
verify.quickInfoIs('(var) f_r18: C<number>');
verify.quickInfoIs('var f_r18: C<number>');
goTo.marker('a9');
verify.quickInfoIs('(var) f_r20: C<{\n x: any;\n}>');
verify.quickInfoIs('var f_r20: C<{\n x: any;\n}>');
goTo.marker('b1');
verify.quickInfoIs('(var) f2_r1: number');
verify.quickInfoIs('var f2_r1: number');
goTo.marker('b2');
verify.quickInfoIs('(var) f2_r2: string');
verify.quickInfoIs('var f2_r2: string');
goTo.marker('b3');
verify.quickInfoIs('(var) f2_r3: number');
verify.quickInfoIs('var f2_r3: number');
goTo.marker('b4');
verify.quickInfoIs('(var) f2_r5: Foo<number>');
verify.quickInfoIs('var f2_r5: Foo<number>');
goTo.marker('b5');
verify.quickInfoIs('(var) f2_r8: I');
verify.quickInfoIs('var f2_r8: I');
goTo.marker('b6');
verify.quickInfoIs('(var) f2_r12: {\n x: number;\n}');
verify.quickInfoIs('var f2_r12: {\n x: number;\n}');
goTo.marker('b7');
verify.quickInfoIs('(var) f2_r14: {\n x: number;\n}');
verify.quickInfoIs('var f2_r14: {\n x: number;\n}');
goTo.marker('b8');
verify.quickInfoIs('(var) f2_r18: C<number>');
verify.quickInfoIs('var f2_r18: C<number>');
goTo.marker('b9');
verify.quickInfoIs('(var) f2_r20: C<{\n x: number;\n}>');
verify.quickInfoIs('var f2_r20: C<{\n x: number;\n}>');
goTo.marker('c1');
verify.quickInfoIs('(var) f3_r1: number');
verify.quickInfoIs('var f3_r1: number');
goTo.marker('c2');
verify.quickInfoIs('(var) f3_r2: string');
verify.quickInfoIs('var f3_r2: string');
goTo.marker('c3');
verify.quickInfoIs('(var) f3_r3: I');
verify.quickInfoIs('var f3_r3: I');
goTo.marker('c4');
verify.quickInfoIs('(var) f3_r5: Foo<number>');
verify.quickInfoIs('var f3_r5: Foo<number>');
goTo.marker('c5');
verify.quickInfoIs('(var) f3_r8: I');
verify.quickInfoIs('var f3_r8: I');
goTo.marker('c6');
verify.quickInfoIs('(var) f3_r12: {\n x: number;\n}');
verify.quickInfoIs('var f3_r12: {\n x: number;\n}');
goTo.marker('c7');
verify.quickInfoIs('(var) f3_r14: {\n x: I;\n}');
verify.quickInfoIs('var f3_r14: {\n x: I;\n}');
goTo.marker('c8');
verify.quickInfoIs('(var) f3_r18: C<number>');
verify.quickInfoIs('var f3_r18: C<number>');
goTo.marker('c9');
verify.quickInfoIs('(var) f3_r20: C<{\n x: I;\n}>');
verify.quickInfoIs('var f3_r20: C<{\n x: I;\n}>');
goTo.marker('d1');
verify.quickInfoIs('(var) f4_r1: number');
verify.quickInfoIs('var f4_r1: number');
goTo.marker('d2');
verify.quickInfoIs('(var) f4_r2: string');
verify.quickInfoIs('var f4_r2: string');
goTo.marker('d3');
verify.quickInfoIs('(var) f4_r3: {\n x: number;\n}');
verify.quickInfoIs('var f4_r3: {\n x: number;\n}');
goTo.marker('d4');
verify.quickInfoIs('(var) f4_r5: Foo<number>');
verify.quickInfoIs('var f4_r5: Foo<number>');
goTo.marker('d5');
verify.quickInfoIs('(var) f4_r8: I');
verify.quickInfoIs('var f4_r8: I');
goTo.marker('d6');
verify.quickInfoIs('(var) f4_r12: {\n x: number;\n}');
verify.quickInfoIs('var f4_r12: {\n x: number;\n}');
goTo.marker('d7');
verify.quickInfoIs('(var) f4_r14: {\n x: {\n x: number;\n };\n}');
verify.quickInfoIs('var f4_r14: {\n x: {\n x: number;\n };\n}');
goTo.marker('d8');
verify.quickInfoIs('(var) f4_r18: C<number>');
verify.quickInfoIs('var f4_r18: C<number>');
goTo.marker('d9');
verify.quickInfoIs('(var) f4_r20: C<{\n x: {\n x: number;\n };\n}>');
verify.quickInfoIs('var f4_r20: C<{\n x: {\n x: number;\n };\n}>');
goTo.marker('e1');
verify.quickInfoIs('(var) f5_r1: number');
verify.quickInfoIs('var f5_r1: number');
goTo.marker('e2');
verify.quickInfoIs('(var) f5_r2: string');
verify.quickInfoIs('var f5_r2: string');
goTo.marker('e3');
verify.quickInfoIs('(var) f5_r3: Foo<number>');
verify.quickInfoIs('var f5_r3: Foo<number>');
goTo.marker('e4');
verify.quickInfoIs('(var) f5_r5: Foo<number>');
verify.quickInfoIs('var f5_r5: Foo<number>');
goTo.marker('e5');
verify.quickInfoIs('(var) f5_r8: I');
verify.quickInfoIs('var f5_r8: I');
goTo.marker('e6');
verify.quickInfoIs('(var) f5_r12: {\n x: number;\n}');
verify.quickInfoIs('var f5_r12: {\n x: number;\n}');
goTo.marker('e7');
verify.quickInfoIs('(var) f5_r14: {\n x: Foo<number>;\n}');
verify.quickInfoIs('var f5_r14: {\n x: Foo<number>;\n}');
goTo.marker('e8');
verify.quickInfoIs('(var) f5_r18: C<number>');
verify.quickInfoIs('var f5_r18: C<number>');
goTo.marker('e9');
verify.quickInfoIs('(var) f5_r20: C<{\n x: Foo<number>;\n}>');
verify.quickInfoIs('var f5_r20: C<{\n x: Foo<number>;\n}>');

50
tests/cases/fourslash/genericInterfacePropertyInference2.ts
View File

@ -66,56 +66,56 @@
verify.numberOfErrorsInCurrentFile(0);
goTo.marker('a1');
verify.quickInfoIs('(var) f_r4: Foo<any>');
verify.quickInfoIs('var f_r4: Foo<any>');
goTo.marker('a2');
verify.quickInfoIs('(var) f_r7: Foo<Foo<number>>');
verify.quickInfoIs('var f_r7: Foo<Foo<number>>');
goTo.marker('a3');
verify.quickInfoIs('(var) f_r9: IG<any>');
verify.quickInfoIs('var f_r9: IG<any>');
goTo.marker('a5');
verify.quickInfoIs('(var) f_r13: {\n x: Foo<any>;\n}');
verify.quickInfoIs('var f_r13: {\n x: Foo<any>;\n}');
goTo.marker('a7');
verify.quickInfoIs('(var) f_r17: C<any>');
verify.quickInfoIs('var f_r17: C<any>');
goTo.marker('b1');
verify.quickInfoIs('(var) f2_r4: Foo<number>');
verify.quickInfoIs('var f2_r4: Foo<number>');
goTo.marker('b2');
verify.quickInfoIs('(var) f2_r7: Foo<Foo<number>>');
verify.quickInfoIs('var f2_r7: Foo<Foo<number>>');
goTo.marker('b3');
verify.quickInfoIs('(var) f2_r9: IG<number>');
verify.quickInfoIs('var f2_r9: IG<number>');
goTo.marker('b5');
verify.quickInfoIs('(var) f2_r13: {\n x: Foo<number>;\n}');
verify.quickInfoIs('var f2_r13: {\n x: Foo<number>;\n}');
goTo.marker('b7');
verify.quickInfoIs('(var) f2_r17: C<number>');
verify.quickInfoIs('var f2_r17: C<number>');
goTo.marker('c1');
verify.quickInfoIs('(var) f3_r4: Foo<I>');
verify.quickInfoIs('var f3_r4: Foo<I>');
goTo.marker('c2');
verify.quickInfoIs('(var) f3_r7: Foo<Foo<number>>');
verify.quickInfoIs('var f3_r7: Foo<Foo<number>>');
goTo.marker('c3');
verify.quickInfoIs('(var) f3_r9: IG<I>');
verify.quickInfoIs('var f3_r9: IG<I>');
goTo.marker('c5');
verify.quickInfoIs('(var) f3_r13: {\n x: Foo<I>;\n}');
verify.quickInfoIs('var f3_r13: {\n x: Foo<I>;\n}');
goTo.marker('c7');
verify.quickInfoIs('(var) f3_r17: C<I>');
verify.quickInfoIs('var f3_r17: C<I>');
goTo.marker('d1');
verify.quickInfoIs('(var) f4_r4: Foo<{\n x: number;\n}>');
verify.quickInfoIs('var f4_r4: Foo<{\n x: number;\n}>');
goTo.marker('d2');
verify.quickInfoIs('(var) f4_r7: Foo<Foo<number>>');
verify.quickInfoIs('var f4_r7: Foo<Foo<number>>');
goTo.marker('d3');
verify.quickInfoIs('(var) f4_r9: IG<{\n x: number;\n}>');
verify.quickInfoIs('var f4_r9: IG<{\n x: number;\n}>');
goTo.marker('d5');
verify.quickInfoIs('(var) f4_r13: {\n x: Foo<{\n x: number;\n }>;\n}');
verify.quickInfoIs('var f4_r13: {\n x: Foo<{\n x: number;\n }>;\n}');
goTo.marker('d7');
verify.quickInfoIs('(var) f4_r17: C<{\n x: number;\n}>');
verify.quickInfoIs('var f4_r17: C<{\n x: number;\n}>');
goTo.marker('e1');
verify.quickInfoIs('(var) f5_r4: Foo<Foo<number>>');
verify.quickInfoIs('var f5_r4: Foo<Foo<number>>');
goTo.marker('e2');
verify.quickInfoIs('(var) f5_r7: Foo<Foo<number>>');
verify.quickInfoIs('var f5_r7: Foo<Foo<number>>');
goTo.marker('e3');
verify.quickInfoIs('(var) f5_r9: IG<Foo<number>>');
verify.quickInfoIs('var f5_r9: IG<Foo<number>>');
goTo.marker('e5');
verify.quickInfoIs('(var) f5_r13: {\n x: Foo<Foo<number>>;\n}');
verify.quickInfoIs('var f5_r13: {\n x: Foo<Foo<number>>;\n}');
goTo.marker('e7');
verify.quickInfoIs('(var) f5_r17: C<Foo<number>>');
verify.quickInfoIs('var f5_r17: C<Foo<number>>');

6
tests/cases/fourslash/genericInterfacesWithConstraints1.ts
View File

@ -12,8 +12,8 @@
////var v/*3*/3: G<G<A, B>, C>; // Ok
goTo.marker('1');
verify.quickInfoIs('(var) v1: G<A, C>', null);
verify.quickInfoIs('var v1: G<A, C>', null);
goTo.marker('2');
verify.quickInfoIs('(var) v2: G<{\n a: string;\n}, C>', null);
verify.quickInfoIs('var v2: G<{\n a: string;\n}, C>', null);
goTo.marker('3');
verify.quickInfoIs('(var) v3: G<G<A, B>, C>', null);
verify.quickInfoIs('var v3: G<G<A, B>, C>', null);

12
tests/cases/fourslash/genericMapTyping1.ts
View File

@ -22,22 +22,22 @@
verify.numberOfErrorsInCurrentFile(0);
goTo.marker('1');
verify.quickInfoIs('(var) bb: number[]');
verify.quickInfoIs('var bb: number[]');
goTo.marker('2');
verify.quickInfoIs('(var) cc: number[]');
verify.quickInfoIs('var cc: number[]');
goTo.marker('3');
verify.quickInfoIs('(var) dd: number[]');
verify.quickInfoIs('var dd: number[]');
goTo.marker('4');
verify.quickInfoIs('(var) bbb: any[]');
verify.quickInfoIs('var bbb: any[]');
goTo.marker('5');
verify.quickInfoIs('(var) ccc: any[]');
verify.quickInfoIs('var ccc: any[]');
goTo.marker('6');
verify.quickInfoIs('(var) ddd: any[]');
verify.quickInfoIs('var ddd: any[]');
goTo.marker('7');
verify.quickInfoIs('(parameter) xx: string');

8
tests/cases/fourslash/genericTypeArgumentInference1.ts
View File

@ -18,22 +18,22 @@
////var /*4*/r4 = _./*41*/all([<any>true], _.identity);
goTo.marker('1');
verify.quickInfoIs('(var) r: string | number | boolean');
verify.quickInfoIs('var r: string | number | boolean');
goTo.marker('11');
verify.quickInfoIs('(method) Underscore.Static.all<string | number | boolean>(list: (string | number | boolean)[], iterator?: Underscore.Iterator<string | number | boolean, boolean>, context?: any): string | number | boolean');
goTo.marker('2');
verify.quickInfoIs('(var) r2: boolean');
verify.quickInfoIs('var r2: boolean');
goTo.marker('21');
verify.quickInfoIs('(method) Underscore.Static.all<boolean>(list: boolean[], iterator?: Underscore.Iterator<boolean, boolean>, context?: any): boolean');
goTo.marker('3');
verify.quickInfoIs('(var) r3: any');
verify.quickInfoIs('var r3: any');
goTo.marker('31');
verify.quickInfoIs('(method) Underscore.Static.all<any>(list: any[], iterator?: Underscore.Iterator<any, boolean>, context?: any): any');
goTo.marker('4');
verify.quickInfoIs('(var) r4: any');
verify.quickInfoIs('var r4: any');
goTo.marker('41');
verify.quickInfoIs('(method) Underscore.Static.all<any>(list: any[], iterator?: Underscore.Iterator<any, boolean>, context?: any): any');

8
tests/cases/fourslash/genericTypeArgumentInference2.ts
View File

@ -18,22 +18,22 @@
////var /*4*/r4 = _./*41*/all([<any>true], _.identity);
goTo.marker('1');
verify.quickInfoIs('(var) r: string | number | boolean');
verify.quickInfoIs('var r: string | number | boolean');
goTo.marker('11');
verify.quickInfoIs('(method) Underscore.Static.all<string | number | boolean>(list: (string | number | boolean)[], iterator?: Underscore.Iterator<string | number | boolean, boolean>, context?: any): string | number | boolean');
goTo.marker('2');
verify.quickInfoIs('(var) r2: boolean');
verify.quickInfoIs('var r2: boolean');
goTo.marker('21');
verify.quickInfoIs('(method) Underscore.Static.all<boolean>(list: boolean[], iterator?: Underscore.Iterator<boolean, boolean>, context?: any): boolean');
goTo.marker('3');
verify.quickInfoIs('(var) r3: any');
verify.quickInfoIs('var r3: any');
goTo.marker('31');
verify.quickInfoIs('(method) Underscore.Static.all<any>(list: any[], iterator?: Underscore.Iterator<any, boolean>, context?: any): any');
goTo.marker('4');
verify.quickInfoIs('(var) r4: any');
verify.quickInfoIs('var r4: any');
goTo.marker('41');
verify.quickInfoIs('(method) Underscore.Static.all<any>(list: any[], iterator?: Underscore.Iterator<any, boolean>, context?: any): any');

12
tests/cases/fourslash/genericTypeParamUnrelatedToArguments1.ts
View File

@ -11,19 +11,19 @@
////var f/*6*/6: Foo<number> = new Foo<number>(3);
goTo.marker('1');
verify.quickInfoIs('(var) f1: Foo<number>', null);
verify.quickInfoIs('var f1: Foo<number>', null);
goTo.marker('2');
verify.quickInfoIs('(var) f2: Foo<number>', null);
verify.quickInfoIs('var f2: Foo<number>', null);
goTo.marker('3');
verify.quickInfoIs('(var) f3: any', null);
verify.quickInfoIs('var f3: any', null);
goTo.marker('4');
verify.quickInfoIs('(var) f4: Foo<number>', null);
verify.quickInfoIs('var f4: Foo<number>', null);
goTo.marker('5');
verify.quickInfoIs('(var) f5: any', null);
verify.quickInfoIs('var f5: any', null);
goTo.marker('6');
verify.quickInfoIs('(var) f6: Foo<number>', null);
verify.quickInfoIs('var f6: Foo<number>', null);

8
tests/cases/fourslash/genericWithSpecializedProperties1.ts
View File

@ -14,11 +14,11 @@
////var /*4*/y2 = f2.y;
goTo.marker('1');
verify.quickInfoIs('(var) xx: Foo<string>');
verify.quickInfoIs('var xx: Foo<string>');
goTo.marker('2');
verify.quickInfoIs('(var) yy: Foo<number>');
verify.quickInfoIs('var yy: Foo<number>');
goTo.marker('3');
verify.quickInfoIs('(var) x2: Foo<string>');
verify.quickInfoIs('var x2: Foo<string>');
goTo.marker('4');
verify.quickInfoIs('(var) y2: Foo<number>');
verify.quickInfoIs('var y2: Foo<number>');

8
tests/cases/fourslash/genericWithSpecializedProperties2.ts
View File

@ -13,11 +13,11 @@
////var /*4*/y2 = f2.y;
goTo.marker('1');
verify.quickInfoIs('(var) x: Foo<string>');
verify.quickInfoIs('var x: Foo<string>');
goTo.marker('2');
verify.quickInfoIs('(var) y: Foo<number>');
verify.quickInfoIs('var y: Foo<number>');
goTo.marker('3');
verify.quickInfoIs('(var) x2: Foo<string>');
verify.quickInfoIs('var x2: Foo<string>');
goTo.marker('4');
verify.quickInfoIs('(var) y2: Foo<number>');
verify.quickInfoIs('var y2: Foo<number>');

8
tests/cases/fourslash/genericWithSpecializedProperties3.ts
View File

@ -14,11 +14,11 @@
////var /*4*/y2 = f2.y;
goTo.marker('1');
verify.quickInfoIs('(var) xx: Foo<number, string>');
verify.quickInfoIs('var xx: Foo<number, string>');
goTo.marker('2');
verify.quickInfoIs('(var) yy: Foo<string, string>');
verify.quickInfoIs('var yy: Foo<string, string>');
goTo.marker('3');
verify.quickInfoIs('(var) x2: Foo<string, number>');
verify.quickInfoIs('var x2: Foo<string, number>');
goTo.marker('4');
verify.quickInfoIs('(var) y2: Foo<number, number>');
verify.quickInfoIs('var y2: Foo<number, number>');

12
tests/cases/fourslash/getCompletionEntryDetails.ts
View File

@ -14,17 +14,17 @@ verify.completionListContains("ccc");
verify.completionListContains("ddd");
// Checking for completion details before edit should work
verify.completionEntryDetailIs("aaa", "(var) aaa: number");
verify.completionEntryDetailIs("ccc", "(var) ccc: number");
verify.completionEntryDetailIs("aaa", "var aaa: number");
verify.completionEntryDetailIs("ccc", "var ccc: number");
// Make an edit
edit.insert("a");
edit.backspace();
// Checking for completion details after edit should work too
verify.completionEntryDetailIs("bbb", "(var) bbb: string");
verify.completionEntryDetailIs("ddd", "(var) ddd: string");
verify.completionEntryDetailIs("bbb", "var bbb: string");
verify.completionEntryDetailIs("ddd", "var ddd: string");
// Checking for completion details again before edit should work
verify.completionEntryDetailIs("aaa", "(var) aaa: number");
verify.completionEntryDetailIs("ccc", "(var) ccc: number");
verify.completionEntryDetailIs("aaa", "var aaa: number");
verify.completionEntryDetailIs("ccc", "var ccc: number");

2
tests/cases/fourslash/getCompletionEntryDetails2.ts
View File

@ -15,4 +15,4 @@ edit.insert("a");
edit.backspace();
// Checking for completion details after edit should work too
verify.completionEntryDetailIs("x", "(var) Foo.x: number");
verify.completionEntryDetailIs("x", "var Foo.x: number");

2
tests/cases/fourslash/incrementalResolveAccessor.ts
View File

@ -14,7 +14,7 @@
// Resolve without typeCheck
goTo.marker('1');
verify.quickInfoIs("(var) b: string");
verify.quickInfoIs("var b: string");
// TypeCheck
verify.numberOfErrorsInCurrentFile(3);

2
tests/cases/fourslash/incrementalResolveConstructorDeclaration.ts
View File

@ -11,7 +11,7 @@
// Do resolve without typeCheck
goTo.marker('1');
verify.quickInfoIs("(var) val: c1");
verify.quickInfoIs("var val: c1");
// TypeCheck
verify.numberOfErrorsInCurrentFile(1);

2
tests/cases/fourslash/incrementalResolveFunctionPropertyAssignment.ts
View File

@ -22,7 +22,7 @@
/////*1*/val;
goTo.marker('1');
verify.quickInfoIs("(var) val: string");
verify.quickInfoIs("var val: string");
// TypeCheck
verify.numberOfErrorsInCurrentFile(1);

32
tests/cases/fourslash/indexerReturnTypes1.ts
View File

@ -63,49 +63,49 @@
goTo.marker('1');
verify.quickInfoIs('(var) r1: Date');
verify.quickInfoIs('var r1: Date');
goTo.marker('2');
verify.quickInfoIs('(var) r2: any');
verify.quickInfoIs('var r2: any');
goTo.marker('3');
verify.quickInfoIs('(var) r3: RegExp');
verify.quickInfoIs('var r3: RegExp');
goTo.marker('4');
verify.quickInfoIs('(var) r4: RegExp');
verify.quickInfoIs('var r4: RegExp');
goTo.marker('5');
verify.quickInfoIs('(var) r5: Date');
verify.quickInfoIs('var r5: Date');
goTo.marker('6');
verify.quickInfoIs('(var) r6: any');
verify.quickInfoIs('var r6: any');
goTo.marker('7');
verify.quickInfoIs('(var) r7: RegExp');
verify.quickInfoIs('var r7: RegExp');
goTo.marker('8');
verify.quickInfoIs('(var) r8: RegExp');
verify.quickInfoIs('var r8: RegExp');
goTo.marker('9');
verify.quickInfoIs('(var) r9: Date');
verify.quickInfoIs('var r9: Date');
goTo.marker('10');
verify.quickInfoIs('(var) r10: any');
verify.quickInfoIs('var r10: any');
goTo.marker('11');
verify.quickInfoIs('(var) r11: Date');
verify.quickInfoIs('var r11: Date');
goTo.marker('12');
verify.quickInfoIs('(var) r12: Date');
verify.quickInfoIs('var r12: Date');
goTo.marker('13');
verify.quickInfoIs('(var) r13: Ty<Date>');
verify.quickInfoIs('var r13: Ty<Date>');
goTo.marker('14');
verify.quickInfoIs('(var) r14: any');
verify.quickInfoIs('var r14: any');
goTo.marker('15');
verify.quickInfoIs('(var) r15: {\n [x: number]: Date;\n}');
verify.quickInfoIs('var r15: {\n [x: number]: Date;\n}');
goTo.marker('16');
verify.quickInfoIs('(var) r16: any');
verify.quickInfoIs('var r16: any');

2
tests/cases/fourslash/intellisenseInObjectLiteral.ts
View File

@ -9,4 +9,4 @@
//// }
goTo.marker();
verify.quickInfoIs("(var) x: number", "");
verify.quickInfoIs("var x: number", "");

20
tests/cases/fourslash/letQuickInfoAndCompletionList.ts
View File

@ -8,21 +8,21 @@
////}
goTo.marker('1');
verify.quickInfoIs("(let) a: number");
verify.quickInfoIs("let a: number");
goTo.marker('2');
verify.completionListContains("a", "(let) a: number");
verify.quickInfoIs("(let) a: number");
verify.completionListContains("a", "let a: number");
verify.quickInfoIs("let a: number");
goTo.marker('3');
verify.quickInfoIs("(let) b: number");
verify.quickInfoIs("let b: number");
goTo.marker('4');
verify.completionListContains("a", "(let) a: number");
verify.completionListContains("b", "(let) b: number");
verify.quickInfoIs("(let) b: number");
verify.completionListContains("a", "let a: number");
verify.completionListContains("b", "let b: number");
verify.quickInfoIs("let b: number");
goTo.marker('5');
verify.completionListContains("a", "(let) a: number");
verify.completionListContains("b", "(let) b: number");
verify.quickInfoIs("(let) a: number");
verify.completionListContains("a", "let a: number");
verify.completionListContains("b", "let b: number");
verify.quickInfoIs("let a: number");

2
tests/cases/fourslash/localFunction.ts
View File

@ -10,7 +10,7 @@
////}
goTo.marker("1");
verify.quickInfoIs('(function) foo(): void');
verify.quickInfoIs('function foo(): void');
goTo.marker("2");
verify.quickInfoIs('(local function) bar2(): void');
goTo.marker("3");

2
tests/cases/fourslash/memberListOfModuleAfterInvalidCharater.ts
View File

@ -7,4 +7,4 @@
////testModule./**/
goTo.marker();
verify.completionListContains('foo', '(var) testModule.foo: number');
verify.completionListContains('foo', 'var testModule.foo: number');

10
tests/cases/fourslash/memberListOfModuleInAnotherModule.ts
View File

@ -21,17 +21,17 @@
////}
goTo.marker('1');
verify.completionListContains('meX', '(var) mod1.meX: number');
verify.completionListContains('meFunc', '(function) mod1.meFunc(): void');
verify.completionListContains('meX', 'var mod1.meX: number');
verify.completionListContains('meFunc', 'function mod1.meFunc(): void');
verify.completionListContains('meClass', 'class mod1.meClass');
verify.completionListContains('meMod', 'module mod1.meMod');
verify.completionListContains('meInt', 'interface mod1.meInt');
goTo.marker('2');
verify.completionListContains('meX', '(var) mod1.meX: number');
verify.completionListContains('meFunc', '(function) mod1.meFunc(): void');
verify.completionListContains('meX', 'var mod1.meX: number');
verify.completionListContains('meFunc', 'function mod1.meFunc(): void');
verify.completionListContains('meClass', 'class mod1.meClass');
verify.completionListContains('meMod', 'module mod1.meMod');
goTo.marker('3');
verify.completionListContains('iMex', '(var) mod1.meMod.iMex: number');
verify.completionListContains('iMex', 'var mod1.meMod.iMex: number');

4
tests/cases/fourslash/mergedDeclarationsWithExportAssignment1.ts
View File

@ -25,11 +25,11 @@ goTo.marker('2');
verify.completionListContains('Foo');
goTo.marker('3');
verify.quickInfoIs('(var) z: Foo');
verify.quickInfoIs('var z: Foo');
goTo.marker('4');
verify.completionListContains('x');
goTo.marker('5');
verify.quickInfoIs('(var) r2: number');
verify.quickInfoIs('var r2: number');

2
tests/cases/fourslash/moduleMembersOfGenericType.ts
View File

@ -6,4 +6,4 @@
////var r = M./**/;
goTo.marker();
verify.completionListContains('x', '(var) M.x: <T>(x: T) => T');
verify.completionListContains('x', 'var M.x: <T>(x: T) => T');

6
tests/cases/fourslash/moduleVariables.ts
View File

@ -14,10 +14,10 @@
////}
goTo.marker('1');
verify.quickInfoIs("(var) M.x: number", undefined);
verify.quickInfoIs("var M.x: number", undefined);
goTo.marker('2');
verify.quickInfoIs("(var) M.x: number", undefined);
verify.quickInfoIs("var M.x: number", undefined);
goTo.marker('3');
verify.quickInfoIs("(var) x: number", undefined);
verify.quickInfoIs("var x: number", undefined);

4
tests/cases/fourslash/multiModuleFundule1.ts
View File

@ -18,14 +18,14 @@ verify.completionListContains('C');
edit.insert('C.x);');
goTo.marker('2');
verify.quickInfoIs('(var) r: void');
verify.quickInfoIs('var r: void');
goTo.marker('3');
verify.completionListContains('C');
edit.insert('C.x);');
goTo.marker('4');
verify.quickInfoIs('(var) r2: any');
verify.quickInfoIs('var r2: any');
goTo.marker('5');
verify.completionListContains('x');

8
tests/cases/fourslash/nameOfRetypedClassInModule.ts
View File

@ -14,19 +14,19 @@
edit.disableFormatting();
goTo.marker('check');
verify.quickInfoIs('(constructor) Check(val: any): Check');
verify.quickInfoIs('constructor Check(val: any): Check');
goTo.marker('check2');
verify.quickInfoIs('(constructor) M.Check2(val: any): Check2');
verify.quickInfoIs('constructor M.Check2(val: any): Check2');
goTo.marker('A');
edit.deleteAtCaret('class A {}'.length);
edit.insert('class A { constructor(val) {} }');
edit.moveLeft('constructor(val) {} }'.length);
verify.quickInfoIs('(constructor) A(val: any): A');
verify.quickInfoIs('constructor A(val: any): A');
goTo.marker('B');
edit.deleteAtCaret('export class B {}'.length);
edit.insert('export class B { constructor(val) {} }');
edit.moveLeft('constructor(val) {} }'.length);
verify.quickInfoIs('(constructor) M.B(val: any): B');
verify.quickInfoIs('constructor M.B(val: any): B');

4
tests/cases/fourslash/noTypeParameterInLHS.ts
View File

@ -6,6 +6,6 @@
////var /*2*/c: C<I>;
goTo.marker('1');
verify.quickInfoIs('(var) i: I<any>');
verify.quickInfoIs('var i: I<any>');
goTo.marker('2');
verify.quickInfoIs('(var) c: C<any>');
verify.quickInfoIs('var c: C<any>');

2
tests/cases/fourslash/numericPropertyNames.ts
View File

@ -3,4 +3,4 @@
////var /**/t2 = { 0: 1, 1: "" };
goTo.marker();
verify.quickInfoIs('(var) t2: {\n 0: number;\n 1: string;\n}');
verify.quickInfoIs('var t2: {\n 0: number;\n 1: string;\n}');

4
tests/cases/fourslash/objectLiteralCallSignatures.ts
View File

@ -22,8 +22,8 @@
verify.not.errorExistsAfterMarker('1');
goTo.marker('1');
verify.quickInfoIs('(var) x: {\n func1(x: number): number;\n func2: (x: number) => number;\n func3: (x: number) => number;\n}');
verify.quickInfoIs('var x: {\n func1(x: number): number;\n func2: (x: number) => number;\n func3: (x: number) => number;\n}');
goTo.marker('2');
verify.quickInfoIs('(var) y: {\n func4(x: number): number;\n func4(s: string): string;\n func5: {\n (x: number): number;\n (s: string): string;\n };\n}');
verify.quickInfoIs('var y: {\n func4(x: number): number;\n func4(s: string): string;\n func5: {\n (x: number): number;\n (s: string): string;\n };\n}');

Some files were not shown because too many files have changed in this diff Show More