jiebi/CodeConvo huggingface dataset:
quickPick.activeItems = activeItems; }, this); <del> const pick = await new Promise<KernelQuickPickItem | undefined>((resolve, reject) => { </del> <ins> const pick = await new Promise<{ selected: KernelQuickPickItem | undefined; items: KernelQuickPickItem[] }>((resolve, reject) => { </ins> quickPick.onDidAccept(() => { const item = quickPick.selectedItems[0]; if (item) { <del> resolve(item); </del> <ins> resolve({ selected: item, items: quickPick.items as KernelQuickPickItem[] }); </ins> } else { <del> resolve(undefined); </del> <ins> resolve({ selected: undefined, items: quickPick.items as KernelQuickPickItem[] }); </ins> } quickPick.hide();
kernelDetectionTaskListener.dispose(); kernelChangeEventListener.dispose(); quickPick.dispose(); <del> resolve(undefined); </del> <ins> resolve({ selected: undefined, items: quickPick.items as KernelQuickPickItem[] }); </ins> }); quickPick.show(); }); <del> if (pick) { return await this._handleQuickPick(editor, pick); </del> <ins> if (pick.selected) { return await this._handleQuickPick(editor, pick.selected, pick.items); </ins> } return false;
scopedContextKeyService: IContextKeyService ): QuickPickInput<KernelQuickPickItem>[]; <del> protected async _handleQuickPick(editor: IActiveNotebookEditor, pick: KernelQuickPickItem) { </del> <ins> protected async _handleQuickPick(editor: IActiveNotebookEditor, pick: KernelQuickPickItem, quickPickItems: KernelQuickPickItem[]): Promise<boolean> { </ins> if (isKernelPick(pick)) { const newKernel = pick.kernel; this._selecteKernel(editor.textModel, newKernel);
}; } <del> protected override async _handleQuickPick(editor: IActiveNotebookEditor, pick: KernelQuickPickItem): Promise<boolean> { </del> <ins> protected override async _handleQuickPick(editor: IActiveNotebookEditor, pick: KernelQuickPickItem, items: KernelQuickPickItem[]): Promise<boolean> { </ins> if (pick.id === 'selectAnother') { <del> return this.displaySelectAnotherQuickPick(editor); </del> <ins> return this.displaySelectAnotherQuickPick(editor, items.length === 1 && items[0] === pick); </ins> } <del> return super._handleQuickPick(editor, pick); </del> <ins> return super._handleQuickPick(editor, pick, items); </ins> } <del> private async displaySelectAnotherQuickPick(editor: IActiveNotebookEditor) { </del> <ins> private async displaySelectAnotherQuickPick(editor: IActiveNotebookEditor, kernelListEmpty: boolean) { </ins> const notebook: NotebookTextModel = editor.textModel; const disposables = new DisposableStore(); return new Promise<boolean>(resolve => { // select from kernel sources const quickPick = this._quickInputService.createQuickPick<KernelQuickPickItem>(); <del> quickPick.title = localize('selectAnotherKernel', "Select Another Kernel"); </del> <ins> quickPick.title = kernelListEmpty ? localize('select', "Select Kernel") : localize('selectAnotherKernel', "Select Another Kernel"); </ins> quickPick.busy = true; quickPick.buttons = [this._quickInputService.backButton]; quickPick.show();
} resolve(true); } else { <del> return resolve(this.displaySelectAnotherQuickPick(editor)); </del> <ins> return resolve(this.displaySelectAnotherQuickPick(editor, false)); </ins> } } else if (isKernelPick(quickPick.selectedItems[0])) { await this._selecteKernel(notebook, quickPick.selectedItems[0].kernel);
const allRepositoriesLabel = l10n.t('All Repositories'); const allRepositoriesQuickPickItem: QuickPickItem = { label: allRepositoriesLabel }; <del> const repositoriesQuickPickItems: QuickPickItem[] = Array.from(this.model.unsafeRepositories.values()).sort().map(r => new UnsafeRepositoryItem(r)); </del> <ins> const repositoriesQuickPickItems: QuickPickItem[] = Array.from(this.model.unsafeRepositories.keys()).sort().map(r => new UnsafeRepositoryItem(r)); </ins> quickpick.items = this.model.unsafeRepositories.size === 1 ? [...repositoriesQuickPickItems] : [...repositoriesQuickPickItems, { label: '', kind: QuickPickItemKind.Separator }, allRepositoriesQuickPickItem];
if (repositoryItem.label === allRepositoriesLabel) { // All Repositories <del> unsafeRepositories.push(...this.model.unsafeRepositories.values()); </del> <ins> unsafeRepositories.push(...this.model.unsafeRepositories.keys()); </ins> } else { // One Repository unsafeRepositories.push((repositoryItem as UnsafeRepositoryItem).path);
constructor(public readonly repository: Repository, public readonly index: number) { } } <del> class UnsafeRepositorySet extends Set<string> { </del> <ins> /** * Key   - normalized path used in user interface * Value - path extracted from the output of the `git status` command *         used when calling `git config --global --add safe.directory` */ class UnsafeRepositoryMap extends Map<string, string> { </ins> constructor() { super(); this.updateContextKey(); } <del> override add(value: string): this { const result = super.add(value); </del> <ins> override set(key: string, value: string): this { const result = super.set(key, value); </ins> this.updateContextKey(); return result; } <del> override delete(value: string): boolean { const result = super.delete(value); </del> <ins> override delete(key: string): boolean { const result = super.delete(key); </ins> this.updateContextKey(); return result;
private showRepoOnHomeDriveRootWarning = true; private pushErrorHandlers = new Set<PushErrorHandler>(); <del> private _unsafeRepositories = new UnsafeRepositorySet(); get unsafeRepositories(): Set<string> { </del> <ins> private _unsafeRepositories = new UnsafeRepositoryMap(); get unsafeRepositories(): Map<string, string> { </ins> return this._unsafeRepositories; }
repository.status(); // do not await this, we want SCM to know about the repo asap } catch (ex) { // Handle unsafe repository <del> const match = /^fatal: detected dubious ownership in repository at '([^']+)'$/m.exec(ex.stderr); if (match && match.length === 2) { </del> <ins> const match = /^fatal: detected dubious ownership in repository at '([^']+)'[sS]*git config --global --add safe.directory '?([^'n]+)'?$/m.exec(ex.stderr); if (match && match.length === 3) { </ins> const unsafeRepositoryPath = path.normalize(match[1]); this.logger.trace(`Unsafe repository: ${unsafeRepositoryPath}`);
registerSimpleEditorSettingMigration('autoIndent', [[false, 'advanced'], [true, 'full']]); registerSimpleEditorSettingMigration('matchBrackets', [[true, 'always'], [false, 'never']]); registerSimpleEditorSettingMigration('renderFinalNewline', [[true, 'on'], [false, 'off']]); <ins> registerSimpleEditorSettingMigration('cursorSmoothCaretAnimation', [[true, 'on'], [false, 'off']]); </ins> registerEditorSettingMigration('autoClosingBrackets', (value, read, write) => { if (value === false) {
private _readOnly: boolean; private _cursorBlinking: TextEditorCursorBlinkingStyle; private _cursorStyle: TextEditorCursorStyle; <del> private _cursorSmoothCaretAnimation: boolean; </del> <ins> private _cursorSmoothCaretAnimation: 'off' | 'explicit' | 'on'; </ins> private _selectionIsEmpty: boolean; private _isComposingInput: boolean;
private _onCursorPositionChanged(position: Position, secondaryPositions: Position[], reason: CursorChangeReason): void { const pauseAnimation = ( this._secondaryCursors.length !== secondaryPositions.length <del> || reason !== CursorChangeReason.Explicit </del> <ins> || (this._cursorSmoothCaretAnimation === 'explicit' && reason !== CursorChangeReason.Explicit) </ins> ); this._primaryCursor.onCursorPositionChanged(position, pauseAnimation); this._updateBlinking();
_cursorBlinkingStyleFromString, { description: nls.localize('cursorBlinking', "Control the cursor animation style.") } )), <del> cursorSmoothCaretAnimation: register(new EditorBooleanOption( EditorOption.cursorSmoothCaretAnimation, 'cursorSmoothCaretAnimation', false, { description: nls.localize('cursorSmoothCaretAnimation', "Controls whether the smooth caret animation should be enabled.") } </del> <ins> cursorSmoothCaretAnimation: register(new EditorStringEnumOption( EditorOption.cursorSmoothCaretAnimation, 'cursorSmoothCaretAnimation', 'off' as 'off' | 'explicit' | 'on', ['off', 'explicit', 'on'] as const, { enumDescriptions: [ nls.localize('cursorSmoothCaretAnimation.off', "Smooth caret animation is disabled."), nls.localize('cursorSmoothCaretAnimation.explicit', "Smooth caret animation is enabled only when the user moves the cursor with an explicit gesture."), nls.localize('cursorSmoothCaretAnimation.on', "Smooth caret animation is always enabled.") ], description: nls.localize('cursorSmoothCaretAnimation', "Controls whether the smooth caret animation should be enabled.") } </ins> )), cursorStyle: register(new EditorEnumOption( EditorOption.cursorStyle, 'cursorStyle',
mouseStyle?: 'text' | 'default' | 'copy'; /** * Enable smooth caret animation. <del> * Defaults to false. </del> <ins> * Defaults to 'off'. </ins> */ <del> cursorSmoothCaretAnimation?: boolean; </del> <ins> cursorSmoothCaretAnimation?: 'off' | 'explicit' | 'on'; </ins> /** * Control the cursor style, either 'block' or 'line'. * Defaults to 'line'.
contextmenu: IEditorOption<EditorOption.contextmenu, boolean>; copyWithSyntaxHighlighting: IEditorOption<EditorOption.copyWithSyntaxHighlighting, boolean>; cursorBlinking: IEditorOption<EditorOption.cursorBlinking, TextEditorCursorBlinkingStyle>; <del> cursorSmoothCaretAnimation: IEditorOption<EditorOption.cursorSmoothCaretAnimation, boolean>; </del> <ins> cursorSmoothCaretAnimation: IEditorOption<EditorOption.cursorSmoothCaretAnimation, 'on' | 'off' | 'explicit'>; </ins> cursorStyle: IEditorOption<EditorOption.cursorStyle, TextEditorCursorStyle>; cursorSurroundingLines: IEditorOption<EditorOption.cursorSurroundingLines, number>; cursorSurroundingLinesStyle: IEditorOption<EditorOption.cursorSurroundingLinesStyle, 'default' | 'all'>;
} private get profilesVisibilityPreference(): boolean { <del> return this.userDataProfilesService.isEnabled() && this.storageService.getBoolean(ProfilesActivityActionViewItem.PROFILES_VISIBILITY_PREFERENCE_KEY, StorageScope.PROFILE, this.userDataProfilesService.profiles.length > 1); </del> <ins> return this.userDataProfilesService.isEnabled() && this.storageService.getBoolean(ProfilesActivityActionViewItem.PROFILES_VISIBILITY_PREFERENCE_KEY, StorageScope.PROFILE, true); </ins> } private set profilesVisibilityPreference(value: boolean) {
import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IProductService } from 'vs/platform/product/common/productService'; import { Registry } from 'vs/platform/registry/common/platform'; <del> import { IUserDataProfilesService, PROFILES_ENABLEMENT_CONFIG } from 'vs/platform/userDataProfile/common/userDataProfile'; </del> <ins> import { IUserDataProfile, IUserDataProfilesService, PROFILES_ENABLEMENT_CONFIG } from 'vs/platform/userDataProfile/common/userDataProfile'; </ins> import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration'; import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; import { RenameProfileAction } from 'vs/workbench/contrib/userDataProfile/browser/userDataProfileActions';
import { CancellationToken } from 'vs/base/common/cancellation'; import { URI } from 'vs/base/common/uri'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; <del> import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace'; </del> <ins> import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; </ins> import { IWorkspaceTagsService } from 'vs/workbench/contrib/tags/common/workspaceTags'; import { getErrorMessage } from 'vs/base/common/errors'; <ins> const SelectProfileSubMenu = new MenuId('SelectProfile'); </ins> export class UserDataProfilesWorkbenchContribution extends Disposable implements IWorkbenchContribution { private readonly currentProfileContext: IContextKey<string>;
private registerActions(): void { this.registerManageProfilesSubMenu(); <ins> this.registerSelectProfileSubMenu(); this.registerProfilesActions(); this._register(this.userDataProfilesService.onDidChangeProfiles(() => this.registerProfilesActions())); </ins> this.registerCurrentProfilesActions(); this._register(Event.any(this.userDataProfileService.onDidChangeCurrentProfile, this.userDataProfileService.onDidUpdateCurrentProfile)(() => this.registerCurrentProfilesActions())); } private registerManageProfilesSubMenu(): void { <del> MenuRegistry.appendMenuItem(MenuId.GlobalActivity, <ISubmenuItem>{ title: PROFILES_TTILE, submenu: ManageProfilesSubMenu, group: '5_settings', when: PROFILES_ENABLEMENT_CONTEXT, order: 1 }); </del> MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, <ISubmenuItem>{ title: PROFILES_TTILE, submenu: ManageProfilesSubMenu,
when: PROFILES_ENABLEMENT_CONTEXT, order: 1 }); <del> MenuRegistry.appendMenuItem(MenuId.AccountsContext, <ISubmenuItem>{ title: PROFILES_TTILE, submenu: ManageProfilesSubMenu, group: '1_settings', </del> <ins> } private registerSelectProfileSubMenu(): IDisposable { const that = this; return MenuRegistry.appendMenuItem(ManageProfilesSubMenu, <ISubmenuItem>{ get title() { return localize('profile', "Profile ({0})", that.userDataProfileService.currentProfile.name); }, submenu: SelectProfileSubMenu, group: '0_profiles', </ins> when: PROFILES_ENABLEMENT_CONTEXT, }); } <del> private readonly currentprofileActionsDisposable = this._register(new MutableDisposable<DisposableStore>()); private registerCurrentProfilesActions(): void { this.currentprofileActionsDisposable.value = new DisposableStore(); this.currentprofileActionsDisposable.value.add(this.registerSwitchProfileForCurrentWindowAction()); this.currentprofileActionsDisposable.value.add(this.registerUpdateCurrentProfileShortNameAction()); this.currentprofileActionsDisposable.value.add(this.registerRenameCurrentProfileAction()); this.currentprofileActionsDisposable.value.add(this.registerExportCurrentProfileAction()); this.currentprofileActionsDisposable.value.add(this.registerImportProfileAction()); </del> <ins> private readonly profilesDisposable = this._register(new MutableDisposable<DisposableStore>()); private registerProfilesActions(): void { this.profilesDisposable.value = new DisposableStore(); for (const profile of this.userDataProfilesService.profiles) { this.profilesDisposable.value.add(this.registerProfileEntryAction(profile)); } </ins> } <del> private registerSwitchProfileForCurrentWindowAction(): IDisposable { </del> <ins> private registerProfileEntryAction(profile: IUserDataProfile): IDisposable { </ins> const that = this; <del> return registerAction2(class SwitchProfileForCurrentWindowAction extends Action2 { </del> <ins> return registerAction2(class ProfileEntryAction extends Action2 { </ins> constructor() { super({ <del> id: 'workbench.profiles.actions.switchProfile', title: { value: localize('switch profile for current', "Switch Profile ({0})...", that.userDataProfileService.currentProfile.name), original: `Switch Profile (${that.workspaceContextService.getWorkbenchState() === WorkbenchState.EMPTY ? localize('window', "Window") : localize('current workspace', "Workspace")})...` }, category: PROFILES_CATEGORY, f1: true, precondition: ContextKeyExpr.and(PROFILES_ENABLEMENT_CONTEXT, HAS_PROFILES_CONTEXT), </del> <ins> id: `workbench.profiles.actions.profileEntry.${profile.id}`, title: profile.name, toggled: ContextKeyExpr.equals(CURRENT_PROFILE_CONTEXT.key, profile.id), </ins> menu: [ { <del> id: ManageProfilesSubMenu, </del> <ins> id: SelectProfileSubMenu, </ins> group: '0_profiles', when: PROFILES_ENABLEMENT_CONTEXT, }
}); } async run(accessor: ServicesAccessor) { <del> const quickInputService = accessor.get(IQuickInputService); const currentProfile = that.userDataProfileService.currentProfile; const result = await quickInputService.pick(that.userDataProfilesService.profiles.map(profile => ({ id: profile.id, label: currentProfile.id === profile.id ? `$(check) ${profile.name}` : profile.name, profile })), { placeHolder: localize('switch profile', "Switch Profile") }); if (result?.profile) { that.userDataProfileManagementService.switchProfile(result?.profile); </del> <ins> if (that.userDataProfileService.currentProfile.id !== profile.id) { return that.userDataProfileManagementService.switchProfile(profile); </ins> } } }); } <ins> private readonly currentprofileActionsDisposable = this._register(new MutableDisposable<DisposableStore>()); private registerCurrentProfilesActions(): void { this.currentprofileActionsDisposable.value = new DisposableStore(); this.currentprofileActionsDisposable.value.add(this.registerUpdateCurrentProfileShortNameAction()); this.currentprofileActionsDisposable.value.add(this.registerRenameCurrentProfileAction()); this.currentprofileActionsDisposable.value.add(this.registerExportCurrentProfileAction()); this.currentprofileActionsDisposable.value.add(this.registerImportProfileAction()); } </ins> private registerUpdateCurrentProfileShortNameAction(): IDisposable { const that = this; return registerAction2(class UpdateCurrentProfileShortName extends Action2 {
"tab.unfocusedHoverBackground": "#6e76811a", "terminal.foreground": "#ffffffc5", "terminal.inactiveSelectionBackground": "#E5EBF1", <del> "textBlockQuote.background": "#010409", </del> <ins> "textBlockQuote.background": "#f8f8f8", </ins> "textBlockQuote.border": "#0000001a", "textCodeBlock.background": "#6e768166", "textLink.activeForeground": "#005FB8",
"editor.foreground": "#000000e4", "editor.inactiveSelectionBackground": "#E5EBF1", "editor.selectionHighlightBackground": "#ADD6FF80", <del> "editorCursor.foreground": "#005FB8", </del> "editorGroup.border": "#0000001a", "editorGroupHeader.tabsBackground": "#f8f8f8", "editorGroupHeader.tabsBorder": "#0000001a",
super(); } <ins> private _activeProvideLinkRequests: Map<number, Promise<TerminalLink[]>> = new Map(); </ins> async provideLinks(bufferLineNumber: number, callback: (links: ILink[] | undefined) => void) { <del> this._activeLinks?.forEach(l => l.dispose()); this._activeLinks = await this._provideLinks(bufferLineNumber); </del> <ins> let activeRequest = this._activeProvideLinkRequests.get(bufferLineNumber); if (activeRequest) { await activeRequest; callback(this._activeLinks); return; } if (this._activeLinks) { for (const link of this._activeLinks) { link.dispose(); } } activeRequest = this._provideLinks(bufferLineNumber); this._activeProvideLinkRequests.set(bufferLineNumber, activeRequest); this._activeLinks = await activeRequest; this._activeProvideLinkRequests.delete(bufferLineNumber); </ins> callback(this._activeLinks); }
"vscode-proxy-agent": "^0.12.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "8.0.0", <del> "xterm": "5.1.0-beta.87", "xterm-addon-canvas": "0.3.0-beta.35", </del> <ins> "xterm": "5.2.0-beta.2", "xterm-addon-canvas": "0.4.0-beta.1", </ins> "xterm-addon-search": "0.11.0-beta.7", <del> "xterm-addon-serialize": "0.9.0-beta.3", </del> <ins> "xterm-addon-serialize": "0.9.0", </ins> "xterm-addon-unicode11": "0.5.0-beta.5", <del> "xterm-addon-webgl": "0.14.0-beta.50", "xterm-headless": "5.1.0-beta.87", </del> <ins> "xterm-addon-webgl": "0.15.0-beta.1", "xterm-headless": "5.2.0-beta.2", </ins> "yauzl": "^2.9.2", "yazl": "^2.4.3" },
"tas-client-umd": "0.1.6", "vscode-oniguruma": "1.7.0", "vscode-textmate": "8.0.0", <del> "xterm": "5.1.0-beta.87", "xterm-addon-canvas": "0.3.0-beta.35", </del> <ins> "xterm": "5.2.0-beta.2", "xterm-addon-canvas": "0.4.0-beta.1", </ins> "xterm-addon-search": "0.11.0-beta.7", "xterm-addon-unicode11": "0.5.0-beta.5", <del> "xterm-addon-webgl": "0.14.0-beta.50" </del> <ins> "xterm-addon-webgl": "0.15.0-beta.1" </ins> } }
resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-8.0.0.tgz#2c7a3b1163ef0441097e0b5d6389cd5504b59e5d" integrity sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg== <del> xterm-addon-canvas@0.3.0-beta.35: version "0.3.0-beta.35" resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.3.0-beta.35.tgz#2f85f9df9b109d51a8ce08a6023db747f4d060d5" integrity sha512-chk/+FaUPEAC33Mt6PDLbUWlzDCCoXBWJvKykMfhZF0vCm8GqpJc3z6R9jdcZcNCPUhmmv5psRTYun6oy5TvBQ== </del> <ins> xterm-addon-canvas@0.4.0-beta.1: version "0.4.0-beta.1" resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.4.0-beta.1.tgz#f2742b88cd3eb1840b9e7f986c4bfe31e0f4684f" integrity sha512-EfjaN0ujHJ4D8CsVpBig3xPvfRhbzAyOh8piAbNpePZmTpBzc2OQQQvEeklPriKVNDv28WbmY0Zzl5tgYM7vwg== </ins> xterm-addon-search@0.11.0-beta.7: version "0.11.0-beta.7"
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0-beta.5.tgz#6992a6f56349e67b903201d52b1ad41ba3469d93" integrity sha512-MaqnU34WTHCUAo7moB4KhynGn03RckI0JJ8E/gXe96EzuCP6bVJIKSc5pc9iFeLF4BX1SuemOqIHYl2Q3u3NTA== <del> xterm-addon-webgl@0.14.0-beta.50: version "0.14.0-beta.50" resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.14.0-beta.50.tgz#e52a7fd1776c214163e15fcabedf1f0b51f75445" integrity sha512-UF8+hBYplKxuOK5ZzLBhbC7cFOqTx0vkcK1dw8mmqL0x8v1lwfz2eRxiqokkC4bDVq3CAKlul1IuEF9cQs5sZQ== </del> <ins> xterm-addon-webgl@0.15.0-beta.1: version "0.15.0-beta.1" resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.15.0-beta.1.tgz#bc3f784c3c467a70542b8a9a8998dbe996287796" integrity sha512-8f4cNXG0+dBMqp+Nvk/ZQ8Wo8s4/KbF24b2VTHTt8DuY5QXt4wSA6+NEdnABV98VYDoHl+KfXl9yyFqkcJYr8Q== </ins> <del> xterm@5.1.0-beta.87: version "5.1.0-beta.87" resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.1.0-beta.87.tgz#a4bb442b73e82941f87819f6db7810949536c891" integrity sha512-0cR7TUfAUH6Z1CVzVCm2CnFs7slqro2nf11yjrWvZyxEoGb34rNWvcnvIq2L5Xzv+gvHbl8jDO8yj5nyxQvUCA== </del> <ins> xterm@5.2.0-beta.2: version "5.2.0-beta.2" resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.0-beta.2.tgz#67369235a54f41179922e662df40ff4c7c974787" integrity sha512-MRAdWRfV80ae0Q3Caq/mfmCwnZZZ89Z8i/sAleio5g5dpsst9IXc0zeFpPnOvUWmtVy5P1LbfU9YCy47449DWw== </ins>
"keybindingLabel.foreground": "#000000e4", "list.activeSelectionBackground": "#e8e8e8", "list.activeSelectionForeground": "#000000", <del> "list.activeSelectionIconForeground": "#000000", </del> "list.hoverBackground": "#f2f2f2", "menu.border": "#D4D4D4", "notebook.cellBorderColor": "#E8E8E8",
function Global:__VSCode-Escape-Value([string]$value) { # NOTE: In PowerShell v6.1+, this can be written `$value -replace '…', { … }` instead of `[regex]::Replace`. # Replace any non-alphanumeric characters. <del> [regex]::Replace($value, '[^a-zA-Z0-9]', { param($match) # Backslashes must be doubled. if ($match.Value -eq '') { '' } else { # Any other characters are encoded as their UTF-8 hex values. -Join ( [System.Text.Encoding]::UTF8.GetBytes($match.Value) | ForEach-Object { 'x{0:x2}' -f $_ } ) } </del> <ins> [regex]::Replace($value, '[n;]', { param($match) # Encode the (ascii) matches as `x<hex>` -Join ( [System.Text.Encoding]::UTF8.GetBytes($match.Value) | ForEach-Object { 'x{0:x2}' -f $_ } ) </ins> }) }
} async getRefs(query: RefQuery = {}, cancellationToken?: CancellationToken): Promise<Ref[]> { <del> return await this.run(Operation.GetRefs, () => { return this.repository.getRefs(query, cancellationToken); }); </del> <ins> const config = workspace.getConfiguration('git'); let defaultSort = config.get<'alphabetically' | 'committerdate'>('branchSortOrder'); if (defaultSort !== 'alphabetically' && defaultSort !== 'committerdate') { defaultSort = 'alphabetically'; } query = { ...query, sort: query?.sort ?? defaultSort }; return await this.run(Operation.GetRefs, () => this.repository.getRefs(query, cancellationToken)); </ins> } async getRemoteRefs(remote: string, opts?: { heads?: boolean; tags?: boolean }): Promise<Ref[]> {
this._sourceControl.commitTemplate = commitTemplate; // Execute cancellable long-running operations <del> const config = workspace.getConfiguration('git'); let sort = config.get<'alphabetically' | 'committerdate'>('branchSortOrder') || 'alphabetically'; if (sort !== 'alphabetically' && sort !== 'committerdate') { sort = 'alphabetically'; } </del> const [resourceGroups, refs] = await Promise.all([ this.getStatus(cancellationToken), <del> this.repository.getRefs({ sort }, cancellationToken)]); </del> <ins> this.getRefs({}, cancellationToken)]); </ins> this._refs = refs!; this._updateResourceGroupsState(resourceGroups);