Merge from vscode 4c9161a3f125f5a788aafa73a4ecfcb27dcfc319 (#9143)

* Merge from vscode 4c9161a3f125f5a788aafa73a4ecfcb27dcfc319

* minor spacing fix
This commit is contained in:
Anthony Dresser
2020-02-13 21:20:36 -06:00
committed by GitHub
parent 0c56d44e4f
commit 71375808b9
57 changed files with 706 additions and 510 deletions

View File

@@ -66,11 +66,11 @@ const server = http.createServer((req, res) => {
// manifest
res.writeHead(200, { 'Content-Type': 'application/json' });
return res.end(JSON.stringify({
"name": "Code Web - OSS",
"short_name": "Code Web - OSS",
"start_url": "/",
"lang": "en-US",
"display": "standalone"
'name': 'Code Web - OSS',
'short_name': 'Code Web - OSS',
'start_url': '/',
'lang': 'en-US',
'display': 'standalone'
}));
}
if (/^\/static\//.test(pathname)) {

View File

@@ -15,14 +15,16 @@ if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
echo Running integration tests out of sources.
) else (
:: Run from a built: need to compile all test extensions
call yarn gulp compile-extension:vscode-api-tests
call yarn gulp compile-extension:vscode-colorize-tests
call yarn gulp compile-extension:markdown-language-features
call yarn gulp compile-extension:emmet
call yarn gulp compile-extension:css-language-features-server
call yarn gulp compile-extension:html-language-features-server
call yarn gulp compile-extension:json-language-features-server
call yarn gulp compile-extension:git
:: because we run extension tests from their source folders
:: and the build bundles extensions into .build webpacked
call yarn gulp compile-extension:vscode-api-tests^
compile-extension:vscode-colorize-tests^
compile-extension:markdown-language-features^
compile-extension:emmet^
compile-extension:css-language-features-server^
compile-extension:html-language-features-server^
compile-extension:json-language-features-server^
compile-extension:git
:: Configuration for more verbose output
set VSCODE_CLI=1

View File

@@ -21,14 +21,16 @@ then
echo "Running integration tests out of sources."
else
# Run from a built: need to compile all test extensions
yarn gulp compile-extension:vscode-api-tests
yarn gulp compile-extension:vscode-colorize-tests
yarn gulp compile-extension:markdown-language-features
yarn gulp compile-extension:emmet
yarn gulp compile-extension:css-language-features-server
yarn gulp compile-extension:html-language-features-server
yarn gulp compile-extension:json-language-features-server
yarn gulp compile-extension:git
# because we run extension tests from their source folders
# and the build bundles extensions into .build webpacked
yarn gulp compile-extension:vscode-api-tests \
compile-extension:vscode-colorize-tests \
compile-extension:markdown-language-features \
compile-extension:emmet \
compile-extension:css-language-features-server \
compile-extension:html-language-features-server \
compile-extension:json-language-features-server \
compile-extension:git
# Configuration for more verbose output
export VSCODE_CLI=1