jiebi/CodeConvo huggingface dataset:
const inputDiffs = modifiedBaseRange.getInputDiffs(this.inputNumber); for (const diff of inputDiffs) { <ins> const range = diff.outputRange.toInclusiveRange(); if (range) { result.push({ range, options: { className: `merge-editor-diff ${inputClassName}`, description: 'Merge Editor', isWholeLine: true, } }); } </ins> if (diff.rangeMappings) { for (const d of diff.rangeMappings) { result.push({ range: d.outputRange, options: { <del> className: `merge-editor-diff-input1`, description: 'Base Range Projection' </del> <ins> className: `merge-editor-diff-word ${inputClassName}`, description: 'Merge Editor' </ins> } }); }
}); } } <ins> for (const diff of m.rights) { const range = diff.outputRange.toInclusiveRange(); if (range) { result.push({ range, options: { className: `merge-editor-diff result`, description: 'Merge Editor', isWholeLine: true, } }); } if (diff.rangeMappings) { for (const d of diff.rangeMappings) { result.push({ range: d.outputRange, options: { className: `merge-editor-diff-word result`, description: 'Merge Editor' } }); } } } </ins> } return result; });
flex-grow: 0; } <del> .monaco-editor .merge-accept-conflict-glyph { cursor: pointer; } .merge-editor-modified-base-range-input1 { background-color: var(--vscode-mergeEditor-modifiedBaseRange-input1); } .merge-editor-diff-input1 { background-color: var(--vscode-mergeEditor-diff-input1); } .merge-editor-modified-base-range-input2 { background-color: var(--vscode-mergeEditor-modifiedBaseRange-input2); } .merge-editor-diff-input2 { background-color: var(--vscode-mergeEditor-diff-input2); } .merge-editor-modified-base-range-combination { background-color: var(--vscode-mergeEditor-modifiedBaseRange-combination); </del> <ins> .merge-editor-diff { background-color: var(--vscode-mergeEditor-diff); </ins> } <del> .merge-editor-modified-base-range { background-color: var(--vscode-mergeEditor-diff); </del> <ins> .merge-editor-diff-word { background-color: var(--vscode-mergeEditor-diff-word); </ins> } .merge-editor-block { <del> border: 2px solid rgba(255, 166, 0, 0.479); </del> <ins> border: 2px solid var(--vscode-mergeEditor-conflictBorder-unhandledUnfocused); </ins> } <del> .merge-editor-block.active { border: 2px solid orange; </del> <ins> .merge-editor-block.focused { border: 2px solid var(--vscode-mergeEditor-conflictBorder-unhandledFocused); </ins> } .merge-editor-block.handled { <del> border: 2px solid rgba(134, 134, 134, 0.285); </del> <ins> border: 2px solid var(--vscode-mergeEditor-conflictBorder-handledUnfocused); </ins> } <del> .merge-editor-block.handled.active { border: 2px solid rgb(134, 134, 134, 0.8); } .merge-editor-block.handled.active { border: 2px solid rgba(193, 193, 193, 0.8); </del> <ins> .merge-editor-block.handled.focused { border: 2px solid var(--vscode-mergeEditor-conflictBorder-handledFocused); </ins> } .gutter-item {
return; } this._hoverDelayer.trigger(() => { <del> let hoverContent = `${localize('terminalPromptContextMenu', "Show Command Actions")}...`; </del> <ins> let hoverContent = `${localize('terminalPromptContextMenu', "Show Command Actions")}`; </ins> hoverContent += 'nn---nn'; if (command.genericMarkProperties) { if (command.genericMarkProperties.hoverMessage) {
import { IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput'; import { IViewsService } from 'vs/workbench/common/views'; import { DEBUG_CONSOLE_QUICK_ACCESS_PREFIX, SELECT_AND_START_ID } from 'vs/workbench/contrib/debug/browser/debugCommands'; <del> import { getStateLabel, IDebugService, IDebugSession, REPL_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug'; </del> <ins> import { IDebugService, IDebugSession, REPL_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug'; </ins> export class DebugConsoleQuickAccess extends PickerQuickAccessProvider<IPickerQuickAccessItem> {
"git": { "name": "seti-ui", "repositoryUrl": "https://github.com/jesseweed/seti-ui", <del> "commitHash": "6b83574de165123583d6d8d5b3b6c91f04b7153d" </del> <ins> "commitHash": "4dd6c27e1f5aed8068c2451dbaf0db3364545937" </ins> } }, "version": "0.1.0"
"npm-debug.log": "_npm_ignored_light" } }, <del> "version": "https://github.com/jesseweed/seti-ui/commit/6b83574de165123583d6d8d5b3b6c91f04b7153d" </del> <ins> "version": "https://github.com/jesseweed/seti-ui/commit/4dd6c27e1f5aed8068c2451dbaf0db3364545937" </ins> }  No newline at end of file
}); this._navigationDecoration = decoration; if (decoration) { <del> const isRendered = false; </del> <ins> let renderedElement: HTMLElement | undefined; </ins> decoration.onRender(element => { <del> if (!isRendered) { // TODO: Remove when https://github.com/xtermjs/xterm.js/issues/3686 is fixed if (!element.classList.contains('xterm-decoration-overview-ruler')) { element.classList.add('terminal-scroll-highlight'); </del> <ins> if (!renderedElement) { renderedElement = element; element.classList.add('terminal-scroll-highlight', 'terminal-scroll-highlight-outline'); if (this._terminal?.element) { element.style.marginLeft = `-${getComputedStyle(this._terminal.element).paddingLeft}`; </ins> } } });
{ "command": "github.copyVscodeDevLink", "title": "Copy vscode.dev Link" <del> }, { "command": "github.copyVscodeDevLinkFile", "title": "Copy vscode.dev Link" </del> <ins> }, { "command": "github.copyVscodeDevLinkFile", "title": "Copy vscode.dev Link" }, { "command": "github.openOnVscodeDev", "title": "Open on vscode.dev" } ], "continueEditSession": [ { "command": "github.openOnVscodeDev", "when": "github.hasGitHubRepo" </ins> } ], "menus": {
} } <ins> async function openVscodeDevLink(gitAPI: GitAPI): Promise<vscode.Uri | undefined> { try { const permalink = getPermalink(gitAPI, true, 'https://vscode.dev/github'); return permalink ? vscode.Uri.parse(permalink) : undefined; } catch (err) { vscode.window.showErrorMessage(err.message); return undefined; } } </ins> export function registerCommands(gitAPI: GitAPI): vscode.Disposable { const disposables = new DisposableStore();
private static readonly EnabledClass = `${ExtensionAction.LABEL_ACTION_CLASS} theme`; private static readonly DisabledClass = `${SetColorThemeAction.EnabledClass} disabled`; <del> private colorThemes: IWorkbenchColorTheme[] = []; </del> constructor( @IExtensionService extensionService: IExtensionService, @IWorkbenchThemeService private readonly workbenchThemeService: IWorkbenchThemeService, @IQuickInputService private readonly quickInputService: IQuickInputService, <ins> @IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService, </ins> ) { super(SetColorThemeAction.ID, SetColorThemeAction.TITLE.value, SetColorThemeAction.DisabledClass, false); this._register(Event.any<any>(extensionService.onDidChangeExtensions, workbenchThemeService.onDidColorThemeChange)(() => this.update(), this)); <del> workbenchThemeService.getColorThemes().then(colorThemes => { this.colorThemes = colorThemes; this.update(); }); </del> this.update(); } update(): void { <del> this.enabled = !!this.extension && (this.extension.state === ExtensionState.Installed) && this.colorThemes.some(th => isThemeFromExtension(th, this.extension)); this.class = this.enabled ? SetColorThemeAction.EnabledClass : SetColorThemeAction.DisabledClass; </del> <ins> this.workbenchThemeService.getColorThemes().then(colorThemes => { this.enabled = this.computeEnablement(colorThemes); this.class = this.enabled ? SetColorThemeAction.EnabledClass : SetColorThemeAction.DisabledClass; }); } private computeEnablement(colorThemes: IWorkbenchColorTheme[]): boolean { return !!this.extension && this.extension.state === ExtensionState.Installed && this.extensionEnablementService.isEnabledEnablementState(this.extension.enablementState) && colorThemes.some(th => isThemeFromExtension(th, this.extension)); </ins> } override async run({ showCurrentTheme, ignoreFocusLost }: { showCurrentTheme: boolean; ignoreFocusLost: boolean } = { showCurrentTheme: false, ignoreFocusLost: false }): Promise<any> { <del> this.colorThemes = await this.workbenchThemeService.getColorThemes(); </del> <ins> const colorThemes = await this.workbenchThemeService.getColorThemes(); </ins> <del> this.update(); if (!this.enabled) { </del> <ins> if (!this.computeEnablement(colorThemes)) { </ins> return; } const currentTheme = this.workbenchThemeService.getColorTheme(); const delayer = new Delayer<any>(100); <del> const picks = getQuickPickEntries(this.colorThemes, currentTheme, this.extension, showCurrentTheme); </del> <ins> const picks = getQuickPickEntries(colorThemes, currentTheme, this.extension, showCurrentTheme); </ins> const pickedTheme = await this.quickInputService.pick( picks, {
private static readonly EnabledClass = `${ExtensionAction.LABEL_ACTION_CLASS} theme`; private static readonly DisabledClass = `${SetFileIconThemeAction.EnabledClass} disabled`; <del> private fileIconThemes: IWorkbenchFileIconTheme[] = []; </del> constructor( @IExtensionService extensionService: IExtensionService, @IWorkbenchThemeService private readonly workbenchThemeService: IWorkbenchThemeService, <del> @IQuickInputService private readonly quickInputService: IQuickInputService </del> <ins> @IQuickInputService private readonly quickInputService: IQuickInputService, @IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService, </ins> ) { super(SetFileIconThemeAction.ID, SetFileIconThemeAction.TITLE.value, SetFileIconThemeAction.DisabledClass, false); this._register(Event.any<any>(extensionService.onDidChangeExtensions, workbenchThemeService.onDidFileIconThemeChange)(() => this.update(), this)); <del> workbenchThemeService.getFileIconThemes().then(fileIconThemes => { this.fileIconThemes = fileIconThemes; this.update(); }); </del> this.update(); } update(): void { <del> this.enabled = !!this.extension && (this.extension.state === ExtensionState.Installed) && this.fileIconThemes.some(th => isThemeFromExtension(th, this.extension)); this.class = this.enabled ? SetFileIconThemeAction.EnabledClass : SetFileIconThemeAction.DisabledClass; </del> <ins> this.workbenchThemeService.getFileIconThemes().then(fileIconThemes => { this.enabled = this.computeEnablement(fileIconThemes); this.class = this.enabled ? SetFileIconThemeAction.EnabledClass : SetFileIconThemeAction.DisabledClass; }); } private computeEnablement(colorThemfileIconThemess: IWorkbenchFileIconTheme[]): boolean { return !!this.extension && this.extension.state === ExtensionState.Installed && this.extensionEnablementService.isEnabledEnablementState(this.extension.enablementState) && colorThemfileIconThemess.some(th => isThemeFromExtension(th, this.extension)); </ins> } override async run({ showCurrentTheme, ignoreFocusLost }: { showCurrentTheme: boolean; ignoreFocusLost: boolean } = { showCurrentTheme: false, ignoreFocusLost: false }): Promise<any> { <del> this.fileIconThemes = await this.workbenchThemeService.getFileIconThemes(); this.update(); if (!this.enabled) { </del> <ins> const fileIconThemes = await this.workbenchThemeService.getFileIconThemes(); if (!this.computeEnablement(fileIconThemes)) { </ins> return; } const currentTheme = this.workbenchThemeService.getFileIconTheme(); const delayer = new Delayer<any>(100); <del> const picks = getQuickPickEntries(this.fileIconThemes, currentTheme, this.extension, showCurrentTheme); </del> <ins> const picks = getQuickPickEntries(fileIconThemes, currentTheme, this.extension, showCurrentTheme); </ins> const pickedTheme = await this.quickInputService.pick( picks, {
private static readonly EnabledClass = `${ExtensionAction.LABEL_ACTION_CLASS} theme`; private static readonly DisabledClass = `${SetProductIconThemeAction.EnabledClass} disabled`; <del> private productIconThemes: IWorkbenchProductIconTheme[] = []; </del> constructor( @IExtensionService extensionService: IExtensionService, @IWorkbenchThemeService private readonly workbenchThemeService: IWorkbenchThemeService, <del> @IQuickInputService private readonly quickInputService: IQuickInputService </del> <ins> @IQuickInputService private readonly quickInputService: IQuickInputService, @IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService, </ins> ) { super(SetProductIconThemeAction.ID, SetProductIconThemeAction.TITLE.value, SetProductIconThemeAction.DisabledClass, false); this._register(Event.any<any>(extensionService.onDidChangeExtensions, workbenchThemeService.onDidProductIconThemeChange)(() => this.update(), this)); <del> workbenchThemeService.getProductIconThemes().then(productIconThemes => { this.productIconThemes = productIconThemes; this.update(); }); </del> this.update(); } update(): void { <del> this.enabled = !!this.extension && (this.extension.state === ExtensionState.Installed) && this.productIconThemes.some(th => isThemeFromExtension(th, this.extension)); this.class = this.enabled ? SetProductIconThemeAction.EnabledClass : SetProductIconThemeAction.DisabledClass; </del> <ins> this.workbenchThemeService.getProductIconThemes().then(productIconThemes => { this.enabled = this.computeEnablement(productIconThemes); this.class = this.enabled ? SetProductIconThemeAction.EnabledClass : SetProductIconThemeAction.DisabledClass; }); } private computeEnablement(productIconThemes: IWorkbenchProductIconTheme[]): boolean { return !!this.extension && this.extension.state === ExtensionState.Installed && this.extensionEnablementService.isEnabledEnablementState(this.extension.enablementState) && productIconThemes.some(th => isThemeFromExtension(th, this.extension)); </ins> } override async run({ showCurrentTheme, ignoreFocusLost }: { showCurrentTheme: boolean; ignoreFocusLost: boolean } = { showCurrentTheme: false, ignoreFocusLost: false }): Promise<any> { <del> this.productIconThemes = await this.workbenchThemeService.getProductIconThemes(); this.update(); if (!this.enabled) { </del> <ins> const productIconThemes = await this.workbenchThemeService.getProductIconThemes(); if (!this.computeEnablement(productIconThemes)) { </ins> return; } const currentTheme = this.workbenchThemeService.getProductIconTheme(); const delayer = new Delayer<any>(100); <del> const picks = getQuickPickEntries(this.productIconThemes, currentTheme, this.extension, showCurrentTheme); </del> <ins> const picks = getQuickPickEntries(productIconThemes, currentTheme, this.extension, showCurrentTheme); </ins> const pickedTheme = await this.quickInputService.pick( picks, {
"vscode-proxy-agent": "^0.12.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "7.0.1", <del> "xterm": "4.19.0-beta.67", "xterm-addon-search": "0.9.0-beta.41", "xterm-addon-serialize": "0.7.0-beta.15", </del> <ins> "xterm": "4.19.0", "xterm-addon-search": "0.9.0", "xterm-addon-serialize": "0.7.0", </ins> "xterm-addon-unicode11": "0.4.0-beta.3", <del> "xterm-addon-webgl": "0.12.0-beta.43", "xterm-headless": "4.19.0-beta.67", </del> <ins> "xterm-addon-webgl": "0.12.0", "xterm-headless": "4.19.0", </ins> "yauzl": "^2.9.2", "yazl": "^2.4.3" },
"tas-client-umd": "0.1.6", "vscode-oniguruma": "1.6.1", "vscode-textmate": "7.0.1", <del> "xterm": "4.19.0-beta.67", "xterm-addon-search": "0.9.0-beta.41", </del> <ins> "xterm": "4.19.0", "xterm-addon-search": "0.9.0", </ins> "xterm-addon-unicode11": "0.4.0-beta.3", <del> "xterm-addon-webgl": "0.12.0-beta.43" </del> <ins> "xterm-addon-webgl": "0.12.0" </ins> } }
resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-7.0.1.tgz#8118a32b02735dccd14f893b495fa5389ad7de79" integrity sha512-zQ5U/nuXAAMsh691FtV0wPz89nSkHbs+IQV8FDk+wew9BlSDhf4UmWGlWJfTR2Ti6xZv87Tj5fENzKf6Qk7aLw== <del> xterm-addon-search@0.9.0-beta.41: version "0.9.0-beta.41" resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.9.0-beta.41.tgz#0992da36fe01ff6d71449265a9dabeef7f9d0a3f" integrity sha512-b1vuWR5JZ8QIiObbKkwSzpzf4x0B9hdzGCHJG+PXWT/xbxk65DOe/X9rgrRyOnCWe5ylQGG4DIHTiREigTp0lg== </del> <ins> xterm-addon-search@0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.9.0.tgz#95278ebb818cfcf882209ae75be96e0bea5d52a5" integrity sha512-aoolI8YuHvdGw+Qjg8g2M4kst0v86GtB7WeBm4F0jNXA005/6QbWWy9eCsvnIDLJOFI5JSSrZnD6CaOkvBQYPA== </ins> xterm-addon-unicode11@0.4.0-beta.3: version "0.4.0-beta.3" resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.3.tgz#f350184155fafd5ad0d6fbf31d13e6ca7dea1efa" integrity sha512-FryZAVwbUjKTmwXnm1trch/2XO60F5JsDvOkZhzobV1hm10sFLVuZpFyHXiUx7TFeeFsvNP+S77LAtWoeT5z+Q== <del> xterm-addon-webgl@0.12.0-beta.43: version "0.12.0-beta.43" resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.43.tgz#916ed4e390371403aab0d277097cd8a61be436e8" integrity sha512-hGXfwT6TOmp0tBDiS/iF8s0SLHLd3shJ5zQyS4HNtq99B5cEhHhwaUAZAfjLt5rnUt0kvqR9YWtGsDux5dWVLA== </del> <ins> xterm-addon-webgl@0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0.tgz#2fba8d31890a122adafa1c2fb945482e2ae12973" integrity sha512-3P5ihdjPnxH6Wrvqjki9UD+duoVrp1fvnO/pSpXP2F1L2GwY6TDNExgj8Yg141vMCNgQbcVqmsTLYEYZxjY92A== </ins> <del> xterm@4.19.0-beta.67: version "4.19.0-beta.67" resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.19.0-beta.67.tgz#9a7d79be64469c91bb693b9f5a50b5a22e921cd3" integrity sha512-4bYTnT6g91N5QId1qPaiSvkpsxMQYpuPdPJItvBZFOcQLTuFSX85x5NeFuDvhNqi33eMFPimyGhzH/JvAV1v/Q== </del> <ins> xterm@4.19.0: version "4.19.0" resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.19.0.tgz#c0f9d09cd61de1d658f43ca75f992197add9ef6d" integrity sha512-c3Cp4eOVsYY5Q839dR5IejghRPpxciGmLWWaP9g+ppfMeBChMeLa1DCA+pmX/jyDZ+zxFOmlJL/82qVdayVoGQ== </ins>
} renderElement(element: MarkerTableItem, index: number, templateData: IMarkerCodeColumnTemplateData, height: number | undefined): void { <del> if (element.marker.source && element.marker.code) { templateData.codeColumn.classList.toggle('code-link', typeof element.marker.code !== 'string'); DOM.show(templateData.codeLabel.element); </del> <ins> templateData.codeColumn.classList.remove('code-label'); templateData.codeColumn.classList.remove('code-link'); if (element.marker.source && element.marker.code) { </ins> if (typeof element.marker.code === 'string') { <ins> templateData.codeColumn.classList.add('code-label'); </ins> templateData.codeColumn.title = `${element.marker.source} (${element.marker.code})`; templateData.sourceLabel.set(element.marker.source, element.sourceMatches); templateData.codeLabel.set(element.marker.code, element.codeMatches); } else { <ins> templateData.codeColumn.classList.add('code-link'); </ins> templateData.codeColumn.title = `${element.marker.source} (${element.marker.code.value})`; templateData.sourceLabel.set(element.marker.source, element.sourceMatches);
content: ')'; } <del> .markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr > .monaco-table-td > .code.code-link > .code-label { </del> <ins> .markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr > .monaco-table-td > .code > .code-label, .markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr > .monaco-table-td > .code > .monaco-link { </ins> display: none; } <del> .markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr > .monaco-table-td > .code.code-link > .monaco-link { </del> <ins> .markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr > .monaco-table-td > .code.code-label > .code-label { </ins> display: inline; <del> text-decoration: underline; </del> } <del> .markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr > .monaco-table-td > .code > .monaco-link { display: none; </del> <ins> .markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr > .monaco-table-td > .code.code-link > .monaco-link { display: inline; text-decoration: underline; </ins> } .markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr > .monaco-table-td > .file > .file-position {
private disposables: Disposable[] = []; constructor(readonly repository: Repository) { <del> this._state = { HEAD: undefined, isCommitInProgress: false, isSyncInProgress: false, repositoryHasChanges: false }; </del> <ins> this._state = { HEAD: undefined, isCommitInProgress: false, isMergeInProgress: false, isSyncInProgress: false, repositoryHasChanges: false }; </ins> repository.onDidRunGitStatus(this.onDidRunGitStatus, this, this.disposables); repository.onDidChangeOperations(this.onDidChangeOperations, this, this.disposables);
const config = workspace.getConfiguration('git', Uri.file(this.repository.root)); const showActionButton = config.get<{ publish: boolean }>('showActionButton', { publish: true }); <del> // Branch does have an upstream, commit is in progress, or the button is disabled if (this.state.HEAD?.upstream || this.state.isCommitInProgress || !showActionButton.publish) { return undefined; } </del> <ins> // Branch does have an upstream, commit/merge is in progress, or the button is disabled if (this.state.HEAD?.upstream || this.state.isCommitInProgress || this.state.isMergeInProgress || !showActionButton.publish) { return undefined; } </ins> return { command: {
const config = workspace.getConfiguration('git', Uri.file(this.repository.root)); const showActionButton = config.get<{ sync: boolean }>('showActionButton', { sync: true }); <del> // Branch does not have an upstream, commit is in progress, or the button is disabled if (!this.state.HEAD?.upstream || this.state.isCommitInProgress || !showActionButton.sync) { return undefined; } </del> <ins> // Branch does not have an upstream, commit/merge is in progress, or the button is disabled if (!this.state.HEAD?.upstream || this.state.isCommitInProgress || this.state.isMergeInProgress || !showActionButton.sync) { return undefined; } </ins> const ahead = this.state.HEAD.ahead ? ` ${this.state.HEAD.ahead}$(arrow-up)` : ''; const behind = this.state.HEAD.behind ? ` ${this.state.HEAD.behind}$(arrow-down)` : '';
this.state = { ...this.state, HEAD: this.repository.HEAD, <ins> isMergeInProgress: this.repository.mergeGroup.resourceStates.length !== 0, </ins> repositoryHasChanges: this.repository.indexGroup.resourceStates.length !== 0 || <del> this.repository.mergeGroup.resourceStates.length !== 0 || </del> this.repository.untrackedGroup.resourceStates.length !== 0 || this.repository.workingTreeGroup.resourceStates.length !== 0 };
} if (styles.listHoverBackground) { <del> content.push(`.monaco-list${suffix}:not(.drop-target) .monaco-list-row:hover:not(.selected):not(.focused) { background-color: ${styles.listHoverBackground}; }`); </del> <ins> content.push(`.monaco-list${suffix}:not(.drop-target):not(.dragging) .monaco-list-row:hover:not(.selected):not(.focused) { background-color: ${styles.listHoverBackground}; }`); </ins> } if (styles.listHoverForeground) { <del> content.push(`.monaco-list${suffix} .monaco-list-row:hover:not(.selected):not(.focused) { color:  ${styles.listHoverForeground}; }`); </del> <ins> content.push(`.monaco-list${suffix}:not(.drop-target):not(.dragging) .monaco-list-row:hover:not(.selected):not(.focused) { color:  ${styles.listHoverForeground}; }`); </ins> } if (styles.listSelectionOutline) {