Initial VS Code 1.19 source merge (microsoft#571)

* Initial 1.19 xcopy * Fix yarn build * Fix numerous build breaks * Next batch of build break fixes * More build break fixes * Runtime breaks * Additional post merge fixes * Fix windows setup file * Fix test failures. * Update license header blocks to refer to source eula
msnidhijangir · Jan 29, 2018 · 251ae01 · 251ae01
1 parent 9a1ac20
commit 251ae01
Show file tree

Hide file tree

Showing 8,009 changed files with 93,204 additions and 35,460 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -11,6 +11,6 @@ trim_trailing_whitespace = true
 
 # The indent size used in the `package.json` file cannot be changed
 # https://github.com/npm/npm/pull/3180#issuecomment-16336516
-[{*.yml,*.yaml,npm-shrinkwrap.json,package.json}]
+[{*.yml,*.yaml,package.json}]
 indent_style = space
 indent_size = 2
diff --git a/.eslintrc b/.eslintrc
@@ -10,5 +10,10 @@
 		"no-extra-semi": "warn",
 		"semi": "warn"
 	},
-	"extends": "eslint:recommended"
+	"extends": "eslint:recommended",
+	"parserOptions": {
+		"ecmaFeatures": {
+			"experimentalObjectRestSpread": true
+		}
+	}
 }
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
@@ -1,22 +1,8 @@
 .DS_Store
 npm-debug.log
 Thumbs.db
-.DS_Store
-*.dat
-*.db
-*.exe
-*.log
-*.nupkg
-*.orig
-*.vsix
-*BROWSE.VC*
-sqltoolsservice
-coverage
-test-reports
-.vscode-test
 node_modules/
 .build/
-.vs/
 out/
 out-build/
 out-editor/
@@ -26,4 +12,5 @@ out-vscode/
 out-vscode-min/
 build/node_modules
 coverage/
-_site
+test_data/
+yarn-error.log
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+8.9.2
diff --git a/.travis.yml b/.travis.yml
@@ -7,10 +7,13 @@ os:
 
 cache:
   directories:
-    - $HOME/.npm
+    - $HOME/.cache/yarn
 
 notifications:
   email: false
+  webhooks:
+    - http://vscode-probot.westus.cloudapp.azure.com:3450/travis/notifications
+    - http://vscode-test-probot.westus.cloudapp.azure.com:3450/travis/notifications
 
 addons:
   apt:
@@ -31,24 +34,29 @@ before_install:
   - git submodule update --init --recursive
   - git clone --depth 1 https://github.com/creationix/nvm.git ./.nvm
   - source ./.nvm/nvm.sh
-  - nvm install 7.9.0
-  - nvm use 7.9.0
-  - npm config set python `which python`
-  - npm install -g gulp
+  - nvm install 8.9.1
+  - nvm use 8.9.1
+  - npm i -g yarn
+  # - npm config set python `which python`
   - if [ $TRAVIS_OS_NAME == "linux" ]; then
       export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
       sh -e /etc/init.d/xvfb start;
       sleep 3;
     fi
+  # Make npm logs less verbose
+  # - npm config set depth 0
+  # - npm config set loglevel warn
 
 install:
-  - ./scripts/npm.sh install
+  - yarn
 
 script:
-  - gulp electron --silent
-  - gulp compile --silent --max_old_space_size=4096
-  - gulp optimize-vscode --silent --max_old_space_size=4096
+  - node_modules/.bin/gulp hygiene
+  - node_modules/.bin/gulp electron --silent
+  - node_modules/.bin/gulp compile --silent --max_old_space_size=4096
+  - node_modules/.bin/gulp optimize-vscode --silent --max_old_space_size=4096
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./scripts/test.sh --coverage --reporter dot; else ./scripts/test.sh --reporter dot; fi
+  - ./scripts/test-integration.sh
 
 after_success:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then node_modules/.bin/coveralls < .build/coverage/lcov.info; fi
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -104,6 +104,7 @@
 			},
 			"stopOnEntry": false,
 			"args": [
+				"--delay",
 				"--timeout",
 				"2000"
 			],

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -34,5 +34,7 @@
 				"command": "${workspaceFolder}\\scripts\\test.bat --coverage --run ${file}"
 			}
 		}
