mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 18:46:40 -05:00
Merge vscode source through release 1.79.2 (#23482)
* log when an editor action doesn't run because of enablement * notebooks create/dispose editors. this means controllers must be created eagerly (😢) and that notebooks need a custom way of plugging comparision keys for session. works unless creating another session for the same cell of a duplicated editor * Set offSide to sql lang configuration to true (#183461) * Fixes #181764 (#183550) * fix typo * Always scroll down and focus the input (#183557) * Fixes #180386 (#183561) * cli: ensure ordering of rpc server messages (#183558) * cli: ensure ordering of rpc server messages Sending lots of messages to a stream would block them around the async tokio mutex, which is "fair" so doesn't preserve ordering. Instead, use the write_loop approach I introduced to the server_multiplexer for the same reason some time ago. * fix clippy * update for May endgame * testing: allow invalidateTestResults to take an array (#183569) * Document `ShareProvider` API proposal (#183568) * Document `ShareProvider` API proposal * Remove mention of VS Code from JSDoc * Add support for rendering svg and md in welcome message (#183580) * Remove toggle setting more eagerly (#183584) * rm message abt macOS * Change text (#183589) * Change text * Accidentally changed the wrong file * cli: improve output for code tunnel status (#183571) * testing: allow invalidateTestResults to take an array * cli: improve output for code tunnel status Fixes #183570 * [json/css/html] update services (#183595) * Add experimental setting to enable this dialog * Fix exporting chat model to JSON before it is initialized (#183597) * minimum scrolling to reveal the next cell on shift+enter (#183600) do minimum scrolling to reveal the next cell on Execute cell and select next * Fixing Jupyter notebook issue 13263 (#183527) fix for the issue, still need to understand why there is strange focusing * Tweak proposed API JSDoc (#183590) * Tweak proposed API JSDoc * workbench -> workspace * fix ? operator * Use active editor and show progress when sharing (#183603) Use active editor and show progress * use scroll setting variable correctly * Schedule welcome widget to show once between typing. (#183606) * Schedule dialog to show once between typing * Don't re-render if already displayed once * Add F10 keybinding for debugger step, even on Web. (#183510) Fixes #181792. Previously, for Web the keyboard shortcut was Alt-F10, because it was believed that F10 could not be bound on browsers. This turned out to be incorrect, so we make the shortcut consistent (F10) with desktop VSCode which is also what many other debuggers use. We keep Alt-F10 on web as a secondary keybinding to keep the experience some web users may have gotten used to by now. * Also pass process.env * Restore missing chat clear commands (#183651) * chore: update electron@22.5.4 (#183716) * Show remote indicator in web when remoteAuthority is set (#183728) * feat: .vuerc as json file (#153017) Co-authored-by: Martin Aeschlimann <martinae@microsoft.com> * Delete --compatibility=1.63 code from the server (#183738) * Copy vscode.dev link to tunnel generates an invalid link when an untitled workspace is open (#183739) * Recent devcontainer display string corrupted on Get Started page (#183740) * Improve "next codeblock" navigation (#183744) * Improve "next codeblock" navigation Operate on the current focused response, or the last one, and scroll to the selected item * Normalize command title * Git - run git status if similarityThreshold changes (#183762) * fix aria-label issue in kb editor fixes A11y_GradeB_VSCode_Keyboard shortcut reads words together - Blind: Arrow key navigation to row Find the binding keys and "when" cell data are read together resulting in a word " CTRL + FeditorFocus instead of CTRL + F editorFocus" #182490 * Status - fix compact padding (#183768) * Remove angle brackets from VB brackets (#183782) Fixes #183359 * Update language config schema with more details about brackets. (#183779) * fix comment (#183812) * Support for `Notebook` CodeAction Kind (#183457) * nb kind support -- wip * allow notebook codeactions around single cell edit check * move notebook code action type out of editor --------- Co-authored-by: rebornix <penn.lv@gmail.com> * cli: fix connection default being applied (#183827) * cli: bump to openssl 1.1.1u (#183828) * Implement "delete" action for chat history (#183609) * Use desired file name when generating new md pasted file paths (#183861) Fixes #183851 * Default to filename for markdown new file if empty (#183864) Fixes #183848 * Fix small typo (#183865) Fixes #183819 * Noop when moving a symbol into the file it is already in (#183866) Fixes #183793 * Adjust codeAction validation to account for notebook kind (#183859) * Make JS/TS `go to configuration` commands work on non-`file:` file systems (#183688) Make `go to project` commands work on non-`file:` file systems Fixes #183685 * Can't do regex search after opening notebook (#183884) Fixes #183858 * Default to current dir for `move to file` select (#183875) Fixes #183870 `showOpenDialog` seems to ignore `defaultUri` if the file doesn't exist * Use `<...>` style markdown links when needed (#183876) Fixes #183849 * Remove check for context keys * Update xterm package * Enable updating a chat model without triggering incremental typing (#183894) * Enable chat "move" commands on empty sessions (#183895) * Enable chat "move" commands on empty sessions and also imported sessions * Fix command name * Fix some chat keybindings on windows (#183896) * "Revert File" on inactive editors are ignored (fix #177557) (#183903) * Empty reason while switching profile (fix #183775) (#183904) * fix https://github.com/microsoft/vscode-internalbacklog/issues/4278 (#183910) * fix https://github.com/microsoft/vscode/issues/183770 (#183914) * code --status displays a lot of errors before actual status output (fix #183787) (#183915) * joh/icy manatee (#183917) * Use idle value for widget of interactive editor controller https://github.com/microsoft/vscode/issues/183820 * also make preview editors idle values https://github.com/microsoft/vscode/issues/183820 * Fix #183777 (#183929) * Fix #182309 (#183925) * Tree checkbox item -> items (#183931) Fixes #183826 * Fixes #183909 (#183940) * Fix #183837 (#183943) fix #183837 * Git - fix #183941 (#183944) * Update xterm.css Fixes #181242 * chore: add @ulugbekna and @aiday-mar to my-endgame notebook (#183946) * Revert "When snippet mode is active, make `Tab` not accept suggestion but advance placeholder" This reverts commit 50a80cdb61511343996ff1d41d0b676c3d329f48. * revert not focusing completion list when quick suggest happens during snippet * change `snippetsPreventQuickSuggestions` default to false * Fix #181446 (#183956) * fix https://github.com/microsoft/vscode-internalbacklog/issues/4298 (#183957) * fix: remove extraneous incorrect context keys (#183959) These were actually getting added in getTestItemContextOverlay, and the test ID was using the extended ID which extensions do not know about. Fixes #183612 * Fixes https://github.com/microsoft/monaco-editor/issues/3920 (#183960) * fix https://github.com/microsoft/vscode-internalbacklog/issues/4324 (#183961) * fix #183030 * fix #180826 (#183962) * make message more generic for interactive editor help * . * fix #183968 * Keep codeblock toolbar visible when focused * Fix when clause on "Run in terminal" command * add important info to help menu * fix #183970 * Set `isRefactoring` for all TS refactoring edits (#183982) * consolidate * Disable move to file in TS versions < 5.2 (#183992) There are still a few key bugs with refactoring. We will ship this as a preview for TS 5.2+ instead of for 5.1 * Polish query accepting (#183995) We shouldn't send the same request to Copilot if the query hasn't changed. So if the query is the same, we short circut. Fixes https://github.com/microsoft/vscode-internalbacklog/issues/4286 Also, when we open in chat, we should use the last accepted query, not what's in the input box. Fixes https://github.com/microsoft/vscode-internalbacklog/issues/4280 * Allow widget to have focus (#184000) So that selecting non-code text works. Fixes https://github.com/microsoft/vscode-internalbacklog/issues/4294 * Fix microsoft/vscode-internalbacklog#4257. Mitigate zindex for zone widgets. (#184001) * Change welcome dialog contribution to Eventually * Misc fixes * Workspace folder picker entry descriptions are suboptimal for some filesystems (fix #183418) (#184018) * cli - ignore std error unless verbose (#183787) (#184031) * joh/inquisitive meerkat (#184034) * only stash sessions that are none empty https://github.com/microsoft/vscode-internalbacklog/issues/4281 * only unstash a session once - unless new exchanges are made, https://github.com/microsoft/vscode-internalbacklog/issues/4281 * account for all exchange types * Improve declared components (#184039) * make sure to read setting (#184040) d'oh, related to https://github.com/microsoft/vscode/issues/173387#issuecomment-1571696644 * [html] update service (#184049) [html] update service. FIxes #181176 * reset context keys on reset/hide (#184042) fixes https://github.com/microsoft/vscode-internalbacklog/issues/4330 * use `Lazy`, not `IdleValue` for the IE widget held by the eager controller (#184048) https://github.com/microsoft/vscode/issues/183820 * fix https://github.com/microsoft/vscode-internalbacklog/issues/4333 (#184067) * use undo-loop instead of undo-edit when discarding chat session (#184063) * use undo-loop instead of undo-edit when discarding chat session fixes https://github.com/microsoft/vscode-internalbacklog/issues/4118 * fix tests, wait for correct state * Add logging to node download (#184070) Add logging to node download. For #182951 * re-enable default zone widget revealing when showing (#184072) fixes https://github.com/microsoft/vscode-internalbacklog/issues/4332, also fixes https://github.com/microsoft/vscode-internalbacklog/issues/3784 * fix #178202 * Allow APIs in stable (#184062) * Fix microsoft/vscode-internalbacklog#4206. Override List view whitespace css for monaco editor (#184087) * Fix JSDoc grammatical error (#184090) * Pick up TS 5.1.3 (#184091) Fixes #182931 * Misc fixes * update distro (#184097) * chore: update electron@22.5.5 (#184116) * Extension host veto is registered multiple times on restart (fix #183778) (#184127) Extension host veto is registered multiple times on restart (#183778) * Do not auto start the local web worker extension host (#184137) * Allow embedders to intercept trustedTypes.createPolicy calls (#184136) Allow embedders to intercept trustedTypes.createPolicy calls (#184100) * fix: reading from console output for --status on windows and linux (#184138) fix: reading from console output for --status on windows and linux (#184118) * Misc fixes * code --status displays a lot of errors before actual status output (fix #183787) (#184200) fix 183787 * (cherry-pick to 1.79 from main) Handle galleryExtension failure in featuredExtensionService (#184205) Handle galleryExtension failure in featuredExtensionService (#184198) Handle galleryExtension failure * Fix #184183. Multiple output height updates are skipped. (#184188) * Post merge init fixes * Misc build issues * disable toggle inline diff of `alt` down https://github.com/microsoft/vscode-internalbacklog/issues/4342 * Take into account already activated extensions when computing running locations (#184303) Take into account already activated extensions when computing running locations (fixes #184180) * Avoid `extensionService.getExtension` and use `ActivationKind.Immediate` to allow that URI handling works while resolving (#184310) Avoid `extensionService.getExtension` and use `ActivationKind.Immediate` to allow that URI handling works while resolving (fixes #182217) * WIP * rm fish auto injection * More breaks * Fix Port Attributes constructor (#184412) * WIP * WIP * Allow extensions to get at the exports of other extensions during resolving (#184487) Allow extensions to get at the exports of other extensions during resolving (fixes #184472) * do not auto finish session when inline chat widgets have focus re https://github.com/microsoft/vscode-internalbacklog/issues/4354 * fix compile errors caused by new base method * WIP * WIP * WIP * WIP * Build errors * unc - fix path traversal bypass * Bump version * cherry-pick prod changes from main * Disable sandbox * Build break from merge * bump version * Merge pull request #184739 from max06/max06/issue184659 Restore ShellIntegration for fish (#184659) * Git - only add --find-renames if the value is not the default one (#185053) Git - only add --find-renames if the value is not the default one (#184992) * Cherry-pick: Revert changes to render featured extensions when available (#184747) Revert changes to render featured extensions when available. (#184573) * Lower timeouts for experimentation and gallery service * Revert changes to render extensions when available * Add audio cues * fix: disable app sandbox when --no-sandbox is present (#184913) * fix: disable app sandbox when --no-sandbox is present (#184897) * fix: loading minimist in packaged builds * Runtime errors * UNC allow list checks cannot be disabled in extension host (fix #184989) (#185085) * UNC allow list checks cannot be disabled in extension host (#184989) * Update src/vs/base/node/unc.js Co-authored-by: Robo <hop2deep@gmail.com> --------- Co-authored-by: Robo <hop2deep@gmail.com> * Add notebook extension * Fix mangling issues * Fix mangling issues * npm install * npm install * Issues blocking bundle * Fix build folder compile errors * Fix windows bundle build * Linting fixes * Fix sqllint issues * Update yarn.lock files * Fix unit tests * Fix a couple breaks from test fixes * Bump distro * redo the checkbox style * Update linux build container dockerfile * Bump build image tag * Bump native watch dog package * Bump node-pty * Bump distro * Fix documnetation error * Update distro * redo the button styles * Update datasource TS * Add missing yarn.lock files * Windows setup fix * Turn off extension unit tests while investigating * color box style * Remove appx * Turn off test log upload * update dropdownlist style * fix universal app build error (#23488) * Skip flaky bufferContext vscode test --------- Co-authored-by: Johannes <johannes.rieken@gmail.com> Co-authored-by: Henning Dieterichs <hdieterichs@microsoft.com> Co-authored-by: Julien Richard <jairbubbles@hotmail.com> Co-authored-by: Charles Gagnon <chgagnon@microsoft.com> Co-authored-by: Megan Rogge <merogge@microsoft.com> Co-authored-by: meganrogge <megan.rogge@microsoft.com> Co-authored-by: Rob Lourens <roblourens@gmail.com> Co-authored-by: Connor Peet <connor@peet.io> Co-authored-by: Joyce Er <joyce.er@microsoft.com> Co-authored-by: Bhavya U <bhavyau@microsoft.com> Co-authored-by: Raymond Zhao <7199958+rzhao271@users.noreply.github.com> Co-authored-by: Martin Aeschlimann <martinae@microsoft.com> Co-authored-by: Aaron Munger <aamunger@microsoft.com> Co-authored-by: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com> Co-authored-by: rebornix <penn.lv@gmail.com> Co-authored-by: Ole <oler@google.com> Co-authored-by: Jean Pierre <jeanp413@hotmail.com> Co-authored-by: Robo <hop2deep@gmail.com> Co-authored-by: Yash Singh <saiansh2525@gmail.com> Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Co-authored-by: Ulugbek Abdullaev <ulugbekna@gmail.com> Co-authored-by: Alex Ross <alros@microsoft.com> Co-authored-by: Michael Lively <milively@microsoft.com> Co-authored-by: Matt Bierner <matb@microsoft.com> Co-authored-by: Andrea Mah <31675041+andreamah@users.noreply.github.com> Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com> Co-authored-by: Sandeep Somavarapu <sasomava@microsoft.com> Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Co-authored-by: Tyler James Leonhardt <me@tylerleonhardt.com> Co-authored-by: Alexandru Dima <alexdima@microsoft.com> Co-authored-by: Joao Moreno <Joao.Moreno@microsoft.com> Co-authored-by: Alan Ren <alanren@microsoft.com>
This commit is contained in:
Karl Burtram
@@ -5,8 +5,6 @@
|
||||
|
||||
import * as vscode from 'vscode';
|
||||
import * as interfaces from './interfaces';
|
||||
import { loadMessageBundle } from 'vscode-nls';
|
||||
const localize = loadMessageBundle();
|
||||
|
||||
export default class MergeConflictCodeLensProvider implements vscode.CodeLensProvider, vscode.Disposable {
|
||||
private codeLensRegistrationHandle?: vscode.Disposable | null;
|
||||
@@ -65,33 +63,34 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro
|
||||
conflicts.forEach(conflict => {
|
||||
const acceptCurrentCommand: vscode.Command = {
|
||||
command: 'merge-conflict.accept.current',
|
||||
title: localize('acceptCurrentChange', 'Accept Current Change'),
|
||||
title: vscode.l10n.t("Accept Current Change"),
|
||||
arguments: ['known-conflict', conflict]
|
||||
};
|
||||
|
||||
const acceptIncomingCommand: vscode.Command = {
|
||||
command: 'merge-conflict.accept.incoming',
|
||||
title: localize('acceptIncomingChange', 'Accept Incoming Change'),
|
||||
title: vscode.l10n.t("Accept Incoming Change"),
|
||||
arguments: ['known-conflict', conflict]
|
||||
};
|
||||
|
||||
const acceptBothCommand: vscode.Command = {
|
||||
command: 'merge-conflict.accept.both',
|
||||
title: localize('acceptBothChanges', 'Accept Both Changes'),
|
||||
title: vscode.l10n.t("Accept Both Changes"),
|
||||
arguments: ['known-conflict', conflict]
|
||||
};
|
||||
|
||||
const diffCommand: vscode.Command = {
|
||||
command: 'merge-conflict.compare',
|
||||
title: localize('compareChanges', 'Compare Changes'),
|
||||
title: vscode.l10n.t("Compare Changes"),
|
||||
arguments: [conflict]
|
||||
};
|
||||
|
||||
const range = document.lineAt(conflict.range.start.line).range;
|
||||
items.push(
|
||||
new vscode.CodeLens(conflict.range, acceptCurrentCommand),
|
||||
new vscode.CodeLens(conflict.range.with(conflict.range.start.with({ character: conflict.range.start.character + 1 })), acceptIncomingCommand),
|
||||
new vscode.CodeLens(conflict.range.with(conflict.range.start.with({ character: conflict.range.start.character + 2 })), acceptBothCommand),
|
||||
new vscode.CodeLens(conflict.range.with(conflict.range.start.with({ character: conflict.range.start.character + 3 })), diffCommand)
|
||||
new vscode.CodeLens(range, acceptCurrentCommand),
|
||||
new vscode.CodeLens(range, acceptIncomingCommand),
|
||||
new vscode.CodeLens(range, acceptBothCommand),
|
||||
new vscode.CodeLens(range, diffCommand)
|
||||
);
|
||||
});
|
||||
|
||||
|
||||
@@ -5,8 +5,6 @@
|
||||
import * as vscode from 'vscode';
|
||||
import * as interfaces from './interfaces';
|
||||
import ContentProvider from './contentProvider';
|
||||
import { loadMessageBundle } from 'vscode-nls';
|
||||
const localize = loadMessageBundle();
|
||||
|
||||
interface IDocumentMergeConflictNavigationResults {
|
||||
canNavigate: boolean;
|
||||
@@ -92,7 +90,7 @@ export default class CommandHandler implements vscode.Disposable {
|
||||
|
||||
// Still failed to find conflict, warn the user and exit
|
||||
if (!conflict) {
|
||||
vscode.window.showWarningMessage(localize('cursorNotInConflict', 'Editor cursor is not within a merge conflict'));
|
||||
vscode.window.showWarningMessage(vscode.l10n.t("Editor cursor is not within a merge conflict"));
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -101,7 +99,7 @@ export default class CommandHandler implements vscode.Disposable {
|
||||
|
||||
// Still failed to find conflict, warn the user and exit
|
||||
if (!conflicts) {
|
||||
vscode.window.showWarningMessage(localize('cursorNotInConflict', 'Editor cursor is not within a merge conflict'));
|
||||
vscode.window.showWarningMessage(vscode.l10n.t("Editor cursor is not within a merge conflict"));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -134,7 +132,7 @@ export default class CommandHandler implements vscode.Disposable {
|
||||
|
||||
const docPath = editor.document.uri.path;
|
||||
const fileName = docPath.substring(docPath.lastIndexOf('/') + 1); // avoid NodeJS path to keep browser webpack small
|
||||
const title = localize('compareChangesTitle', '{0}: Current Changes ↔ Incoming Changes', fileName);
|
||||
const title = vscode.l10n.t("{0}: Current Changes ↔ Incoming Changes", fileName);
|
||||
const mergeConflictConfig = vscode.workspace.getConfiguration('merge-conflict');
|
||||
const openToTheSide = mergeConflictConfig.get<string>('diffViewPosition');
|
||||
const opts: vscode.TextDocumentShowOptions = {
|
||||
@@ -161,7 +159,7 @@ export default class CommandHandler implements vscode.Disposable {
|
||||
const conflict = await this.findConflictContainingSelection(editor);
|
||||
|
||||
if (!conflict) {
|
||||
vscode.window.showWarningMessage(localize('cursorNotInConflict', 'Editor cursor is not within a merge conflict'));
|
||||
vscode.window.showWarningMessage(vscode.l10n.t("Editor cursor is not within a merge conflict"));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -184,11 +182,11 @@ export default class CommandHandler implements vscode.Disposable {
|
||||
typeToAccept = interfaces.CommitType.Incoming;
|
||||
}
|
||||
else if (editor.selection.active.isBefore(conflict.splitter.start)) {
|
||||
vscode.window.showWarningMessage(localize('cursorOnCommonAncestorsRange', 'Editor cursor is within the common ancestors block, please move it to either the "current" or "incoming" block'));
|
||||
vscode.window.showWarningMessage(vscode.l10n.t('Editor cursor is within the common ancestors block, please move it to either the "current" or "incoming" block'));
|
||||
return;
|
||||
}
|
||||
else {
|
||||
vscode.window.showWarningMessage(localize('cursorOnSplitterRange', 'Editor cursor is within the merge conflict splitter, please move it to either the "current" or "incoming" block'));
|
||||
vscode.window.showWarningMessage(vscode.l10n.t('Editor cursor is within the merge conflict splitter, please move it to either the "current" or "incoming" block'));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -210,11 +208,11 @@ export default class CommandHandler implements vscode.Disposable {
|
||||
if (mergeConflictConfig.get<boolean>('autoNavigateNextConflict.enabled')) {
|
||||
return;
|
||||
}
|
||||
vscode.window.showWarningMessage(localize('noConflicts', 'No merge conflicts found in this file'));
|
||||
vscode.window.showWarningMessage(vscode.l10n.t("No merge conflicts found in this file"));
|
||||
return;
|
||||
}
|
||||
else if (!navigationResult.canNavigate) {
|
||||
vscode.window.showWarningMessage(localize('noOtherConflictsInThisFile', 'No other merge conflicts within this file'));
|
||||
vscode.window.showWarningMessage(vscode.l10n.t("No other merge conflicts within this file"));
|
||||
return;
|
||||
}
|
||||
else if (!navigationResult.conflict) {
|
||||
@@ -241,7 +239,7 @@ export default class CommandHandler implements vscode.Disposable {
|
||||
}
|
||||
|
||||
if (!conflict) {
|
||||
vscode.window.showWarningMessage(localize('cursorNotInConflict', 'Editor cursor is not within a merge conflict'));
|
||||
vscode.window.showWarningMessage(vscode.l10n.t("Editor cursor is not within a merge conflict"));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -261,7 +259,7 @@ export default class CommandHandler implements vscode.Disposable {
|
||||
const conflicts = await this.tracker.getConflicts(editor.document);
|
||||
|
||||
if (!conflicts || conflicts.length === 0) {
|
||||
vscode.window.showWarningMessage(localize('noConflicts', 'No merge conflicts found in this file'));
|
||||
vscode.window.showWarningMessage(vscode.l10n.t("No merge conflicts found in this file"));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
import * as interfaces from './interfaces';
|
||||
import * as vscode from 'vscode';
|
||||
import type TelemetryReporter from '@vscode/extension-telemetry';
|
||||
|
||||
export class DocumentMergeConflict implements interfaces.IDocumentMergeConflict {
|
||||
|
||||
@@ -12,8 +13,9 @@ export class DocumentMergeConflict implements interfaces.IDocumentMergeConflict
|
||||
public incoming: interfaces.IMergeRegion;
|
||||
public commonAncestors: interfaces.IMergeRegion[];
|
||||
public splitter: vscode.Range;
|
||||
private applied = false;
|
||||
|
||||
constructor(descriptor: interfaces.IDocumentMergeConflictDescriptor) {
|
||||
constructor(descriptor: interfaces.IDocumentMergeConflictDescriptor, private readonly telemetryReporter: TelemetryReporter) {
|
||||
this.range = descriptor.range;
|
||||
this.current = descriptor.current;
|
||||
this.incoming = descriptor.incoming;
|
||||
@@ -22,6 +24,25 @@ export class DocumentMergeConflict implements interfaces.IDocumentMergeConflict
|
||||
}
|
||||
|
||||
public commitEdit(type: interfaces.CommitType, editor: vscode.TextEditor, edit?: vscode.TextEditorEdit): Thenable<boolean> {
|
||||
function commitTypeToString(type: interfaces.CommitType): string {
|
||||
switch (type) {
|
||||
case interfaces.CommitType.Current:
|
||||
return 'current';
|
||||
case interfaces.CommitType.Incoming:
|
||||
return 'incoming';
|
||||
case interfaces.CommitType.Both:
|
||||
return 'both';
|
||||
}
|
||||
}
|
||||
|
||||
/* __GDPR__
|
||||
"mergeMarkers.accept" : {
|
||||
"owner": "hediet",
|
||||
"comment": "Used to understand how the inline merge editor experience is used.",
|
||||
"resolution": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "Indicates how the merge conflict was resolved by the user" }
|
||||
}
|
||||
*/
|
||||
this.telemetryReporter.sendTelemetryEvent('mergeMarkers.accept', { resolution: commitTypeToString(type) });
|
||||
|
||||
if (edit) {
|
||||
|
||||
@@ -33,6 +54,10 @@ export class DocumentMergeConflict implements interfaces.IDocumentMergeConflict
|
||||
}
|
||||
|
||||
public applyEdit(type: interfaces.CommitType, document: vscode.TextDocument, edit: { replace(range: vscode.Range, newText: string): void }): void {
|
||||
if (this.applied) {
|
||||
return;
|
||||
}
|
||||
this.applied = true;
|
||||
|
||||
// Each conflict is a set of ranges as follows, note placements or newlines
|
||||
// which may not in spans
|
||||
|
||||
@@ -7,6 +7,7 @@ import * as vscode from 'vscode';
|
||||
import { MergeConflictParser } from './mergeConflictParser';
|
||||
import * as interfaces from './interfaces';
|
||||
import { Delayer } from './delayer';
|
||||
import TelemetryReporter from '@vscode/extension-telemetry';
|
||||
|
||||
class ScanTask {
|
||||
public origins: Set<string> = new Set<string>();
|
||||
@@ -47,6 +48,8 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
|
||||
private cache: Map<string, ScanTask> = new Map();
|
||||
private delayExpireTime: number = 0;
|
||||
|
||||
constructor(private readonly telemetryReporter: TelemetryReporter) { }
|
||||
|
||||
getConflicts(document: vscode.TextDocument, origin: string): PromiseLike<interfaces.IDocumentMergeConflict[]> {
|
||||
// Attempt from cache
|
||||
|
||||
@@ -109,6 +112,8 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
|
||||
this.cache.clear();
|
||||
}
|
||||
|
||||
private readonly seenDocumentsWithConflicts = new Set<string>();
|
||||
|
||||
private getConflictsOrEmpty(document: vscode.TextDocument, _origins: string[]): interfaces.IDocumentMergeConflict[] {
|
||||
const containsConflict = MergeConflictParser.containsConflict(document);
|
||||
|
||||
@@ -116,7 +121,26 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
|
||||
return [];
|
||||
}
|
||||
|
||||
const conflicts = MergeConflictParser.scanDocument(document);
|
||||
const conflicts = MergeConflictParser.scanDocument(document, this.telemetryReporter);
|
||||
|
||||
const key = document.uri.toString();
|
||||
// Don't report telemetry for the same document twice. This is an approximation, but good enough.
|
||||
// Otherwise redo/undo could trigger this event multiple times.
|
||||
if (!this.seenDocumentsWithConflicts.has(key)) {
|
||||
this.seenDocumentsWithConflicts.add(key);
|
||||
|
||||
/* __GDPR__
|
||||
"mergeMarkers.documentWithConflictMarkersOpened" : {
|
||||
"owner": "hediet",
|
||||
"comment": "Used to determine how many documents with conflicts are opened.",
|
||||
"conflictCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true, "comment": "Total number of conflict counts" }
|
||||
}
|
||||
*/
|
||||
this.telemetryReporter.sendTelemetryEvent('mergeMarkers.documentWithConflictMarkersOpened', {}, {
|
||||
conflictCount: conflicts.length,
|
||||
});
|
||||
}
|
||||
|
||||
return conflicts;
|
||||
}
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
import * as vscode from 'vscode';
|
||||
import * as interfaces from './interfaces';
|
||||
import { DocumentMergeConflict } from './documentMergeConflict';
|
||||
import TelemetryReporter from '@vscode/extension-telemetry';
|
||||
|
||||
const startHeaderMarker = '<<<<<<<';
|
||||
const commonAncestorsMarker = '|||||||';
|
||||
@@ -20,7 +21,7 @@ interface IScanMergedConflict {
|
||||
|
||||
export class MergeConflictParser {
|
||||
|
||||
static scanDocument(document: vscode.TextDocument): interfaces.IDocumentMergeConflict[] {
|
||||
static scanDocument(document: vscode.TextDocument, telemetryReporter: TelemetryReporter): interfaces.IDocumentMergeConflict[] {
|
||||
|
||||
// Scan each line in the document, we already know there is at least a <<<<<<< and
|
||||
// >>>>>> marker within the document, we need to group these into conflict ranges.
|
||||
@@ -81,7 +82,7 @@ export class MergeConflictParser {
|
||||
|
||||
return conflictDescriptors
|
||||
.filter(Boolean)
|
||||
.map(descriptor => new DocumentMergeConflict(descriptor));
|
||||
.map(descriptor => new DocumentMergeConflict(descriptor, telemetryReporter));
|
||||
}
|
||||
|
||||
private static scanItemTolMergeConflictDescriptor(document: vscode.TextDocument, scanned: IScanMergedConflict): interfaces.IDocumentMergeConflictDescriptor | null {
|
||||
|
||||
@@ -4,8 +4,7 @@
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
import * as vscode from 'vscode';
|
||||
import * as interfaces from './interfaces';
|
||||
import { loadMessageBundle } from 'vscode-nls';
|
||||
const localize = loadMessageBundle();
|
||||
|
||||
|
||||
export default class MergeDecorator implements vscode.Disposable {
|
||||
|
||||
@@ -88,7 +87,7 @@ export default class MergeDecorator implements vscode.Disposable {
|
||||
outlineWidth: '1pt',
|
||||
outlineColor: new vscode.ThemeColor('merge.border'),
|
||||
after: {
|
||||
contentText: ' ' + localize('currentChange', '(Current Change)'),
|
||||
contentText: ' ' + vscode.l10n.t("(Current Change)"),
|
||||
color: new vscode.ThemeColor('descriptionForeground')
|
||||
}
|
||||
});
|
||||
@@ -118,7 +117,7 @@ export default class MergeDecorator implements vscode.Disposable {
|
||||
outlineColor: new vscode.ThemeColor('merge.border'),
|
||||
isWholeLine: this.decorationUsesWholeLine,
|
||||
after: {
|
||||
contentText: ' ' + localize('incomingChange', '(Incoming Change)'),
|
||||
contentText: ' ' + vscode.l10n.t("(Incoming Change)"),
|
||||
color: new vscode.ThemeColor('descriptionForeground')
|
||||
}
|
||||
});
|
||||
|
||||
@@ -9,20 +9,25 @@ import CommandHandler from './commandHandler';
|
||||
import ContentProvider from './contentProvider';
|
||||
import Decorator from './mergeDecorator';
|
||||
import * as interfaces from './interfaces';
|
||||
import TelemetryReporter from '@vscode/extension-telemetry';
|
||||
|
||||
const ConfigurationSectionName = 'merge-conflict';
|
||||
|
||||
export default class ServiceWrapper implements vscode.Disposable {
|
||||
|
||||
private services: vscode.Disposable[] = [];
|
||||
private telemetryReporter: TelemetryReporter;
|
||||
|
||||
constructor(private context: vscode.ExtensionContext) {
|
||||
const { aiKey } = context.extension.packageJSON as { aiKey: string };
|
||||
this.telemetryReporter = new TelemetryReporter(aiKey);
|
||||
context.subscriptions.push(this.telemetryReporter);
|
||||
}
|
||||
|
||||
begin() {
|
||||
|
||||
const configuration = this.createExtensionConfiguration();
|
||||
const documentTracker = new DocumentTracker();
|
||||
const documentTracker = new DocumentTracker(this.telemetryReporter);
|
||||
|
||||
this.services.push(
|
||||
documentTracker,
|
||||
@@ -48,19 +53,6 @@ export default class ServiceWrapper implements vscode.Disposable {
|
||||
}
|
||||
|
||||
createExtensionConfiguration(): interfaces.IExtensionConfiguration {
|
||||
|
||||
// PRAGMATIC way to avoid conflicting with the new merge editor: when git opts into
|
||||
// using the merge editor we disable this extension - for the merge editor but also
|
||||
// for "other" editors
|
||||
const gitConfig = vscode.workspace.getConfiguration('git');
|
||||
if (gitConfig.get<boolean>('mergeEditor')) {
|
||||
return {
|
||||
enableCodeLens: false,
|
||||
enableDecorations: false,
|
||||
enableEditorOverview: false
|
||||
};
|
||||
}
|
||||
|
||||
const workspaceConfiguration = vscode.workspace.getConfiguration(ConfigurationSectionName);
|
||||
const codeLensEnabled: boolean = workspaceConfiguration.get('codeLens.enabled', true);
|
||||
const decoratorsEnabled: boolean = workspaceConfiguration.get('decorators.enabled', true);
|
||||
|
||||
Reference in New Issue
Block a user