* Factor out captured variables that are not reused outside findGit callback
* Always register git protocol handler
* Notify the user when cloning without git installed
* Actually notify the user when cloning without git installed
Errors when invoking a command don't seem to get thrown in the extension host
* Add output channel logging
* Revert "Factor out captured variables that are not reused outside findGit callback"
This reverts commit df005bdda519c63366cd3590a83a10285d7a4b57.
Resubmission of #157532 with the following changes:
- Use `eslint-plugin-local` instead of `yarn` link to run our plugins
- Move our plugins to a top level `.eslintplugin` dir (as required by `eslint-plugin-local`)
- Update all names to `local/`
* Run our custom eslint rules using ts-node
Use `ts-node` to run our custom eslint rules. This lets us delete the pre-compiled js. It also means you can don't have to compile the rules while editing them
As part of this change, I've also switched us to using an eslint plugin instead of a rulesDir. This is now the preferred way to ship custom rules
* Fix two more disables
* Move ts-node to project root
* Enable transpileOnly
* Expose editor "blue button" as menu
* rename proposed `MergeToolbar` to `EditorContent` menu
* adopt GIT and sync conflicts usage
* use content menu for "open in 3wm" command
* add new `ctxIsMergeResultEditor` context key
Better fix for https://github.com/microsoft/vscode/issues/153800
* fix typo
* Add canonical workspace identifier proposed API
* Use canonical id to store and resume edit sessions
* Add git extension workspace identity provider
* Fix warning incorrectly showing up
* Make auto resume behavior opt in
* * Create a separate service
* Accept WorkspaceFolder instead of URI
* Return string instead of object
* Make edit session restores resilient to provider registration races
* Introduce an activation event
* Activate contributing extension before using provider
* `CanonicalWorkspaceIdentity` -> `EditSessionIdentity`
* Show progress while resuming edit session
* Store edit session even if extension will take care of opening target workspace
* Address most of PR feedback
* `IEditSessionsWorkbenchService` -> `IEditSessionsStorageService`
* Unregister provider in renderer
* Split out proposal into new `editSessionIdentityProvider.d.ts`
* Fix bad merge
* Always show progress in window
* Convert URI schemes
* make git's `openMergeEditor` user-facing command and show it for editors that have conflicts
also includes a workaround for an issue with untyped editor inputs... fyi @lramos15
* Patch matches
* Remove TODO
* set nowrap for white-space
fixes https://github.com/microsoft/vscode/issues/156402
Co-authored-by: Logan Ramos <lramos15@gmail.com>
* Revert "Commit keyboard shortcut to honor the post commit command setting (#157617)"
This reverts commit fe946068ba8ed2c4db200483dbec89210fea1332.
* Fix more scenarios where the post commit command setting is not honoured.
While the merge editor shows users can handle merge conflicts outside of it, e.g on the console via `git add <FILE>`. The merge editor should have this graceful and step one is to hide the "Accept Merge" command when the file isn't conflicting anymore
* Adds a git-context key that contains all resource-uri-strings under conflict
* Enable/placement of the Accept Merge command is driven by that
* some merge editor context key sugar