-	]
+	],
+	"typescript.tsdk": "node_modules/typescript/lib",
+	"git.ignoreLimitWarning": true
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -33,11 +33,11 @@
 			"task": "tslint",
 			"label": "Run tslint",
 			"problemMatcher": [
-				"$tslint4"
+				"$tslint5"
 			]
 		},
 		{
-			"taskName": "Run tests",
+			"label": "Run tests",
 			"type": "shell",
 			"command": "./scripts/test.sh",
 			"windows": {
@@ -50,7 +50,7 @@
 			}
 		},
 		{
-			"taskName": "Run Dev",
+			"label": "Run Dev",
 			"type": "shell",
 			"command": "./scripts/code.sh",
 			"windows": {

diff --git a/.yarnrc b/.yarnrc
@@ -0,0 +1,3 @@
+disturl "https://atom.io/download/electron"
+target "1.7.11"
+runtime "electron"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,46 +1,103 @@
-## Contributing Issues
+# Contributing to VS Code
 
-### Before Submitting an Issue
-First, please do a search in [open issues](https://github.com/Microsoft/sqlopsstudio/issues) to see if the issue or feature request has already been filed. Use this [query](https://github.com/Microsoft/sqlopsstudio/issues?q=is%3Aopen+is%3Aissue+label%3Afeature-request+sort%3Areactions-%2B1-desc) to search for the most popular feature requests.
+Welcome, and thank you for your interest in contributing to VS Code!
 
-If you find your issue already exists, make relevant comments and add your [reaction](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments). Use a reaction in place of a "+1" comment.
+There are many ways that you can contribute, beyond writing code. The goal of this document is to provide a high-level overview of how you can get involved.
 
-👍 - upvote
+## Asking Questions
 
-👎 - downvote
+Have a question? Rather than opening an issue, please ask away on [Stack Overflow](https://stackoverflow.com/questions/tagged/vscode) using the tag `vscode`.
 
-If you cannot find an existing issue that describes your bug or feature, submit an issue using the guidelines below.
+The active community will be eager to assist you. Your well-worded question will serve as a resource to others searching for help.
 
-## Writing Good Bug Reports and Feature Requests
+## Providing Feedback
 
-File a single issue per problem and feature request.
+Your comments and feedback are welcome, and the development team is available via handful of different channels.
 
-* Do not enumerate multiple bugs or feature requests in the same issue.
-* Do not add your issue as a comment to an existing issue unless it's for the identical input. Many issues look similar, but have different causes.
+See the [Feedback Channels](https://github.com/Microsoft/vscode/wiki/Feedback-Channels) wiki page for details about how to share your thoughts.
 
-The more information you can provide, the more likely someone will be successful reproducing the issue and finding a fix. 
+## Reporting Issues
 
-Please include the following with each issue. 
+Have you identified a reproducible problem in VS Code? Have a feature request? We want to hear about it! Here's how you can make reporting your issue as effective as possible.
 
-* Version of SQL Ops Studio
+### Identify Where to Report
 
-> **Tip:** You can easily create an issue using `Report Issues` from SQL Operations Studio Help menu. 
+The VS Code project is distributed across multiple repositories. Try to file the issue against the correct repository. Check the list of [Related Projects](https://github.com/Microsoft/vscode/wiki/Related-Projects) if you aren't sure which repo is correct.
 
-* Reproducible steps (1... 2... 3...) and what you expected versus what you actually saw. 
-* Images, animations, or a link to a video. 
-* A code snippet that demonstrates the issue or a link to a code repository we can easily pull down onto our machine to recreate the issue. 
+Can you recreate the issue even after [disabling all extensions](https://code.visualstudio.com/docs/editor/extension-gallery#_disable-an-extension)? If you find the issue is caused by an extension you have installed, please file an issue on the extension's repo directly.
 
-> **Note:** Because we need to copy and paste the code snippet, including a code snippet as a media file (i.e. .gif) is not sufficient. 
+### Look For an Existing Issue
 
-* Errors in the Dev Tools Console (Help | Toggle Developer Tools)
+Before you create a new issue, please do a search in [open issues](https://github.com/Microsoft/vscode/issues) to see if the issue or feature request has already been filed.
+
+Be sure to scan through the [most popular](https://github.com/Microsoft/vscode/issues?q=is%3Aopen+is%3Aissue+label%3Afeature-request+sort%3Areactions-%2B1-desc) feature requests.
+
+If you find your issue already exists, make relevant comments and add your [reaction](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments). Use a reaction in place of a "+1" comment:
+
+* 👍 - upvote
+* 👎 - downvote
+
+
+If you cannot find an existing issue that describes your bug or feature, create a new issue using the guidelines below.
+
+### Writing Good Bug Reports and Feature Requests
+
+File a single issue per problem and feature request. Do not enumerate multiple bugs or feature requests in the same issue.
+
+Do not add your issue as a comment to an existing issue unless it's for the identical input. Many issues look similar, but have different causes.
+
+The more information you can provide, the more likely someone will be successful reproducing the issue and finding a fix.
+
+Please include the following with each issue:
+
+* Version of VS Code
+
+* List of extensions that you have installed.
+  * **Tip:** You can easily add the list of extensions by creating the issue using `Report Issues` from VS Code's Help menu
+
+* Reproducible steps (1... 2... 3...) that cause the issue
+
+* What you expected to see, versus what you actually saw
+
+* Images, animations, or a link to a video showing the issue occuring
+
+* A code snippet that demonstrates the issue or a link to a code repository the developers can easily pull down to recreate the issue locally
+
+  * **Note:** Because the developers need to copy and paste the code snippet, including a code snippet as a media file (i.e. .gif) is not sufficient.
+
+* Errors from the Dev Tools Console (open from the menu: Help > Toggle Developer Tools)
+
+### Final Checklist
 
 Please remember to do the following:
 
-* Search the issue repository to see if there exists a duplicate. 
-* Simplify your scripts around the issue so we can better isolate the problem. 
+* [ ] Search the issue repository to ensure your report is a new issue
+
+* [ ] Recreate the issue after disabling all extensions
+
+* [ ] Simplify your code around the issue to better isolate the problem
+
+Don't feel bad if the developers can't reproduce the issue right away. They will simply ask for more information!
+
+### Follow Your Issue
+
+Once submitted, your report will go into the [issue tracking](https://github.com/Microsoft/vscode/wiki/Issue-Tracking) work flow. Be sure to understand what will happen next, so you know what to expect, and how to continue to assist throughout the process.
 
-Don't feel bad if we can't reproduce the issue and ask for more information!
+## Automated Issue Management
+
+We use a bot to help us manage issues. This bot currently:
+
+* Automatically closes any issue marked `needs-more-info` if there has been no response in past 7 days.
+* Automatically locks 45 days after they are closed.
+
+If you believe the bot got something wrong, please open a new issue and let us know.
 
 ## Contributing Fixes
-If you are interested in fixing issues and contributing directly to the code base,
-please see the document [How to Contribute](https://github.com/Microsoft/sqlopsstudio/wiki/How-to-Contribute).
+
+If you are interested in writing code to fix issues,
+please see [How to Contribute](https://github.com/Microsoft/vscode/wiki/How-to-Contribute) in the wiki.
+
+# Thank You!
+
+Your contributions to open source, large or small, make great projects like this possible. Thank you for taking the time to contribute.
+
diff --git a/OSSREADME.json b/OSSREADME.json
@@ -771,5 +771,42 @@
 		"\"\"\""
 	],
 	"isProd": true
+},
+{
+	"name": "spdlog original",
+	"version": "0.14.0",
+	"repositoryURL": "https://github.com/gabime/spdlog",
+	"license": "MIT",
+	"isProd": true
+},
+{
+	"isLicense": true,
+	"name": "spdlog",
+	"version": "0.14.0",
+	"repositoryURL": "https://github.com/gabime/spdlog",
+	"license": "MIT",
+	"licenseDetail": [
+		"MIT License",
+		"",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"",
+		"Permission is hereby granted, free of charge, to any person obtaining a copy",
+		"of this software and associated documentation files (the \"Software\"), to deal",
+		"in the Software without restriction, including without limitation the rights",
+		"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+		"copies of the Software, and to permit persons to whom the Software is",
+		"furnished to do so, subject to the following conditions:",
+		"",
+		"The above copyright notice and this permission notice shall be included in all",
+		"copies or substantial portions of the Software.",
+		"",
+		"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+		"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+		"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+		"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+		"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+		"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
+		"SOFTWARE"
+	]
 }
 ]