Skip to content

Commit c3dcc37

Browse files
committed
Merge branch 'master' into assertionsInControlFlow
# Conflicts: # src/compiler/checker.ts
2 parents 97d69d4 + 10e3f11 commit c3dcc37

File tree

215 files changed

+6658
-18235
lines changed

Some content is hidden

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

215 files changed

+6658
-18235
lines changed

.gitignore

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,14 @@ tests/cases/user/*/**/*.d.ts
8181
tests/baselines/reference/dt
8282
.failed-tests
8383
TEST-results.xml
84-
package-lock.json
84+
package-lock.json
85+
tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter
86+
tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
87+
tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter
88+
tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter
89+
tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter
90+
tests/cases/user/create-react-app/create-react-app
91+
tests/cases/user/webpack/webpack
92+
tests/cases/user/puppeteer/puppeteer
93+
tests/cases/user/axios-src/axios-src
94+
tests/cases/user/prettier/prettier

.gitmodules

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +0,0 @@
1-
[submodule "tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter"]
2-
path = tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter
3-
url = https://github.com/Microsoft/TypeScript-React-Starter
4-
ignore = all
5-
[submodule "tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter"]
6-
path = tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
7-
url = https://github.com/Microsoft/TypeScript-Node-Starter.git
8-
ignore = all
9-
[submodule "tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter"]
10-
path = tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter
11-
url = https://github.com/Microsoft/TypeScript-React-Native-Starter.git
12-
ignore = all
13-
[submodule "tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter"]
14-
path = tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter
15-
url = https://github.com/Microsoft/TypeScript-Vue-Starter.git
16-
ignore = all
17-
[submodule "tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter"]
18-
path = tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter
19-
url = https://github.com/Microsoft/TypeScript-WeChat-Starter.git
20-
ignore = all
21-
[submodule "tests/cases/user/create-react-app/create-react-app"]
22-
path = tests/cases/user/create-react-app/create-react-app
23-
url = https://github.com/facebook/create-react-app.git
24-
ignore = all
25-
[submodule "tests/cases/user/webpack/webpack"]
26-
path = tests/cases/user/webpack/webpack
27-
url = https://github.com/webpack/webpack.git
28-
ignore = all
29-
[submodule "tests/cases/user/puppeteer/puppeteer"]
30-
path = tests/cases/user/puppeteer/puppeteer
31-
url = https://github.com/GoogleChrome/puppeteer.git
32-
ignore = all
33-
[submodule "tests/cases/user/axios-src/axios-src"]
34-
path = tests/cases/user/axios-src/axios-src
35-
url = https://github.com/axios/axios.git
36-
ignore = all
37-
[submodule "tests/cases/user/prettier/prettier"]
38-
path = tests/cases/user/prettier/prettier
39-
url = https://github.com/prettier/prettier.git
40-
ignore = all

.vscode/settings.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
}
77
],
88
"eslint.options": {
9-
"rulePaths": ["../scripts/eslint/built/rules/"],
9+
"rulePaths": ["./scripts/eslint/built/rules/"],
1010
"ext": [".ts"]
11-
},
12-
"eslint.workingDirectories": ["./src", "./scripts"]
11+
}
1312
}

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Design changes will not be accepted at this time. If you have a design change pr
7171

7272
You will need to complete a Contributor License Agreement (CLA). Briefly, this agreement testifies that you are granting us permission to use the submitted change according to the terms of the project's license, and that the work being submitted is under appropriate copyright.
7373

74-
Please submit a Contributor License Agreement (CLA) before submitting a pull request. You may visit https://cla.microsoft.com to sign digitally. Alternatively, download the agreement ([Microsoft Contribution License Agreement.pdf](https://opensource.microsoft.com/pdf/microsoft-contribution-license-agreement.pdf)), sign, scan, and email it back to <[email protected]>. Be sure to include your github user name along with the agreement. Once we have received the signed CLA, we'll review the request.
74+
Please submit a Contributor License Agreement (CLA) before submitting a pull request. You may visit https://cla.microsoft.com to sign digitally. Alternatively, download the agreement ([Microsoft Contribution License Agreement.pdf](https://opensource.microsoft.com/pdf/microsoft-contribution-license-agreement.pdf)), sign, scan, and email it back to <[email protected]>. Be sure to include your GitHub user name along with the agreement. Once we have received the signed CLA, we'll review the request.
7575

7676
## Housekeeping
7777

@@ -148,7 +148,7 @@ You will probably only want to debug one test at a time:
148148
gulp runtests-browser --tests=2dArrays
149149
```
150150

151-
You can specify which browser to use for debugging. Currently Chrome and IE are supported:
151+
You can specify which browser to use for debugging. Currently, Chrome and IE are supported:
152152

153153
```Shell
154154
gulp runtests-browser --tests=2dArrays --browser=chrome

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
"xml2js": "^0.4.19"
103103
},
104104
"scripts": {
105+
"prepare": "gulp build-eslint-rules",
105106
"pretest": "gulp tests",
106107
"test": "gulp runtests-parallel --light=false",
107108
"test:eslint-rules": "gulp run-eslint-rules-tests",

scripts/post-vsts-artifact-comment.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ async function main() {
2828
type: "token",
2929
token: process.argv[2]
3030
});
31+
32+
// Please keep the strings "an installable tgz" and "packed" in this message, as well as the devDependencies section,
33+
// so that the playgrounds deployment process can find these comments.
34+
3135
await gh.issues.createComment({
3236
number: +process.env.SOURCE_ISSUE,
3337
owner: "Microsoft",
@@ -43,6 +47,9 @@ async function main() {
4347
and then running \`npm install\`.
4448
`
4549
});
50+
51+
// Send a ping to https://github.com/orta/make-monaco-builds#pull-request-builds
52+
await gh.request("POST /repos/orta/make-monaco-builds/dispatches", { event_type: +process.env.SOURCE_ISSUE })
4653
}
4754

4855
main().catch(async e => {
@@ -61,4 +68,4 @@ main().catch(async e => {
6168
body: `Hey @${process.env.REQUESTING_USER}, something went wrong when looking for the build artifact. ([You can check the log here](https://typescript.visualstudio.com/TypeScript/_build/index?buildId=${process.env.BUILD_BUILDID}&_a=summary)).`
6269
});
6370
}
64-
});
71+
});

src/compiler/binder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2883,7 +2883,7 @@ namespace ts {
28832883

28842884
// If this is a property-parameter, then also declare the property symbol into the
28852885
// containing class.
2886-
if (isParameterPropertyDeclaration(node)) {
2886+
if (isParameterPropertyDeclaration(node, node.parent)) {
28872887
const classDeclaration = <ClassLikeDeclaration>node.parent.parent;
28882888
declareSymbol(classDeclaration.symbol.members!, classDeclaration.symbol, node, SymbolFlags.Property | (node.questionToken ? SymbolFlags.Optional : SymbolFlags.None), SymbolFlags.PropertyExcludes);
28892889
}

0 commit comments

Comments
 (0)