Skip to content

Commit 2a5ba1d

Browse files
Merge branch 'master' into release-3.8
2 parents 9e96a0c + ef8eb0c commit 2a5ba1d

File tree

964 files changed

+49011
-11333
lines changed

Some content is hidden

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

964 files changed

+49011
-11333
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1+
---
12
blank_issues_enabled: false
2-
contact_links:
3-
- name: Question
4-
url: https://stackoverflow.com/questions/tagged/typescript
5-
about: Please ask and answer questions here.
6-
- name: TypeScript FAQ
7-
url: https://github.com/microsoft/TypeScript/wiki/FAQ
8-
about: Please check the FAQ before filing new issues
9-
- name: Website
10-
url: https://github.com/microsoft/TypeScript-Website/issues/new
11-
about: Please raise issues about the site on it's own repo.
3+
contact_links:
4+
-
5+
about: "Please ask and answer usage questions on Stack Overflow."
6+
name: Question
7+
url: "https://stackoverflow.com/questions/tagged/typescript"
8+
-
9+
about: "Alternatively, you can use the TypeScript Community Discord."
10+
name: Chat
11+
url: "https://discord.gg/typescript"
12+
-
13+
about: "Please check the FAQ before filing new issues"
14+
name: "TypeScript FAQ"
15+
url: "https://github.com/microsoft/TypeScript/wiki/FAQ"
16+
-
17+
about: "Please raise issues about the site on it's own repo."
18+
name: Website
19+
url: "https://github.com/microsoft/TypeScript-Website/issues/new"

.github/pr_owners.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
sandersn
2+
elibarzilay
3+
weswigham
4+
andrewbranch
5+
RyanCavanaugh
6+
sheetalkamat
7+
orta
8+
rbuckton

.vscode/extensions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"recommendations": [
3-
"dbaeumer.vscode-eslint"
3+
"dbaeumer.vscode-eslint",
4+
"rbuckton.tsserver-live-reload"
45
],
56

