Merge branch 'master' into assertionsInControlFlow

# Conflicts:
#	src/compiler/checker.ts

Author: ahejlsberg

.gitignore

@@ -81,4 +81,14 @@ tests/cases/user/*/**/*.d.ts
 tests/baselines/reference/dt
 .failed-tests
 TEST-results.xml
-package-lock.json
+package-lock.json
+tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter
+tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
+tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter
+tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter
+tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter
+tests/cases/user/create-react-app/create-react-app
+tests/cases/user/webpack/webpack
+tests/cases/user/puppeteer/puppeteer
+tests/cases/user/axios-src/axios-src
+tests/cases/user/prettier/prettier

.gitmodules

@@ -1,40 +0,0 @@
-[submodule "tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter"]
-	path = tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter
-	url = https://github.com/Microsoft/TypeScript-React-Starter
-	ignore = all
-[submodule "tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter"]
-	path = tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
-	url = https://github.com/Microsoft/TypeScript-Node-Starter.git
-	ignore = all
-[submodule "tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter"]
-	path = tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter
-	url = https://github.com/Microsoft/TypeScript-React-Native-Starter.git
-	ignore = all
-[submodule "tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter"]
-	path = tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter
-	url = https://github.com/Microsoft/TypeScript-Vue-Starter.git
-	ignore = all
-[submodule "tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter"]
-	path = tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter
-	url = https://github.com/Microsoft/TypeScript-WeChat-Starter.git
-	ignore = all
-[submodule "tests/cases/user/create-react-app/create-react-app"]
-	path = tests/cases/user/create-react-app/create-react-app
-	url = https://github.com/facebook/create-react-app.git
-	ignore = all
-[submodule "tests/cases/user/webpack/webpack"]
-	path = tests/cases/user/webpack/webpack 
-        url = https://github.com/webpack/webpack.git
-	ignore = all
-[submodule "tests/cases/user/puppeteer/puppeteer"]
-	path = tests/cases/user/puppeteer/puppeteer
-	url = https://github.com/GoogleChrome/puppeteer.git
-	ignore = all
-[submodule "tests/cases/user/axios-src/axios-src"]
-	path = tests/cases/user/axios-src/axios-src
-	url = https://github.com/axios/axios.git
-        ignore = all
-[submodule "tests/cases/user/prettier/prettier"]
-	path = tests/cases/user/prettier/prettier
-	url = https://github.com/prettier/prettier.git
-        ignore = all

.vscode/settings.json

@@ -6,8 +6,7 @@
         }
     ],
     "eslint.options": {
-        "rulePaths": ["../scripts/eslint/built/rules/"],
+        "rulePaths": ["./scripts/eslint/built/rules/"],
         "ext": [".ts"]
-    },
-    "eslint.workingDirectories": ["./src", "./scripts"]
+    }
 }

CONTRIBUTING.md

@@ -71,7 +71,7 @@ Design changes will not be accepted at this time. If you have a design change pr
 
 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.
 
-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 <cla@microsoft.com>. Be sure to include your github user name along with the agreement. Once we have received the signed CLA, we'll review the request. 
+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 <cla@microsoft.com>. Be sure to include your GitHub user name along with the agreement. Once we have received the signed CLA, we'll review the request. 
 
 ## Housekeeping
 
@@ -148,7 +148,7 @@ You will probably only want to debug one test at a time:
 gulp runtests-browser --tests=2dArrays
 ```
 
-You can specify which browser to use for debugging. Currently Chrome and IE are supported:
+You can specify which browser to use for debugging. Currently, Chrome and IE are supported:
 
 ```Shell
 gulp runtests-browser --tests=2dArrays --browser=chrome

package.json

@@ -102,6 +102,7 @@
         "xml2js": "^0.4.19"
     },
     "scripts": {
+        "prepare": "gulp build-eslint-rules",
         "pretest": "gulp tests",
         "test": "gulp runtests-parallel --light=false",
         "test:eslint-rules": "gulp run-eslint-rules-tests",

scripts/post-vsts-artifact-comment.js

@@ -28,6 +28,10 @@ async function main() {
         type: "token",
         token: process.argv[2]
     });
+
+    // Please keep the strings "an installable tgz" and "packed" in this message, as well as the devDependencies section,
+    // so that the playgrounds deployment process can find these comments.
+
     await gh.issues.createComment({
         number: +process.env.SOURCE_ISSUE,
         owner: "Microsoft",
@@ -43,6 +47,9 @@ async function main() {
 and then running \`npm install\`.
 `
     });
+
+    // Send a ping to https://github.com/orta/make-monaco-builds#pull-request-builds
+    await gh.request("POST /repos/orta/make-monaco-builds/dispatches", { event_type: +process.env.SOURCE_ISSUE })
 }
 
 main().catch(async e => {
@@ -61,4 +68,4 @@ main().catch(async e => {
             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)).`
         });
     }
-});
+});

src/compiler/binder.ts

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