diff --git a/.yarnrc b/.yarnrc index a955a275dab4275d56f736a42db6b5791c069c45..0ea20d46e4c9f0128d45195d2accf995ebf84513 100644 --- a/.yarnrc +++ b/.yarnrc @@ -1,3 +1,3 @@ disturl "https://electronjs.org/headers" -target "11.2.0" +target "12.0.0-beta.14" runtime "electron" diff --git a/cgmanifest.json b/cgmanifest.json index 8f419d60bc89e7db1e5ba47d04b73d9752e08585..e371b30739d22e80fa63faced12efa4fb9e73ae9 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -60,7 +60,7 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "56e926ce2362770a84403059b3ce3d40135ed7db" + "commitHash": "0e7ff69a4e1913ff9c3dff2ce1522c784fe24e86" } }, "isOnlyProductionDependency": true, diff --git a/package.json b/package.json index 5fe7d508b8de006fc5c41f05d4dfb44bbe3035b9..589127225da4d6d0edd70ca5e84ca7a28bf1e5cd 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ "css-loader": "^3.2.0", "debounce": "^1.0.0", "deemon": "^1.4.0", - "electron": "11.2.0", + "electron": "12.0.0-beta.14", "electron-rebuild": "2.0.3", "eslint": "6.8.0", "eslint-plugin-jsdoc": "^19.1.0", diff --git a/scripts/test-emmet.bat b/scripts/test-emmet.bat new file mode 100644 index 0000000000000000000000000000000000000000..dfe514b52b16536a2f86d43de00474c89e2c2616 --- /dev/null +++ b/scripts/test-emmet.bat @@ -0,0 +1,55 @@ +@echo off +setlocal + +pushd %~dp0\.. + +set VSCODEUSERDATADIR=%TEMP%\vscodeuserfolder-%RANDOM%-%TIME:~6,2% +set VSCODECRASHDIR=%~dp0\..\.build\crashes + +:: Figure out which Electron to use for running tests +if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" ( + :: Run out of sources: no need to compile as code.bat takes care of it + chcp 65001 + set INTEGRATION_TEST_ELECTRON_PATH=.\scripts\code.bat + set VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE=1 + + echo Storing crash reports into '%VSCODECRASHDIR%'. + echo Running integration tests out of sources. +) else ( + :: Run from a built: need to compile all test extensions + :: 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:typescript-language-features^ + compile-extension:vscode-custom-editor-tests^ + compile-extension:vscode-notebook-tests^ + 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 + set ELECTRON_ENABLE_LOGGING=1 + + echo Storing crash reports into '%VSCODECRASHDIR%'. + echo Running integration tests with '%INTEGRATION_TEST_ELECTRON_PATH%' as build. +) + +:: Integration & performance tests in AMD +@REM ::call .\scripts\test.bat --runGlob **\*.integrationTest.js %* +@REM ::if %errorlevel% neq 0 exit /b %errorlevel% + +:: Tests in the extension host + +call "%INTEGRATION_TEST_ELECTRON_PATH%" $%~dp0\..\extensions\emmet\out\test\test-fixtures --extensionDevelopmentPath=%~dp0\..\extensions\emmet --extensionTestsPath=%~dp0\..\extensions\emmet\out\test --disable-telemetry --crash-reporter-directory=%VSCODECRASHDIR% --no-cached-data --disable-updates --disable-extensions --user-data-dir=%VSCODEUSERDATADIR% . +if %errorlevel% neq 0 exit /b %errorlevel% + +rmdir /s /q %VSCODEUSERDATADIR% + +popd + +endlocal diff --git a/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts index 918671def3af2b0ec97852cb3c5c2f7299e921dd..29d5814c546f78b851f0d4e2704d2f18c61e82ed 100644 --- a/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts +++ b/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts @@ -290,8 +290,7 @@ export class ElectronWebviewBasedWebview extends BaseWebview impleme const findOptions: FindInPageOptions = { forward: options.forward, findNext: false, - matchCase: options.matchCase, - medialCapitalAsWordStart: options.medialCapitalAsWordStart + matchCase: options.matchCase }; this._findStarted = true; diff --git a/yarn.lock b/yarn.lock index c6f15827b5e6b09e4472b4c01759b18cb7f98171..c17d478481060c1dadc45746448867252f60a63e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -338,11 +338,6 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.21.tgz#7e8a0c34cf29f4e17a36e9bd0ea72d45ba03908e" integrity sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ== -"@types/node@^12.0.12": - version "12.12.24" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.24.tgz#d4606afd8cf6c609036b854360367d1b2c78931f" - integrity sha512-1Ciqv9pqwVtW6FsIUKSZNB82E5Cu1I2bBTj1xuIHXLe/1zYLl3956Nbhg2MzSYHVfl9/rmanjbQIb7LibfCnug== - "@types/node@^12.19.9": version "12.19.9" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679" @@ -353,6 +348,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.34.tgz#c9300a1b6560d90817fb2bba650e250116a575f9" integrity sha512-g8D1HF2dMDKYSDl5+79izRwRgNPsSynmWMbj50mj7GZ0b7Lv4p8EmZjbo3h0h+6iLr6YmVz9VnF6XVZ3O6V1Ug== +"@types/node@^14.6.2": + version "14.14.20" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.20.tgz#f7974863edd21d1f8a494a73e8e2b3658615c340" + integrity sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A== + "@types/semver@^5.4.0", "@types/semver@^5.5.0": version "5.5.0" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45" @@ -3041,13 +3041,13 @@ electron-to-chromium@^1.2.7: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d" integrity sha1-eOy4o5kGYYe7N07t412ccFZagD0= -electron@11.2.0: - version "11.2.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.0.tgz#f8577ea4c9ba94068850256145be26b0b89a5dd7" - integrity sha512-weszOPAJPoPu6ozL7vR9enXmaDSqH+KE9iZODfbGdnFgtVfVdfyedjlvEGIUJkLMPXM1y/QWwCl2dINzr0Jq5Q== +electron@12.0.0-beta.14: + version "12.0.0-beta.14" + resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.0-beta.14.tgz#f8c40c7e479879c305e519380e710c0a357aa734" + integrity sha512-PYM+EepIEj9kLePXEb9gIxzZk5H4zM7LGg5iw60OHt+SYEECPNFJmPj3N6oHKu3W+KrCG7285Vgz2ZCp1u0kKA== dependencies: "@electron/get" "^1.0.1" - "@types/node" "^12.0.12" + "@types/node" "^14.6.2" extract-zip "^1.0.3" elliptic@^6.0.0: