Skip to content

Commit 37d1127

Browse files
armanio123armanio123
committed
Merge remote-tracking branch 'upstream/master' into FixOrganizeImports
2 parents 2c083bd + 3e72526 commit 37d1127

File tree

1,261 files changed

+200316
-184668
lines changed

Some content is hidden

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

1,261 files changed

+200316
-184668
lines changed

‎.github/workflows/accept-baselines-fix-lints.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Accept Baselines and Fix Lints
2+
3+
on:
4+
workflow_dispatch: {}
5+
6+
jobs:
7+
build:
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- uses: actions/checkout@v2
12+
- name: Use node version 12
13+
uses: actions/setup-node@v1
14+
with:
15+
node-version: 12
16+
registry-url: https://registry.npmjs.org/
17+
18+
- name: Configure Git, Run Tests, Update Baselines, Apply Fixes
19+
run: |
20+
git config user.email "[email protected]"
21+
git config user.name "TypeScript Bot"
22+
npm install
23+
gulp runtests-parallel --ci --fix || true
24+
gulp baseline-accept
25+
git add ./src
26+
git add ./tests/baselines/reference
27+
git diff --cached
28+
git commit -m "Update Baselines and/or Applied Lint Fixes"
29+
git push

‎Gulpfile.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,8 @@ const watchLssl = () => watch([
308308
"src/services/**/*.ts",
309309
"src/server/tsconfig.json",
310310
"src/server/**/*.ts",
311+
"src/webServer/tsconfig.json",
312+
"src/webServer/**/*.ts",
311313
"src/tsserver/tsconfig.json",
312314
"src/tsserver/**/*.ts",
313315
], buildLssl);
@@ -590,6 +592,7 @@ task("LKG").description = "Makes a new LKG out of the built js files";
590592
task("LKG").flags = {
591593
" --built": "Compile using the built version of the compiler.",
592594
};
595+
task("lkg", series("LKG"));
593596

594597
const generateSpec = () => exec("cscript", ["//nologo", "scripts/word2md.js", path.resolve("doc/TypeScript Language Specification - ARCHIVED.docx"), path.resolve("doc/spec-ARCHIVED.md")]);
595598
task("generate-spec", series(buildScripts, generateSpec));

‎package-lock.json

Lines changed: 181 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/compiler/checker.ts

Lines changed: 233 additions & 100 deletions
Large diffs are not rendered by default.

‎src/compiler/commandLineParser.ts

Lines changed: 110 additions & 130 deletions
Large diffs are not rendered by default.

