Commit Graph

240 Commits

Author SHA1 Message Date
Asher 546dd9c278
Catch getLayoutMap error (#3518)
This might be causing issues with the PWA showing a blank screen with
MacOS.
2021-06-01 16:04:26 -05:00
Joe Previte 604491d333
fix: use correct command to Open Folder on Welcome page (#3437)
* chore: update CHANGELOG

* fix: use openFolder in welcomePage

In 1.56.2, they modified the WelcomePage use of OpenFileFolder in
src/vs/workbench/contrib/debug/browser/welcomeView.ts to only use on macOS +
Desktop (i.e. not Web). This caused the "Open Folder" to not work on macOS +
macOS-like environments.

Instead, we use OpenFolder which is a registered command and works as expected.
2021-05-21 19:27:50 +00:00
Asher b49b1796e9
Add socket type to websocket connection query (#3391)
This was added a long time ago but accidentally lost when we reverted
the retry changes to this file after one of the VS Code updates that
added their own retry (we reverted everything not realizing we had other
unrelated changes in here).
2021-05-14 15:05:05 -05:00
kenve 8e21eb51b3
fix(lib/vscode): fix missing rimraf when running postinstall script (#3383) 2021-05-13 11:06:45 -05:00
Akash Satheesan 74fbb425f2
fix(lib/vscode): update to 1.56.1 (#3351) 2021-05-12 01:15:06 +05:30
Akash Satheesan 2ae8729ef3
chore(deps): update postcss, trim (#3356) 2021-05-12 00:44:50 +05:30
Akash Satheesan 7421e9d631 chore(lib/vscode): remove plist from deps 2021-05-10 21:57:54 +05:30
Akash Satheesan 02a0e05a14
chore(lib/vscode): cleanup/update build deps (#3314) 2021-05-08 01:29:22 +05:30
Asher 5d5ecdc795
Merge pull request #3308 from code-asher/pty-host-service 2021-05-07 14:12:37 -05:00
Asher 99317fc622
Merge pull request #3309 from code-asher/create-dirs 2021-05-07 13:29:41 -05:00
Asher bdb230ba8d
Add pty host to build 2021-05-07 13:25:23 -05:00
Asher 51d294e163
Remove extension dir scan catch
Now that we are creating the directories these shouldn't error. If they
are somehow missing (if the user deletes them after VS Code starts for
example) then I think we should surface that to the user.
2021-05-07 12:31:43 -05:00
Asher 9ff29d17fb
Make sure directories exist
Fixes #3040.
2021-05-07 12:31:42 -05:00
Asher c416e9b2c4
Use ptyHostService
Most of this was a straightforward replacement of our code with theirs
but I also removed `getDefaultShellAndArgs` since it seems the reference
implementation no longer does that either.

Fixes #2276.
2021-05-07 12:31:24 -05:00
dependabot[bot] f97f8538b1
chore(deps): bump lodash from 4.17.20 to 4.17.21 in /lib/vscode/build
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-07 17:28:35 +00:00
Akash Satheesan b21a9af473
chore(lib/vscode): remove gulp-azure-storage from deps (#3310) 2021-05-07 22:54:15 +05:30
Akash Satheesan ab122daa93
Merge branch 'main' into vscode-1.56 2021-05-07 07:20:48 +05:30
Joe Previte 2f2fd066ad
Merge pull request #3302 from cdr/dependabot/npm_and_yarn/lib/vscode/lodash-4.17.21
chore(deps): bump lodash from 4.17.20 to 4.17.21 in /lib/vscode
2021-05-06 15:11:57 -07:00
dependabot[bot] ae708dbed4
chore(deps): bump lodash from 4.17.20 to 4.17.21 in /lib/vscode
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-06 20:01:49 +00:00
dependabot[bot] 1eee766bee
chore(deps-dev): bump underscore from 1.8.3 to 1.12.1 in /lib/vscode
Bumps [underscore](https://github.com/jashkenas/underscore) from 1.8.3 to 1.12.1.
- [Release notes](https://github.com/jashkenas/underscore/releases)
- [Commits](https://github.com/jashkenas/underscore/compare/1.8.3...1.12.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-06 19:25:49 +00:00
Akash Satheesan 372a8f14c5 Squashed 'lib/vscode/' changes from 631dbe250bc..cfa2e218100
cfa2e218100 Make sure we actually update the local resource roots (#122957)
206524cbf6f Merge pull request #122941 from microsoft/roblou/fix122701
0ce07162f07 Use the scoped context key service for notebook editor context keys Fix #122701
4fbe56e36b3 Merge pull request #122933 from microsoft/aeschli/122466
32a743d2af9 [JSON] Schema not found error on opening package.json. For #122279
0676e9a727e Fix port theme color typo (#122915)
85f8ebf1687 Fix context on LabelTunnelAction (#122856)
5913f53cab5 Block windows/iframes from preventing the unload (#122835) (#122869)
acd78c82ac6 Ensure that notebook cell URIs work (#122747)
4e185d89863 Merge pull request #122764 from microsoft/roblou/fix122407
7eb7814b56c Try to block webviews from cancelling unloads (#122758)
25092105030 Hardcode keybinding string to fix #122407
b084e6f4a73 Fix currently active indicator preventing editor switching (#122742)
bc2373aaa54 Merge pull request #122732 from microsoft/r156_tabs
d7a86f269a8 Disable tabs by default

git-subtree-dir: lib/vscode
git-subtree-split: cfa2e218100323074ac1948c885448fdf4de2a7f
2021-05-06 22:08:24 +05:30
Akash Satheesan a631d19636
Merge branch 'main' into vscode-1.56 2021-05-05 23:28:25 +05:30
Akash Satheesan ce26ad7c30
refactor(lib/vscode): move commit to global constant 2021-05-05 23:24:21 +05:30
Akash Satheesan 8cb55b5719
refactor(lib/vscode): don't provide home indicator 2021-05-05 23:21:11 +05:30
Akash Satheesan cf61451d49
fix(lib/vscode): fix conflicts in githubServer.ts 2021-05-05 22:29:07 +05:30
Akash Satheesan 51dc9114ff chore(lib/vscode): yarn upgrade + build fix 2021-05-05 22:21:30 +05:30
Akash Satheesan 924832614e chore(lib/vscode): adjust yarn.lock files 2021-05-05 22:21:30 +05:30
Akash Satheesan 73c2a9f0eb fix(lib/vscode): fix conflicts in package.json 2021-05-05 22:21:30 +05:30
Akash Satheesan 70bf7ed90b fix(lib/vscode): fix terminal channel 2021-05-05 22:21:30 +05:30
Akash Satheesan f10b703e84 fix(lib/vscode): fix types in server.ts 2021-05-05 22:21:30 +05:30
Akash Satheesan 84e12bd587 fix(lib/vscode): add home to workbench.ts 2021-05-05 22:21:29 +05:30
Akash Satheesan 96fe3c2734 fix(lib/vscode): conflicts in productService.ts 2021-05-05 22:21:29 +05:30
Akash Satheesan 532ae1451f fix(lib/vscode): conflicts in menubarControl.ts 2021-05-05 22:21:29 +05:30
Akash Satheesan 81357cf4b0 chore(lib/vscode): update electron types 2021-05-05 22:21:29 +05:30
Asher a48ac5080b
Share common util code with VS Code
This lets us re-use the normalized base path so when we expire/clear the
cookie we use the same base path.
2021-05-04 13:29:40 -05:00
Asher 08ab0afdb0
Revert old logout code
This reverts commit 947dd8561b, reversing
changes made to 24dc2080f9.
2021-05-04 13:29:38 -05:00
Asher eee637a104
Remove dead client code 2021-05-04 13:29:37 -05:00
Asher bea13dd630
Add logout command and menu options 2021-05-04 13:29:34 -05:00
Asher e7a527514a
Add authed context key 2021-05-03 15:00:54 -05:00
Akash Satheesan ec8894d6c4 chore(vscode): update to 1.56.0 2021-04-30 20:25:17 +05:30
Akash Satheesan d6cdeabb16
chore(deps): update dependencies with CVEs (#3223) 2021-04-26 23:56:26 +05:30
Akash Satheesan 72ca12c098
chore(lib/vscode): update netmask (#3187) 2021-04-22 02:57:35 +05:30
Asher b9c80b8520
Merge pull request #3178 from code-asher/connections
Minor connections refactor
2021-04-21 12:22:45 -05:00
Asher 16fc315afa
Catch socket close during protocol handshake
zlib errors can cause the protocol handshake to not reject (until the
timeout).
2021-04-21 11:48:46 -05:00
Asher f0bafa387f
Move connection logic into connection class
- Moved everything I could into the class itself.
- Improve the logging situation a bit.
- Switch some trace logs to debug.
- Get debug port from message arguments.
2021-04-21 11:48:45 -05:00
Asher ae6089f852
Improve protocol class
- Move destroy logic into the class itself
- Improve logging a bit
- Remove the record option; we should always do this when using
  permessage-deflate.
- Let debug port be null (it can be null in the message args).
- Add setSocket so we don't have to initiate a connection to set it.
- Move inflate bytes logic into the class itself.
2021-04-21 11:48:43 -05:00
Akash Satheesan f21884cce5
chore(deps): deduplicate deps in yarn.lock (#3167) 2021-04-19 22:22:07 +05:30
dependabot[bot] 818e2207f8
chore(deps): bump ssri from 6.0.1 to 6.0.2 in /lib/vscode (#3165)
Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/npm/ssri/releases)
- [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md)
- [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-19 20:35:48 +05:30
Akash Satheesan 578b2de131
chore(lib/vscode): clean up comments 2021-04-16 00:39:02 +05:30
Akash Satheesan bdf555a06e
fix(lib/vscode): refactor productService 2021-04-16 00:14:16 +05:30
Akash Satheesan 8ffb87dbc9
fix(lib/vscode): restore localizatizons support 2021-04-16 00:06:38 +05:30
Akash Satheesan 2f6d256745 feat(lib/vscode): pull in changes for 1.55.2
Microsoft recently released an update that fixes some security
issues. Squash and pull these changes into our tree.
2021-04-14 19:00:56 +05:30
Akash Satheesan 9f256cd87a
fix(lib/vscode): fix lint errors 2021-04-14 18:58:41 +05:30
Akash Satheesan 093743e365
fix(.../platform/terminal): fix compile, add notes 2021-04-14 18:58:17 +05:30
Akash Satheesan f472b000b5
fix(lib/vscode/test/smoke): update yarn.lock 2021-04-14 18:35:17 +05:30
Asher 5ebb096db5
Get terminals working
- Instead of a single listener per terminal that handles all events VS
  Code now has a single listener per event that handles that event for
  all terminals.
- Refactor Terminal to extend TerminalProcess to avoid duplicating
  methods. This required some modifications to TerminalProcess to access
  the pid and title and to set the ID.
- Remove our async change to shutdown. This was necessary to avoid
  disposing too early but shutdown already calls dispose so it turns out
  we didn't need to call it ourselves.
- Rename methods to match the command strings.
- Fix getting system shell (uses process.env).
- Use a single bufferer. Since it already supports buffering for
  multiple terminals there's no need to have one per terminal.
- Remove replay/reconnect logic. It's broken and unused so there doesn't
  seem much point in trying to refactor it to fit the changes right now.

While terminals work now there are still a lot of todos.
2021-04-13 16:35:13 -05:00
Akash Satheesan b1fb9f780b
fix(lib/vscode): add listProcesses to terminal channel 2021-04-09 20:20:49 +05:30
Akash Satheesan feb7013b3a
fix(lib/vscode): rename terminal events 2021-04-09 19:16:00 +05:30
Akash Satheesan f3b1076f1d
fix(lib/vscode): get vscode to compile 2021-04-09 17:50:11 +05:30
Akash Satheesan 5e63b7f53c
fix(lib/vscode): fix merge conflicts in localizationsService.ts 2021-04-09 17:49:14 +05:30
Akash Satheesan 448ba0ccf2
fix(lib/vscode): fix conflicts in environmentService.ts 2021-04-09 12:50:53 +05:30
Akash Satheesan b73260d561
fix(lib/vscode): fix conflicts in sandbox.simpleservices.ts 2021-04-09 12:50:45 +05:30
Akash Satheesan 15a5d20edf
fix(lib/vscode): fix conflicts in extensionsScanner.ts 2021-04-09 12:39:27 +05:30
Akash Satheesan 4ab306efeb
fix(lib/vscode): fix conflicts in workbench/workbench.web.main.ts 2021-04-09 12:09:36 +05:30
Akash Satheesan 5bd253709f
fix(lib/vscode): package.json and yarn.lock 2021-04-09 11:54:28 +05:30
Akash Satheesan 8fb96b9967 chore(vscode): update to 1.55.2 2021-04-09 11:32:27 +05:30
Joe Previte 003dc0feeb
chore(release): bump version to 3.9.3 2021-04-08 11:18:56 -07:00
Joe Previte f241e38907
chore: fix typo in extensionDownloader 2021-04-06 15:46:57 -07:00
Asher 230b0dfce4
Ignore ipc.d.ts during VS Code lint
We already lint it on our side.
2021-04-02 11:12:13 -05:00
Asher 101c2a01f1
Fix tsc watch restarting when it shouldn't
It seems reaching into lib/vscode for the types caused tsc to establish
watches that caused it to restart over and over while vscode was
building.

The strategy used here is to symlink it instead which is the same thing
we do for the proxy agent.
2021-04-01 10:58:56 -05:00
Akash Satheesan 8332a6abc9
fix(lib/vscode): remove native-keymap and keytar (#2961)
native-keymap and keytar are only used in the electron process,
so we don't need them. This allows us to drop our dependencies on
libx11-dev, libxkbfile-dev, and libsecret-dev.
2021-03-25 22:20:58 +05:30
Joe Previte 090687d057
feat: add e2e test for logout 2021-03-23 10:02:03 -07:00
Joe Previte 5cec6208d0
refactor: add cookie.ts to lib/vscode 2021-03-23 10:02:03 -07:00
Joe Previte 9f790fd2f3
feat(lib/vscode): add log out to application menu
This adds a new option to the Application Menu called Log out.

It deletes the code-server cookie and logs a user out.
2021-03-23 10:02:02 -07:00
Joe Previte aae17cb749
fixup: fix comment in server.ts 2021-03-22 10:43:02 -07:00
Joe Previte 19c2f31f22
fixup: remove comment in server.ts 2021-03-22 10:37:44 -07:00
Joe Previte 36714da613
fixup: move openHelpAbout 2021-03-17 11:25:33 -07:00
Joe Previte d3df963d39
Merge branch 'main' into jsjoeio/upgrade-vscode-1.54 2021-03-16 14:42:51 -07:00
Joe Previte bcdca86539
refactor: change goHome test to helpAbout 2021-03-16 14:25:28 -07:00
Joe Previte ae02023454
fix(lib/vscode): register LogLevelChannel 2021-03-16 14:25:27 -07:00
Asher 050a1bb146
Fix localizations service import
It was moved from electron-browser to electron-sandbox.
2021-03-16 10:20:14 -07:00
Joe Previte 875dfb66a4
fix(lib/vscode): update path for logService 2021-03-16 10:20:14 -07:00
Joe Previte 8f414b5005
fix(lib/vscode): make mkdir recursive 2021-03-16 10:20:14 -07:00
Joe Previte 25dbb5b1b6
fix(lib/vscode0: localizations import in client 2021-03-16 10:20:14 -07:00
Joe Previte 34189e4d49
fix(lib/vscode): add getAppRoot to VariableResolverService
Not sure if it's used because it can return undefined, but it's
there now!
2021-03-16 10:20:13 -07:00
Joe Previte dc08bc68c6
fix(lib/vscode): fix terminalLayoutInfoArgs
It looks like before, the ISetTerminalLAyoutInfoArgs and
IGetTerminalLayoutInfoArgs were part of the terminal interface, but now they're
just interfaces so this commit fixes the imports to get them from
vs/platform/terminal/common/terminalProcess.
2021-03-16 10:20:13 -07:00
Joe Previte e5b7438695
fix(lib/vscode): update imports in channel.ts for terminal
It looks like they moved a bunch of terminal-related files around.

This only fixes the imports.
2021-03-16 10:20:13 -07:00
Joe Previte c42240f182
fix(lib/vscode): refactor mkdirp to fs.promises
They removed mkdirp in favor of fs.promises.

Updated in marketplace.ts
2021-03-16 10:20:13 -07:00
Joe Previte 350ddc3c27
fix(lib/vscode): update log service in server.ts
This required a bit more work.

We moved a few things around and made use of multiplexLogService.
2021-03-16 10:20:13 -07:00
Joe Previte eaf63deb56
fix(lib/vscode): fix return type shutdown in ptyService
In the squash/merge update, we forgot to update the return type.

Add Promise<void> instead of void for shutdown method.
2021-03-16 10:20:12 -07:00
Joe Previte cc8e4ee97c
fix(lib/vscode): update extensionManagementService
Looks like a few import updates and one minor update for language packs.

We had made this change ourselves, but now it's officially in the vscode
codebase. Super cool.
2021-03-16 10:20:12 -07:00
Akash Satheesan 702485139a
chore: update vulnerable dependencies (#2861)
Cherry-pick dependencies with security issues to update.

Signed-off-by: Akash Satheesan <akash@coder.com>
2021-03-12 01:46:40 +05:30
Joe Previte 8512be85a5
fix(lib/vscode): update electron-sandbox localizationService
I'm not sure if we even use this but they changed the LocalizationService.o

It looks like it using one called ISharedProcessService now.
2021-03-11 11:09:37 -07:00
Joe Previte 42ff0ec5e7
fix(lib/vscode): update dialogHandler
Looks like a minor update to the localization for the detailString
which I believe shows up when you go to Help:About.
2021-03-11 11:06:05 -07:00
Joe Previte d1ad3fad5e
fix(lib/vscode): update storageService getStorage methods
This change refactors a lot of the get methods in the storageService.

I think it simplies a lot. It removes a bunch of methods.
2021-03-11 11:02:32 -07:00
Joe Previte 325f21f73d
fix(lib/vscode): change doStore > doInitialize AbstractStorageService
Looks like they changed the doStore method to doInitialize in the
AbstractStorageService class.

It no longer accepts any parameters.
2021-03-11 10:58:48 -07:00
Joe Previte dc5c271a0c
fix(lib/vscode): replace doStore with getSotrage
Inside the class BrowserStorageService, it looks like they replaced doStore with
getStorage.

However, at the time of writing this message, I am getting a TypeScript error
saying:
> Non-abstract class 'BrowserStorageService' does not implement inherited
> abstract member 'doStore' from class 'AbstractStorageService'.

Hopefully that will be disappear after I fix other errors.
2021-03-11 10:56:16 -07:00
Joe Previte e79ca99466
feat(lib/vscode): update src/vs/base/node/languagePacks.js
It looks like a couple functions were added here
such as a readFile and writeFile.
2021-03-11 10:47:52 -07:00
Joe Previte 548b6fb628
fix(lib/vscode): package.json and yarn.lock
No new dependencies were added in the 1.54.2 update.
2021-03-11 10:46:08 -07:00
Joe Previte 0cd3e39492
chore(vscode): update to 1.54.2 2021-03-11 10:27:10 -07:00