Rebase vscode onto void (microsoft/vscode 0480008e3221e6743799332fc0018a98e8e90457 -> voideditor/void 1e09852b3ced4b642f92f896266ef83e011c13f4)

[andrewpareles]

Rebased vscode's main branch 0480008 onto void's main branch 1e09852b.

Some notes I took while rebasing (this was fun):

.devcontainer/README.md-
.eslintignore-
.eslintrc.json-
.gitignore-
.idx/dev.nix-
.vscode/tasks.json-
CONTRIBUTING.md-
LICENSE-VS-Code.txt-
LICENSE.txt-
README.md-
SECURITY.md-
VOID_USEFUL_LINKS.md-

create-appimage.sh-

extensions/open-remote-ssh-

package-lock.json

package.json-
product.json-

remote/package-lock.json
remote/package.json-

resources/darwin/code.icns
resources/linux/code.png
resources/server/code-192.png
resources/server/code-512.png
resources/server/favicon.ico
resources/win32/VisualElementsManifest.xml
resources/win32/code.ico
resources/win32/code_150x150.png
resources/win32/code_70x70.png
resources/win32/inno-void.bmp
resources/win32/logo_cube_noshadow.png
- done with  TARGET_PATH="" && cp ./${TARGET_PATH} ../../void/${TARGET_PATH}

scripts/code.sh-

src/main.js - IGNORING - minor comment fix

src/tsconfig.json - X (not needed)

src/vs/base/browser/ui/inputbox/inputBox.ts  - X (merged w comment)
src/vs/code/electron-main/app.ts - MERGED

src/vs/editor/browser/services/codeEditorService.ts - no changes


src/vs/editor/browser/services/inlineDiffService/inlineDiffService.ts - DELETING THIS

src/vs/editor/browser/widget/diffEditor/style.css - minor

src/vs/editor/common/services/editorSimpleWorker.ts -- Void - old - deleting this change


src/vs/editor/contrib/lineSelection/browser/lineSelection.ts - Cmd + L -> Cmd + M

src/vs/platform/encryption/electron-main/encryptionMainService.ts - minor linux nice default addition

src/vs/platform/extensions/common/extensionValidator.ts - minor comment

src/vs/platform/keybinding/common/keybindingsRegistry.ts - Void keybindingWeight

src/vs/platform/telemetry/common/serverTelemetryService.ts - Void removed telemetry
src/vs/platform/telemetry/common/telemetryService.ts - Void removed telemetry



src/vs/workbench/api/browser/extensionHost.contribution.ts - X - not continuing - old mainThreadInlineDiff
src/vs/workbench/api/browser/mainThreadInlineDiff.ts - X - NO LONGER USED!!
src/vs/workbench/api/common/extHost.api.impl.ts - X - part of above, NO LONGER USED
src/vs/workbench/api/common/extHost.protocol.ts - part of above, NO LONGER USED
src/vs/workbench/api/common/extHostInlineDiff.ts - part of above, NO LONGER USED

src/vs/workbench/browser/actions/layoutActions.ts - Secondary Side bar -> Void Side bar
src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts - Secondary Side bar -> Void Side bar
src/vs/workbench/browser/parts/panel/panelActions.ts - Secondary Side bar -> Void Side bar
src/vs/workbench/browser/workbench.contribution.ts - Secondary Side bar -> Void Side bar
src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.ts

src/vs/workbench/browser/layout.ts - Aux bar 200 -> 800
src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts - min width 170->230

src/vs/workbench/browser/media/code-icon.svg - DELETED
src/vs/workbench/browser/media/void-icon-sm.png - ADDED
src/vs/workbench/browser/parts/banner/media/bannerpart.css - replacement img
src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css - replacement img
src/vs/workbench/contrib/update/browser/media/releasenoteseditor.css - code-icon.svg -> void-icon-sm.png
src/vs/workbench/contrib/welcomeGettingStarted/browser/media/gettingStarted.css
src/vs/workbench/contrib/welcomeWalkthrough/browser/media/walkThroughPart.css


src/vs/platform/update/electron-main/abstractUpdateService.ts - done
src/vs/platform/update/electron-main/updateService.darwin.ts - done
src/vs/platform/update/electron-main/updateService.linux.ts - done
src/vs/platform/update/electron-main/updateService.win32.ts - done
src/vs/platform/windows/electron-main/windowImpl.ts - IGNORING - changed origin to https://, but no longer used


src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts - void watermark page
src/vs/workbench/browser/parts/editor/media/editorgroupview.css - add Void pngs


src/vs/workbench/browser/parts/editor/media/slice_of_void.png-
src/vs/workbench/browser/parts/editor/media/void_cube_noshadow.png-

src/vs/workbench/contrib/files/browser/views/explorerViewer.ts - hi333
src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts - Editing Evolved-> Void

src/vs/workbench/services/themes/common/workbenchThemeService.ts - default theme
src/vs/workbench/workbench.common.main.ts - imports for Void workbench contrib + remove WelcomePage


src/vs/workbench/contrib/files/test/browser/explorerView.test.ts - IGNORING
src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts - IGNORING - no changes needed, we just don't link here
src/vs/workbench/electron-sandbox/desktop.main.ts - IGNORING - just a comment
src/vs/workbench/workbench.web.main.internal.ts - IGNORING
src/vscode-dts/vscode.d.ts - IGNORING
test/unit/electron/preload.js - added something, but ignoring
extensions/void/ - DELETED


src/vs/workbench/contrib/void/ - Void's code


build/filters.js - Void added open-ssh extension
build/gulpfile.extensions.js - open-ssh
build/npm/dirs.js - open-ssh

build/azure-pipelines/darwin/product-build-darwin-universal.yml - IGNORING - just a comment - Void - this looks like the relevant file for us (product-build-darwin.yml is independent and maybe just used for testing)
build/darwin/create-universal-app.ts - IGNORING - just a comment - product-build-darwin-universal.yml runs this (create-universal-app.ts), then sign.ts
build/npm/postinstall.js - IGNORING - Void imports OLD

build/darwin/sign.ts - minor change - 'replace'
build/gulpfile.vscode.js - minor comment - Void - this is important, creates the product.json in .app
build/lib/electron.ts - minor comment - icon
build/win32/code.iss - Void icon


build/gulpfile.reh.js - IGNORING
build/hygiene.ts - remove precommit hooks


-> recompile build/

Some commands to run when rebasing next time:
git diff --name-only <COMMIT_HASH_AFTER_THIS_ONE> main > modified_files.txt