Skip to content

Commit 93c13ce

Browse files
sheetalkamatsheetalkamat
committed
Merge branch 'master' into watchOptions
2 parents 4eba27b + dcd3b5e commit 93c13ce

98 files changed

Lines changed: 2551 additions & 442 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "typescript",
33
"author": "Microsoft Corp.",
44
"homepage": "http://typescriptlang.org/",
5-
"version": "2.7.0",
5+
"version": "2.8.0",
66
"license": "Apache-2.0",
77
"description": "TypeScript is a language for application scale JavaScript development",
88
"keywords": [

‎src/compiler/checker.ts‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2424,12 +2424,15 @@ namespace ts {
24242424
const visitedSymbolTables: SymbolTable[] = [];
24252425
return forEachSymbolTableInScope(enclosingDeclaration, getAccessibleSymbolChainFromSymbolTable);
24262426

2427-
function getAccessibleSymbolChainFromSymbolTable(symbols: SymbolTable): Symbol[] | undefined {
2427+
/**
2428+
* @param {ignoreQualification} boolean Set when a symbol is being looked for through the exports of another symbol (meaning we have a route to qualify it already)
2429+
*/
2430+
function getAccessibleSymbolChainFromSymbolTable(symbols: SymbolTable, ignoreQualification?: boolean): Symbol[] | undefined {
24282431
if (!pushIfUnique(visitedSymbolTables, symbols)) {
24292432
return undefined;
24302433
}
24312434

2432-
const result = trySymbolTable(symbols);
2435+
const result = trySymbolTable(symbols, ignoreQualification);
24332436
visitedSymbolTables.pop();
24342437
return result;
24352438
}
@@ -2441,22 +2444,22 @@ namespace ts {
24412444
!!getAccessibleSymbolChain(symbolFromSymbolTable.parent, enclosingDeclaration, getQualifiedLeftMeaning(meaning), useOnlyExternalAliasing);
24422445
}
24432446

2444-
function isAccessible(symbolFromSymbolTable: Symbol, resolvedAliasSymbol?: Symbol) {
2447+
function isAccessible(symbolFromSymbolTable: Symbol, resolvedAliasSymbol?: Symbol, ignoreQualification?: boolean) {
24452448
return symbol === (resolvedAliasSymbol || symbolFromSymbolTable) &&
24462449
// if the symbolFromSymbolTable is not external module (it could be if it was determined as ambient external module and would be in globals table)
24472450
// and if symbolFromSymbolTable or alias resolution matches the symbol,
24482451
// check the symbol can be qualified, it is only then this symbol is accessible
24492452
!some(symbolFromSymbolTable.declarations, hasExternalModuleSymbol) &&
2450-
canQualifySymbol(symbolFromSymbolTable, meaning);
2453+
(ignoreQualification || canQualifySymbol(symbolFromSymbolTable, meaning));
24512454
}
24522455

24532456
function isUMDExportSymbol(symbol: Symbol) {
24542457
return symbol && symbol.declarations && symbol.declarations[0] && isNamespaceExportDeclaration(symbol.declarations[0]);
24552458
}
24562459

2457-
function trySymbolTable(symbols: SymbolTable) {
2460+
function trySymbolTable(symbols: SymbolTable, ignoreQualification: boolean | undefined) {
24582461
// If symbol is directly available by its name in the symbol table
2459-
if (isAccessible(symbols.get(symbol.escapedName))) {
2462+
if (isAccessible(symbols.get(symbol.escapedName), /*resolvedAliasSymbol*/ undefined, ignoreQualification)) {
24602463
return [symbol];
24612464
}
24622465

@@ -2469,14 +2472,14 @@ namespace ts {
24692472
&& (!useOnlyExternalAliasing || some(symbolFromSymbolTable.declarations, isExternalModuleImportEqualsDeclaration))) {
24702473

24712474
const resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
2472-
if (isAccessible(symbolFromSymbolTable, resolvedImportedSymbol)) {
2475+
if (isAccessible(symbolFromSymbolTable, resolvedImportedSymbol, ignoreQualification)) {
24732476
return [symbolFromSymbolTable];
24742477
}
24752478

24762479
// Look in the exported members, if we can find accessibleSymbolChain, symbol is accessible using this chain
24772480
// but only if the symbolFromSymbolTable can be qualified
24782481
const candidateTable = getExportsOfSymbol(resolvedImportedSymbol);
2479-
const accessibleSymbolsFromExports = candidateTable && getAccessibleSymbolChainFromSymbolTable(candidateTable);
2482+
const accessibleSymbolsFromExports = candidateTable && getAccessibleSymbolChainFromSymbolTable(candidateTable, /*ignoreQualification*/ true);
24802483
if (accessibleSymbolsFromExports && canQualifySymbol(symbolFromSymbolTable, getQualifiedLeftMeaning(meaning))) {
24812484
return [symbolFromSymbolTable].concat(accessibleSymbolsFromExports);
24822485
}
@@ -13048,7 +13051,7 @@ namespace ts {
1304813051
node.parent.kind === SyntaxKind.NonNullExpression ||
1304913052
declaration.kind === SyntaxKind.VariableDeclaration && (<VariableDeclaration>declaration).exclamationToken ||
1305013053
declaration.flags & NodeFlags.Ambient;
13051-
const initialType = assumeInitialized ? (isParameter ? removeOptionalityFromDeclaredType(type, getRootDeclaration(declaration) as VariableLikeDeclaration) : type) :
13054+
const initialType = assumeInitialized ? (isParameter ? removeOptionalityFromDeclaredType(type, declaration as VariableLikeDeclaration) : type) :
1305213055
type === autoType || type === autoArrayType ? undefinedType :
1305313056
getOptionalType(type);
1305413057
const flowType = getFlowTypeOfReference(node, type, initialType, flowContainer, !assumeInitialized);
@@ -15310,7 +15313,7 @@ namespace ts {
1531015313

1531115314
// If the targetAttributesType is an emptyObjectType, indicating that there is no property named 'props' on this instance type.
1531215315
// but there exists a sourceAttributesType, we need to explicitly give an error as normal assignability check allow excess properties and will pass.
15313-
if (targetAttributesType === emptyObjectType && (isTypeAny(sourceAttributesType) || (<ResolvedType>sourceAttributesType).properties.length > 0)) {
15316+
if (targetAttributesType === emptyObjectType && (isTypeAny(sourceAttributesType) || getPropertiesOfType(<ResolvedType>sourceAttributesType).length > 0)) {
1531415317
error(openingLikeElement, Diagnostics.JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property, unescapeLeadingUnderscores(getJsxElementPropertiesName()));
1531515318
}
1531615319
else {
@@ -16717,7 +16720,7 @@ namespace ts {
1671716720
const isDecorator = node.kind === SyntaxKind.Decorator;
1671816721
const isJsxOpeningOrSelfClosingElement = isJsxOpeningLikeElement(node);
1671916722

16720-
let typeArguments: ReadonlyArray<TypeNode>;
16723+
let typeArguments: NodeArray<TypeNode>;
1672116724

1672216725
if (!isTaggedTemplate && !isDecorator && !isJsxOpeningOrSelfClosingElement) {
1672316726
typeArguments = (<CallExpression>node).typeArguments;
@@ -16846,7 +16849,7 @@ namespace ts {
1684616849
max = Math.max(max, length(sig.typeParameters));
1684716850
}
1684816851
const paramCount = min < max ? min + "-" + max : min;
16849-
diagnostics.add(createDiagnosticForNode(node, Diagnostics.Expected_0_type_arguments_but_got_1, paramCount, typeArguments.length));
16852+
diagnostics.add(createDiagnosticForNodeArray(getSourceFileOfNode(node), typeArguments, Diagnostics.Expected_0_type_arguments_but_got_1, paramCount, typeArguments.length));
1685016853
}
1685116854
else if (args) {
1685216855
let min = Number.POSITIVE_INFINITY;
@@ -21030,6 +21033,7 @@ namespace ts {
2103021033
}
2103121034
break;
2103221035
case SyntaxKind.IndexSignature:
21036+
case SyntaxKind.SemicolonClassElement:
2103321037
// Can't be private
2103421038
break;
2103521039
default:

‎src/compiler/core.ts‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
namespace ts {
55
// WARNING: The script `configureNightly.ts` uses a regexp to parse out these values.
66
// If changing the text in this section, be sure to test `configureNightly` too.
7-
export const versionMajorMinor = "2.7";
7+
export const versionMajorMinor = "2.8";
88
/** The version of the TypeScript compiler release */
99
export const version = `${versionMajorMinor}.0`;
1010
}
@@ -16,6 +16,10 @@ namespace ts {
1616
// Update: We also consider a path like `C:\foo.ts` "relative" because we do not search for it in `node_modules` or treat it as an ambient module.
1717
return pathIsRelative(moduleName) || isRootedDiskPath(moduleName);
1818
}
19+
20+
export function sortAndDeduplicateDiagnostics(diagnostics: ReadonlyArray<Diagnostic>): Diagnostic[] {
21+
return sortAndDeduplicate(diagnostics, compareDiagnostics);
22+
}
1923
}
2024

2125
/* @internal */
@@ -344,6 +348,10 @@ namespace ts {
344348
return false;
345349
}
346350

351+
export function arraysEqual<T>(a: ReadonlyArray<T>, b: ReadonlyArray<T>, equalityComparer: EqualityComparer<T> = equateValues): boolean {
352+
return a.length === b.length && a.every((x, i) => equalityComparer(x, b[i]));
353+
}
354+
347355
export function indexOfAnyCharCode(text: string, charCodes: ReadonlyArray<number>, start?: number): number {
348356
for (let i = start || 0; i < text.length; i++) {
349357
if (contains(charCodes, text.charCodeAt(i))) {
@@ -1901,10 +1909,6 @@ namespace ts {
19011909
return text1 ? Comparison.GreaterThan : Comparison.LessThan;
19021910
}
19031911

1904-
export function sortAndDeduplicateDiagnostics(diagnostics: ReadonlyArray<Diagnostic>): Diagnostic[] {
1905-
return sortAndDeduplicate(diagnostics, compareDiagnostics);
1906-
}
1907-
19081912
export function normalizeSlashes(path: string): string {
19091913
return path.replace(/\\/g, "/");
19101914
}

‎src/compiler/scanner.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,10 @@ namespace ts {
335335

336336
/* @internal */
337337
export function computePositionOfLineAndCharacter(lineStarts: ReadonlyArray<number>, line: number, character: number, debugText?: string): number {
338-
Debug.assert(line >= 0 && line < lineStarts.length);
338+
if (line < 0 || line >= lineStarts.length) {
339+
Debug.fail(`Bad line number. Line: ${line}, lineStarts.length: ${lineStarts.length} , line map is correct? ${debugText !== undefined ? arraysEqual(lineStarts, computeLineStarts(debugText)) : "unknown"}`);
340+
}
341+
339342
const res = lineStarts[line] + character;
340343
if (line < lineStarts.length - 1) {
341344
Debug.assert(res < lineStarts[line + 1]);

‎src/compiler/transformers/esnext.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ namespace ts {
148148
}
149149

150150
function visitLabeledStatement(node: LabeledStatement) {
151-
if (enclosingFunctionFlags & FunctionFlags.Async && enclosingFunctionFlags & FunctionFlags.Generator) {
151+
if (enclosingFunctionFlags & FunctionFlags.Async) {
152152
const statement = unwrapInnermostStatementOfLabel(node);
153153
if (statement.kind === SyntaxKind.ForOfStatement && (<ForOfStatement>statement).awaitModifier) {
154154
return visitForOfStatement(<ForOfStatement>statement, node);

‎src/compiler/utilities.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,11 @@ namespace ts {
599599
return createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2, arg3);
600600
}
601601

602+
export function createDiagnosticForNodeArray(sourceFile: SourceFile, nodes: NodeArray<Node>, message: DiagnosticMessage, arg0?: string | number, arg1?: string | number, arg2?: string | number, arg3?: string | number): Diagnostic {
603+
const start = skipTrivia(sourceFile.text, nodes.pos);
604+
return createFileDiagnostic(sourceFile, start, nodes.end - start, message, arg0, arg1, arg2, arg3);
605+
}
606+
602607
export function createDiagnosticForNodeInSourceFile(sourceFile: SourceFile, node: Node, message: DiagnosticMessage, arg0?: string | number, arg1?: string | number, arg2?: string | number, arg3?: string | number): Diagnostic {
603608
const span = getErrorSpanForNode(sourceFile, node);
604609
return createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2, arg3);

‎src/harness/fourslash.ts‎

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace FourSlash {
2323
ts.disableIncrementalParsing = false;
2424

2525
// Represents a parsed source file with metadata
26-
export interface FourSlashFile {
26+
interface FourSlashFile {
2727
// The contents of the file (with markers, etc stripped out)
2828
content: string;
2929
fileName: string;
@@ -34,7 +34,7 @@ namespace FourSlash {
3434
}
3535

3636
// Represents a set of parsed source files and options
37-
export interface FourSlashData {
37+
interface FourSlashData {
3838
// Global options (name/value pairs)
3939
globalOptions: Harness.TestCaseParser.CompilerSettings;
4040

@@ -59,7 +59,7 @@ namespace FourSlash {
5959
export interface Marker {
6060
fileName: string;
6161
position: number;
62-
data?: any;
62+
data?: {};
6363
}
6464

6565
export interface Range {
@@ -89,21 +89,6 @@ namespace FourSlash {
8989
end: number;
9090
}
9191

92-
export import IndentStyle = ts.IndentStyle;
93-
94-
const entityMap = ts.createMapFromTemplate({
95-
"&": "&amp;",
96-
"\"": "&quot;",
97-
"'": "&#39;",
98-
"/": "&#47;",
99-
"<": "&lt;",
100-
">": "&gt;"
101-
});
102-
103-
export function escapeXmlAttributeValue(s: string) {
104-
return s.replace(/[&<>"'\/]/g, ch => entityMap.get(ch));
105-
}
106-
10792
// Name of testcase metadata including ts.CompilerOptions properties that will be used by globalOptions
10893
// To add additional option, add property into the testOptMetadataNames, refer the property in either globalMetadataNames or fileMetadataNames
10994
// Add cases into convertGlobalOptionsToCompilationsSettings function for the compiler to acknowledge such option from meta data
@@ -1079,7 +1064,7 @@ namespace FourSlash {
10791064
for (const reference of expectedReferences) {
10801065
const { fileName, start, end } = reference;
10811066
if (reference.marker && reference.marker.data) {
1082-
const { isWriteAccess, isDefinition } = reference.marker.data;
1067+
const { isWriteAccess, isDefinition } = reference.marker.data as { isWriteAccess?: boolean, isDefinition?: boolean };
10831068
this.verifyReferencesWorker(actualReferences, fileName, start, end, isWriteAccess, isDefinition);
10841069
}
10851070
else {
@@ -1108,7 +1093,16 @@ namespace FourSlash {
11081093
}
11091094
const fullExpected = ts.map<FourSlashInterface.ReferenceGroup, ReferenceGroupJson>(parts, ({ definition, ranges }) => ({
11101095
definition: typeof definition === "string" ? definition : { ...definition, range: textSpanFromRange(definition.range) },
1111-
references: ranges.map(rangeToReferenceEntry),
1096+
references: ranges.map<ts.ReferenceEntry>(r => {
1097+
const { isWriteAccess = false, isDefinition = false, isInString } = (r.marker && r.marker.data || {}) as { isWriteAccess?: boolean, isDefinition?: boolean, isInString?: true };
1098+
return {
1099+
isWriteAccess,
1100+
isDefinition,
1101+
fileName: r.fileName,
1102+
textSpan: textSpanFromRange(r),
1103+
...(isInString ? { isInString: true } : undefined),
1104+
};
1105+
}),
11121106
}));
11131107

11141108
for (const startRange of toArray(startRanges)) {
@@ -1122,15 +1116,6 @@ namespace FourSlash {
11221116
});
11231117
this.assertObjectsEqual(fullActual, fullExpected);
11241118
}
1125-
1126-
function rangeToReferenceEntry(r: Range): ts.ReferenceEntry {
1127-
const { isWriteAccess, isDefinition, isInString } = (r.marker && r.marker.data) || { isWriteAccess: false, isDefinition: false, isInString: undefined };
1128-
const result: ts.ReferenceEntry = { fileName: r.fileName, textSpan: textSpanFromRange(r), isWriteAccess: !!isWriteAccess, isDefinition: !!isDefinition };
1129-
if (isInString !== undefined) {
1130-
result.isInString = isInString;
1131-
}
1132-
return result;
1133-
}
11341119
}
11351120

11361121
public verifyNoReferences(markerNameOrRange?: string | Range) {
@@ -2587,12 +2572,10 @@ Actual: ${stringify(fullActual)}`);
25872572
actualTextArray.push(text);
25882573
scriptInfo.updateContent(originalContent);
25892574
}
2590-
const sortedExpectedArray = expectedTextArray.sort();
2591-
const sortedActualArray = actualTextArray.sort();
2592-
if (sortedExpectedArray.length !== sortedActualArray.length) {
2593-
this.raiseError(`Expected ${sortedExpectedArray.length} import fixes, got ${sortedActualArray.length}`);
2575+
if (expectedTextArray.length !== actualTextArray.length) {
2576+
this.raiseError(`Expected ${expectedTextArray.length} import fixes, got ${actualTextArray.length}`);
25942577
}
2595-
ts.zipWith(sortedExpectedArray, sortedActualArray, (expected, actual, index) => {
2578+
ts.zipWith(expectedTextArray, actualTextArray, (expected, actual, index) => {
25962579
if (expected !== actual) {
25972580
this.raiseError(`Import fix at index ${index} doesn't match.\n${showTextDiff(expected, actual)}`);
25982581
}

‎src/harness/unittests/extractConstants.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,13 @@ let i: I = [#|{ a: 1 }|];
273273
const myObj: { member(x: number, y: string): void } = {
274274
member: [#|(x, y) => x + y|],
275275
}
276+
`);
277+
278+
testExtractConstant("extractConstant_CaseClauseExpression", `
279+
switch (1) {
280+
case [#|1|]:
281+
break;
282+
}
276283
`);
277284
});
278285

‎src/harness/unittests/extractRanges.ts‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,58 @@ switch (x) {
365365
refactor.extractSymbol.Messages.cannotExtractRange.message
366366
]);
367367

368+
testExtractRangeFailed("extractRangeFailed14",
369+
`
370+
switch(1) {
371+
case [#|1:
372+
break;|]
373+
}
374+
`,
375+
[
376+
refactor.extractSymbol.Messages.cannotExtractRange.message
377+
]);
378+
379+
testExtractRangeFailed("extractRangeFailed15",
380+
`
381+
switch(1) {
382+
case [#|1:
383+
break|];
384+
}
385+
`,
386+
[
387+
refactor.extractSymbol.Messages.cannotExtractRange.message
388+
]);
389+
390+
// Documentation only - it would be nice if the result were [$|1|]
391+
testExtractRangeFailed("extractRangeFailed16",
392+
`
393+
switch(1) {
394+
[#|case 1|]:
395+
break;
396+
}
397+
`,
398+
[
399+
refactor.extractSymbol.Messages.cannotExtractRange.message
400+
]);
401+
402+
// Documentation only - it would be nice if the result were [$|1|]
403+
testExtractRangeFailed("extractRangeFailed17",
404+
`
405+
switch(1) {
406+
[#|case 1:|]
407+
break;
408+
}
409+
`,
410+
[
411+
refactor.extractSymbol.Messages.cannotExtractRange.message
412+
]);
413+
414+
testExtractRangeFailed("extractRangeFailed18",
415+
`[#|{ 1;|] }`,
416+
[
417+
refactor.extractSymbol.Messages.cannotExtractRange.message
418+
]);
419+
368420
testExtractRangeFailed("extract-method-not-for-token-expression-statement", `[#|a|]`, [refactor.extractSymbol.Messages.cannotExtractIdentifier.message]);
369421
});
370422
}

0 commit comments

Comments
 (0)