Skip to content

Commit 9d5cd28

Browse files
committed
Merge branch 'master' into migrateMapsAndSets
# Conflicts: # src/compiler/checker.ts # src/compiler/commandLineParser.ts # src/compiler/core.ts # src/compiler/moduleNameResolver.ts # src/compiler/transformers/declarations.ts # src/compiler/tsbuildPublic.ts # src/compiler/types.ts # src/compiler/utilities.ts # src/harness/client.ts # src/server/editorServices.ts # src/server/typingsCache.ts # src/server/utilities.ts # src/services/codefixes/convertToAsyncFunction.ts # src/services/documentRegistry.ts # src/services/importTracker.ts # src/services/refactorProvider.ts # src/services/refactors/extractSymbol.ts # src/testRunner/unittests/programApi.ts # src/typingsInstallerCore/typingsInstaller.ts # tests/baselines/reference/api/tsserverlibrary.d.ts # tests/baselines/reference/api/typescript.d.ts
2 parents 611b77f + b100680 commit 9d5cd28

File tree

292 files changed

+5921
-3353
lines changed

Some content is hidden

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

292 files changed

+5921
-3353
lines changed

Diff for: .github/tsc.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "tsc",
5+
"pattern": [
6+
{
7+
"regexp": "^(?:\\s+\\d+\\>)?([^\\s].*)\\((\\d+),(\\d+)\\)\\s*:\\s+(error|warning|info)\\s+(\\w{1,2}\\d+)\\s*:\\s*(.*)$",
8+
"file": 1,
9+
"line": 2,
10+
"column": 3,
11+
"severity": 4,
12+
"code": 5,
13+
"message": 6
14+
}
15+
]
16+
}
17+
]
18+
}

Diff for: .github/workflows/ci.yml

+13-6
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,19 @@ jobs:
3030
run: |
3131
npm uninstall typescript --no-save
3232
npm uninstall tslint --no-save
33-
- name: npm install and test
34-
run: |
35-
npm install
36-
npm update
37-
npm test
38-
33+
- run: npm install
34+
- run: npm update
35+
36+
# Re: https://github.com/actions/setup-node/pull/125
37+
- name: Register Problem Matcher for TSC
38+
run: echo "##[add-matcher].github/tsc.json"
39+
40+
- name: Tests
41+
run: npm test -- --no-lint
42+
43+
- name: Linter
44+
run: npm run lint:ci
45+
3946
- name: Validate the browser can import TypeScript
4047
run: gulp test-browser-integration
4148

Diff for: Gulpfile.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -350,11 +350,12 @@ const lintFoldEnd = async () => { if (fold.isTravis()) console.log(fold.end("lin
350350
/** @type { (folder: string) => { (): Promise<any>; displayName?: string } } */
351351
const eslint = (folder) => async () => {
352352

353+
const formatter = cmdLineOptions.ci ? "stylish" : "autolinkable-stylish";
353354
const args = [
354355
"node_modules/eslint/bin/eslint",
355356
"--cache",
356357
"--cache-location", `${folder}/.eslintcache`,
357-
"--format", "autolinkable-stylish",
358+
"--format", formatter,
358359
"--rulesdir", "scripts/eslint/built/rules",
359360
"--ext", ".ts",
360361
];
@@ -367,7 +368,7 @@ const eslint = (folder) => async () => {
367368

368369
log(`Linting: ${args.join(" ")}`);
369370
return exec(process.execPath, args);
370-
}
371+
};
371372

372373
const lintScripts = eslint("scripts");
373374
lintScripts.displayName = "lint-scripts";

Diff for: lib/diagnosticMessages.generated.json

-1,047
This file was deleted.

Diff for: lib/lib.esnext.array.d.ts

-223
This file was deleted.

Diff for: lib/lib.esnext.asynciterable.d.ts

-44
This file was deleted.

0 commit comments

Comments
 (0)