‎src/compiler/core.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1591,7 +1591,7 @@ namespace ts {
15911591
// | 1. | i | 105 | Ascii i |
15921592
// | 2. | I | 73 | Ascii I |
15931593
// |-------- Special characters ------------------------------------------------------------------------|
1594-
// | 3. | \u0130 | 304 | Uppper case I with dot above |
1594+
// | 3. | \u0130 | 304 | Upper case I with dot above |
15951595
// | 4. | i,\u0307 | 105,775 | i, followed by 775: Lower case of (3rd item) |
15961596
// | 5. | I,\u0307 | 73,775 | I, followed by 775: Upper case of (4th item), lower case is (4th item) |
15971597
// | 6. | \u0131 | 305 | Lower case i without dot, upper case is I (2nd item) |

‎src/compiler/diagnosticMessages.json

Lines changed: 162 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,11 +1112,7 @@
11121112
"category": "Message",
11131113
"code": 1369
11141114
},
1115-
"Only ECMAScript imports may use 'import type'.": {
1116-
"category": "Error",
1117-
"code": 1370
1118-
},
1119-
"This import is never used as a value and must use 'import type' because the 'importsNotUsedAsValues' is set to 'error'.": {
1115+
"This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'.": {
11201116
"category": "Error",
11211117
"code": 1371
11221118
},
@@ -1196,6 +1192,162 @@
11961192
"category": "Error",
11971193
"code": 1391
11981194
},
1195+
"An import alias cannot use 'import type'": {
1196+
"category": "Error",
1197+
"code": 1392
1198+
},
1199+
"Imported via {0} from file '{1}'": {
1200+
"category": "Message",
1201+
"code": 1393
1202+
},
1203+
"Imported via {0} from file '{1}' with packageId '{2}'": {
1204+
"category": "Message",
1205+
"code": 1394
1206+
},
1207+
"Imported via {0} from file '{1}' to import 'importHelpers' as specified in compilerOptions": {
1208+
"category": "Message",
1209+
"code": 1395
1210+
},
1211+
"Imported via {0} from file '{1}' with packageId '{2}' to import 'importHelpers' as specified in compilerOptions": {
1212+
"category": "Message",
1213+
"code": 1396
1214+
},
1215+
"Imported via {0} from file '{1}' to import 'jsx' and 'jsxs' factory functions": {
1216+
"category": "Message",
1217+
"code": 1397
1218+
},
1219+
"Imported via {0} from file '{1}' with packageId '{2}' to import 'jsx' and 'jsxs' factory functions": {
1220+
"category": "Message",
1221+
"code": 1398
1222+
},
1223+
"File is included via import here.": {
1224+
"category": "Message",
1225+
"code": 1399
1226+
},
1227+
"Referenced via '{0}' from file '{1}'": {
1228+
"category": "Message",
1229+
"code": 1400
1230+
},
1231+
"File is included via reference here.": {
1232+
"category": "Message",
1233+
"code": 1401
1234+
},
1235+
"Type library referenced via '{0}' from file '{1}'": {
1236+
"category": "Message",
1237+
"code": 1402
1238+
},
1239+
"Type library referenced via '{0}' from file '{1}' with packageId '{2}'": {
1240+
"category": "Message",
1241+
"code": 1403
1242+
},
1243+
"File is included via type library reference here.": {
1244+
"category": "Message",
1245+
"code": 1404
1246+
},
1247+
"Library referenced via '{0}' from file '{1}'": {
1248+
"category": "Message",
1249+
"code": 1405
1250+
},
1251+
"File is included via library reference here.": {
1252+
"category": "Message",
1253+
"code": 1406
1254+
},
1255+
"Matched by include pattern '{0}' in '{1}'": {
1256+
"category": "Message",
1257+
"code": 1407
1258+
},
1259+
"File is matched by include pattern specified here.": {
1260+
"category": "Message",
1261+
"code": 1408
1262+
},
1263+
"Part of 'files' list in tsconfig.json": {
1264+
"category": "Message",
1265+
"code": 1409
1266+
},
1267+
"File is matched by 'files' list specified here.": {
1268+
"category": "Message",
1269+
"code": 1410
1270+
},
1271+
"Output from referenced project '{0}' included because '{1}' specified": {
1272+
"category": "Message",
1273+
"code": 1411
1274+
},
1275+
"Output from referenced project '{0}' included because '--module' is specified as 'none'": {
1276+
"category": "Message",
1277+
"code": 1412
1278+
},
1279+
"File is output from referenced project specified here.": {
1280+
"category": "Message",
1281+
"code": 1413
1282+
},
1283+
"Source from referenced project '{0}' included because '{1}' specified": {
1284+
"category": "Message",
1285+
"code": 1414
1286+
},
1287+
"Source from referenced project '{0}' included because '--module' is specified as 'none'": {
1288+
"category": "Message",
1289+
"code": 1415
1290+
},
1291+
"File is source from referenced project specified here.": {
1292+
"category": "Message",
1293+
"code": 1416
1294+
},
1295+
"Entry point of type library '{0}' specified in compilerOptions": {
1296+
"category": "Message",
1297+
"code": 1417
1298+
},
1299+
"Entry point of type library '{0}' specified in compilerOptions with packageId '{1}'": {
1300+
"category": "Message",
1301+
"code": 1418
1302+
},
1303+
"File is entry point of type library specified here.": {
1304+
"category": "Message",
1305+
"code": 1419
1306+
},
1307+
"Entry point for implicit type library '{0}'": {
1308+
"category": "Message",
1309+
"code": 1420
1310+
},
1311+
"Entry point for implicit type library '{0}' with packageId '{1}'": {
1312+
"category": "Message",
1313+
"code": 1421
1314+
},
1315+
"Library '{0}' specified in compilerOptions": {
1316+
"category": "Message",
1317+
"code": 1422
1318+
},
1319+
"File is library specified here.": {
1320+
"category": "Message",
1321+
"code": 1423
1322+
},
1323+
"Default library": {
1324+
"category": "Message",
1325+
"code": 1424
1326+
},
1327+
"Default library for target '{0}'": {
1328+
"category": "Message",
1329+
"code": 1425
1330+
},
1331+
"File is default library for target specified here.": {
1332+
"category": "Message",
1333+
"code": 1426
1334+
},
1335+
"Root file specified for compilation": {
1336+
"category": "Message",
1337+
"code": 1427
1338+
},
1339+
"File is output of project reference source '{0}'": {
1340+
"category": "Message",
1341+
"code": 1428
1342+
},
1343+
"File redirects to file '{0}'": {
1344+
"category": "Message",
1345+
"code": 1429
1346+
},
1347+
"The file is in the program because:": {
1348+
"category": "Message",
1349+
"code": 1430
1350+
},
11991351
"The types of '{0}' are incompatible between these types.": {
12001352
"category": "Error",
12011353
"code": 2200
@@ -3910,7 +4062,7 @@
39104062
"category": "Message",
39114063
"code": 6079
39124064
},
3913-
"Specify JSX code generation: 'preserve', 'react-native', or 'react'.": {
4065+
"Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'.": {
39144066
"category": "Message",
39154067
"code": 6080
39164068
},
@@ -4748,6 +4900,10 @@
47484900
"category": "Error",
47494901
"code": 6504
47504902
},
4903+
"Print names of files and the reason they are part of the compilation.": {
4904+
"category": "Message",
4905+
"code": 6505
4906+
},
47514907
"Require undeclared properties from index signatures to use element accesses.": {
47524908
"category": "Error",
47534909
"code": 6803

0 commit comments

Comments
 (0)