Skip to content

Commit 58b262e

Browse files
committed
Merge branch 'master' into codefix_add_missing_new_operator
2 parents 35665d1 + e1a4c27 commit 58b262e

File tree

217 files changed

+10725
-6495
lines changed

Some content is hidden

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

217 files changed

+10725
-6495
lines changed

.github/ISSUE_TEMPLATE/Bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Please fill in the *entire* template below.
1616
-->
1717

1818
<!-- Please try to reproduce the issue with `typescript@next`. It may have already been fixed. -->
19-
**TypeScript Version:** 3.1.0-dev.201xxxxx
19+
**TypeScript Version:** 3.2.0-dev.201xxxxx
2020

2121
<!-- Search terms you tried before logging this (so others can find this issue more easily) -->
2222
**Search Terms:**

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ branches:
2020
- release-2.8
2121
- release-2.9
2222
- release-3.0
23+
- release-3.1
2324

2425
install:
2526
- npm uninstall typescript --no-save

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": "3.1.0",
5+
"version": "3.2.0",
66
"license": "Apache-2.0",
77
"description": "TypeScript is a language for application scale JavaScript development",
88
"keywords": [

src/compiler/binder.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,7 @@ namespace ts {
640640
function bindChildrenWorker(node: Node): void {
641641
if (checkUnreachable(node)) {
642642
bindEachChild(node);
643+
bindJSDoc(node);
643644
return;
644645
}
645646
switch (node.kind) {

src/compiler/builderState.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ namespace ts.BuilderState {
8888
function getReferencedFileFromImportedModuleSymbol(symbol: Symbol) {
8989
if (symbol.declarations && symbol.declarations[0]) {
9090
const declarationSourceFile = getSourceFileOfNode(symbol.declarations[0]);
91-
return declarationSourceFile && (declarationSourceFile.resolvedPath || declarationSourceFile.path);
91+
return declarationSourceFile && declarationSourceFile.resolvedPath;
9292
}
9393
}
9494

src/compiler/checker.ts

Lines changed: 181 additions & 58 deletions
Large diffs are not rendered by default.

src/compiler/commandLineParser.ts

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,14 @@ namespace ts {
7777
shortName: "?",
7878
type: "boolean"
7979
},
80+
{
81+
name: "watch",
82+
shortName: "w",
83+
type: "boolean",
84+
showInSimplifiedHelpView: true,
85+
category: Diagnostics.Command_line_Options,
86+
description: Diagnostics.Watch_input_files,
87+
},
8088
{
8189
name: "preserveWatchOutput",
8290
type: "boolean",
@@ -96,13 +104,12 @@ namespace ts {
96104
category: Diagnostics.Advanced_Options,
97105
description: Diagnostics.Print_names_of_generated_files_part_of_the_compilation
98106
},
107+
99108
{
100-
name: "watch",
101-
shortName: "w",
109+
name: "traceResolution",
102110
type: "boolean",
103-
showInSimplifiedHelpView: true,
104-
category: Diagnostics.Command_line_Options,
105-
description: Diagnostics.Watch_input_files,
111+
category: Diagnostics.Advanced_Options,
112+
description: Diagnostics.Enable_tracing_of_the_name_resolution_process
106113
},
107114
];
108115

@@ -366,6 +373,14 @@ namespace ts {
366373
category: Diagnostics.Strict_Type_Checking_Options,
367374
description: Diagnostics.Enable_strict_checking_of_function_types
368375
},
376+
{
377+
name: "strictBindCallApply",
378+
type: "boolean",
379+
strictFlag: true,
380+
showInSimplifiedHelpView: true,
381+
category: Diagnostics.Strict_Type_Checking_Options,
382+
description: Diagnostics.Enable_strict_bind_call_and_apply_methods_on_functions
383+
},
369384
{
370385
name: "strictPropertyInitialization",
371386
type: "boolean",
@@ -581,12 +596,6 @@ namespace ts {
581596
category: Diagnostics.Advanced_Options,
582597
description: Diagnostics.Show_verbose_diagnostic_information
583598
},
584-
{
585-
name: "traceResolution",
586-
type: "boolean",
587-
category: Diagnostics.Advanced_Options,
588-
description: Diagnostics.Enable_tracing_of_the_name_resolution_process
589-
},
590599
{
591600
name: "resolveJsonModule",
592601
type: "boolean",
@@ -1520,7 +1529,12 @@ namespace ts {
15201529
elements: NodeArray<Expression>,
15211530
elementOption: CommandLineOption | undefined
15221531
): any[] | void {
1523-
return (returnValue ? elements.map : elements.forEach).call(elements, (element: Expression) => convertPropertyValueToJson(element, elementOption));
1532+
if (!returnValue) {
1533+
return elements.forEach(element => convertPropertyValueToJson(element, elementOption));
1534+
}
1535+
1536+
// Filter out invalid values
1537+
return filter(elements.map(element => convertPropertyValueToJson(element, elementOption)), v => v !== undefined);
15241538
}
15251539

15261540
function convertPropertyValueToJson(valueExpression: Expression, option: CommandLineOption | undefined): any {
@@ -1886,7 +1900,8 @@ namespace ts {
18861900
filesSpecs = <ReadonlyArray<string>>raw.files;
18871901
const hasReferences = hasProperty(raw, "references") && !isNullOrUndefined(raw.references);
18881902
const hasZeroOrNoReferences = !hasReferences || raw.references.length === 0;
1889-
if (filesSpecs.length === 0 && hasZeroOrNoReferences) {
1903+
const hasExtends = hasProperty(raw, "extends");
1904+
if (filesSpecs.length === 0 && hasZeroOrNoReferences && !hasExtends) {
18901905
if (sourceFile) {
18911906
const fileName = configFileName || "tsconfig.json";
18921907
const diagnosticMessage = Diagnostics.The_files_list_in_config_file_0_is_empty;

src/compiler/core.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace ts {
22
// WARNING: The script `configureNightly.ts` uses a regexp to parse out these values.
33
// If changing the text in this section, be sure to test `configureNightly` too.
4-
export const versionMajorMinor = "3.1";
4+
export const versionMajorMinor = "3.2";
55
/** The version of the TypeScript compiler release */
66
export const version = `${versionMajorMinor}.0-dev`;
77
}

0 commit comments

Comments
 (0)