67
"unwantedRecommendations": [

Gulpfile.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,6 @@ const lintFoldEnd = async () => { if (fold.isTravis()) console.log(fold.end("lin
346346

347347
/** @type { (folder: string) => { (): Promise<any>; displayName?: string } } */
348348
const eslint = (folder) => async () => {
349-
const ESLINTRC_CI = ".eslintrc.ci.json";
350-
const isCIEnv = cmdLineOptions.ci || process.env.CI === "true";
351349

352350
const args = [
353351
"node_modules/eslint/bin/eslint",
@@ -358,13 +356,6 @@ const eslint = (folder) => async () => {
358356
"--ext", ".ts",
359357
];
360358

361-
if (
362-
isCIEnv &&
363-
fs.existsSync(path.resolve(folder, ESLINTRC_CI))
364-
) {
365-
args.push("--config", path.resolve(folder, ESLINTRC_CI));
366-
}
367-
368359
if (cmdLineOptions.fix) {
369360
args.push("--fix");
370361
}

lib/cancellationToken.js

Lines changed: 1 addition & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/ja/diagnosticMessages.generated.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@
454454
"Generic_type_0_requires_1_type_argument_s_2314": "ジェネリック型 '{0}' には {1} 個の型引数が必要です。",
455455
"Generic_type_0_requires_between_1_and_2_type_arguments_2707": "ジェネリック型 '{0}' には、{1} 個から {2} 個までの型引数が必要です。",
456456
"Generic_type_instantiation_is_excessively_deep_and_possibly_infinite_2550": "ジェネリック型のインスタンス化は非常に深く、無限である可能性があります。",
457-
"Getter_and_setter_accessors_do_not_agree_in_visibility_2379": "ゲッターおよびセッターで表示が許可されていません",
457+
"Getter_and_setter_accessors_do_not_agree_in_visibility_2379": "ゲッターおよびセッターでの表示が許可されていません",
458458
"Global_module_exports_may_only_appear_at_top_level_1316": "グローバル モジュールのエクスポートは最上位レベルにのみ出現可能です。",
459459
"Global_module_exports_may_only_appear_in_declaration_files_1315": "グローバル モジュールのエクスポートは宣言ファイルにのみ出現可能です。",
460460
"Global_module_exports_may_only_appear_in_module_files_1314": "グローバル モジュールのエクスポートはモジュール ファイルにのみ出現可能です。",

lib/lib.es2019.symbol.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ and limitations under the License.
2020

2121
interface Symbol {
2222
/**
23-
* expose the [[Description]] internal slot of a symbol directly
23+
* Expose the [[Description]] internal slot of a symbol directly.
2424
*/
25-
readonly description: string;
25+
readonly description: string | undefined;
2626
}

lib/lib.es5.d.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ declare var Error: ErrorConstructor;
986986
interface EvalError extends Error {
987987
}
988988

989-
interface EvalErrorConstructor {
989+
interface EvalErrorConstructor extends ErrorConstructor {
990990
new(message?: string): EvalError;
991991
(message?: string): EvalError;
992992
readonly prototype: EvalError;
@@ -997,7 +997,7 @@ declare var EvalError: EvalErrorConstructor;
997997
interface RangeError extends Error {
998998
}
999999

1000-
interface RangeErrorConstructor {
1000+
interface RangeErrorConstructor extends ErrorConstructor {
10011001
new(message?: string): RangeError;
10021002
(message?: string): RangeError;
10031003
readonly prototype: RangeError;
@@ -1008,7 +1008,7 @@ declare var RangeError: RangeErrorConstructor;
10081008
interface ReferenceError extends Error {
10091009
}
10101010

1011-
interface ReferenceErrorConstructor {
1011+
interface ReferenceErrorConstructor extends ErrorConstructor {
10121012
new(message?: string): ReferenceError;
10131013
(message?: string): ReferenceError;
10141014
readonly prototype: ReferenceError;
@@ -1019,7 +1019,7 @@ declare var ReferenceError: ReferenceErrorConstructor;
10191019
interface SyntaxError extends Error {
10201020
}
10211021

1022-
interface SyntaxErrorConstructor {
1022+
interface SyntaxErrorConstructor extends ErrorConstructor {
10231023
new(message?: string): SyntaxError;
10241024
(message?: string): SyntaxError;
10251025
readonly prototype: SyntaxError;
@@ -1030,7 +1030,7 @@ declare var SyntaxError: SyntaxErrorConstructor;
10301030
interface TypeError extends Error {
10311031
}
10321032

1033-
interface TypeErrorConstructor {
1033+
interface TypeErrorConstructor extends ErrorConstructor {
10341034
new(message?: string): TypeError;
10351035
(message?: string): TypeError;
10361036
readonly prototype: TypeError;
@@ -1041,7 +1041,7 @@ declare var TypeError: TypeErrorConstructor;
10411041
interface URIError extends Error {
10421042
}
10431043

1044-
interface URIErrorConstructor {
1044+
interface URIErrorConstructor extends ErrorConstructor {
10451045
new(message?: string): URIError;
10461046
(message?: string): URIError;
10471047
readonly prototype: URIError;

lib/protocol.d.ts

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -961,22 +961,37 @@ declare namespace ts.server.protocol {
961961
* compiler settings.
962962
*/
963963
type ExternalProjectCompilerOptions = CompilerOptions & CompileOnSaveMixin & WatchOptions;
964+
interface FileWithProjectReferenceRedirectInfo {
965+
/**
966+
* Name of file
967+
*/
968+
fileName: string;
969+
/**
970+
* True if the file is primarily included in a referenced project
971+
*/
972+
isSourceOfProjectReferenceRedirect: boolean;
973+
}
964974
/**
965975
* Represents a set of changes that happen in project
966976
*/
967977
interface ProjectChanges {
968978
/**
969979
* List of added files
970980
*/
971-
added: string[];
981+
added: string[] | FileWithProjectReferenceRedirectInfo[];
972982
/**
973983
* List of removed files
974984
*/
975-
removed: string[];
985+
removed: string[] | FileWithProjectReferenceRedirectInfo[];
976986
/**
977987
* List of updated files
978988
*/
979-
updated: string[];
989+
updated: string[] | FileWithProjectReferenceRedirectInfo[];
990+
/**
991+
* List of files that have had their project reference redirect status updated
992+
* Only provided when the synchronizeProjectList request has includeProjectReferenceRedirectInfo set to true
993+
*/
994+
updatedRedirects?: FileWithProjectReferenceRedirectInfo[];
980995
}
981996
/**
982997
* Information found in a configure request.
@@ -1436,7 +1451,7 @@ declare namespace ts.server.protocol {
14361451
command: CommandTypes.Formatonkey;
14371452
arguments: FormatOnKeyRequestArgs;
14381453
}
1439-
type CompletionsTriggerCharacter = "." | '"' | "'" | "`" | "/" | "@" | "<";
1454+
type CompletionsTriggerCharacter = "." | '"' | "'" | "`" | "/" | "@" | "<" | "#";
14401455
/**
14411456
* Arguments for completions messages.
14421457
*/
@@ -1553,6 +1568,11 @@ declare namespace ts.server.protocol {
15531568
* Then either that enum/class or a namespace containing it will be the recommended symbol.
15541569
*/
15551570
isRecommended?: true;
1571+
/**
1572+
* If true, this completion was generated from traversing the name table of an unchecked JS file,
1573+
* and therefore may not be accurate.
1574+
*/
1575+
isFromUncheckedFile?: true;
15561576
}
15571577
/**
15581578
* Additional completion entry details, available on demand

0 commit comments

Comments
 (0)