conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
https?: HttpsOptions,
bodyParserOptions?: BodyParserJSONOptions
=======
https?: HttpsOptions
deduplicator?: boolean
getEndpoint?: string | boolean
>>>>>>>
https?: HttpsOptions
deduplicator?: boolean
getEndpoint?: string | boolean
bodyParserOptions?: BodyParserJSONOptions
<<<<<<<
}
export ... |
<<<<<<<
import { IMocks } from 'graphql-tools'
=======
import { IMiddleware as IFieldMiddleware } from 'graphql-middleware'
>>>>>>>
import { IMocks } from 'graphql-tools'
import { IMiddleware as IFieldMiddleware } from 'graphql-middleware'
<<<<<<<
mocks?: IMocks
=======
middlewares?: IFieldMiddleware[]
>>>>>... |
<<<<<<<
deduplicator?: boolean
=======
getEndpoint?: string | boolean
>>>>>>>
deduplicator?: boolean
getEndpoint?: string | boolean |
<<<<<<<
context._applyGlobalCompositeOperation(this);
context.translate(this._cache.canvas.x, this._cache.canvas.y);
=======
context.translate(canvasCache.x, canvasCache.y);
>>>>>>>
context._applyGlobalCompositeOperation(this);
context.translate(canvasCache.x, canvasCache.y); |
<<<<<<<
export default Konva;
=======
const Konva: any = KonvaInternals;
Konva.enableTrace = false;
Konva.traceArrMax = 100;
Konva.listenClickTap = false;
Konva.inDblClickWindow = false;
/**
* Global pixel ratio configuration. KonvaJS automatically detect pixel ratio of current device.
* But you may override such... |
<<<<<<<
if (this.fee) {
this.builder.fee(this.fee.toFixed());
=======
if (this.timestamp) {
this.builder.data.timestamp = this.timestamp;
}
if (this.senderPublicKey) {
this.builder.senderPublicKey(this.senderPublicKey);
... |
<<<<<<<
=======
private ipLastError: Record<string, number> = {};
private rateLimiter: RateLimiter;
>>>>>>>
private ipLastError: Record<string, number> = {};
private rateLimiter: RateLimiter;
<<<<<<<
ws.on("message", message => {
try {
if (message === "#2") {
... |
<<<<<<<
search(params: SearchParameters): Promise<IBlocksPaginated>;
=======
getBlockRewards(): Promise<any>;
getLastForgedBlocks(): Promise<any>;
getDelegatesForgedBlocks(): Promise<any>;
/* TODO: Remove with V1 */
findAll(params: ISearchParameters): Promise<IBlocksPaginated>;
search(p... |
<<<<<<<
function decodeBlock(buffer) {
const block = Blocks.Block.deserialize(buffer.toString("hex"), true);
// @ts-ignore - @TODO: remove ts-ignore
block.totalAmount = block.totalAmount.toFixed();
// @ts-ignore - @TODO: remove ts-ignore
block.totalFee = block.totalFee.toFixed();
// @ts-ignore -... |
<<<<<<<
import { Database, Logger, P2P } from "@arkecosystem/core-interfaces";
=======
import { Database, Logger, Shared } from "@arkecosystem/core-interfaces";
>>>>>>>
import { Database, Logger, P2P, Shared } from "@arkecosystem/core-interfaces";
<<<<<<<
export class PeerVerificationResult implements P2P.IPeerVeri... |
<<<<<<<
try {
const allPeers: P2P.IPeer[] = await this.blockchain.p2p.getStorage().getPeers();
let result = allPeers.sort((a, b) => a.latency - b.latency);
result = request.query.version
? result.filter(peer => peer.version === (request.query as any).version)... |
<<<<<<<
if (showPrompt) {
await confirm(`Would you like to restart the ${processName} process?`, () => {
this.restartProcess(processName);
});
} else {
this.restartProcess(processName);
}
}
}
protect... |
<<<<<<<
findAllByGenerator(generatorPublicKey: string, paginate: SearchPaginate): Promise<IBlocksPaginated>;
=======
findAll(params: IParameters): Promise<IBlocksPaginated>;
findAllByGenerator(generatorPublicKey: string, paginate: ISearchPaginate): Promise<IBlocksPaginated>;
>>>>>>>
findAllByGenerat... |
<<<<<<<
=======
import CombustionFirestarter from './modules/features/CombustionFirestarter';
import CombustionCharges from './modules/features/CombustionCharges';
import CombustionSpellUsage from './modules/features/CombustionSpellUsage';
import CombustionActiveTime from './modules/features/CombustionActiveTime';
im... |
<<<<<<<
import { Blocks, Constants, Enums, Identities, Interfaces, Managers, Transactions, Utils } from "@arkecosystem/crypto";
import assert from "assert";
import dayjs from "dayjs";
=======
import { Blocks, Constants, Crypto, Enums, Interfaces, Managers, Transactions, Utils } from "@arkecosystem/crypto";
import del... |
<<<<<<<
describe("findAllByBlock", () => {
it("should search by blockId", async () => {
=======
describe("getFeeStatistics", () => {
it("should invoke getFeeStatistics on db repository", async () => {
databaseService.connection.transactionsRepository = {
getFeeStati... |
<<<<<<<
=======
let destinationReached = claimer.travelByWaypoint(this.waypoints);
if (!destinationReached) return; // early
>>>>>>>
let destinationReached = claimer.travelByWaypoint(this.waypoints);
if (!destinationReached) return; // early |
<<<<<<<
import { Overmind, IConfig, IOperator, IAction, pipe, map, action } from './'
import { IS_PROXY, PATH } from 'proxy-state-tree'
=======
import { Overmind, IConfig, IOperator, pipe, map, mutate } from './'
>>>>>>>
import { Overmind, IConfig, IOperator, pipe, map, mutate } from './'
import { IS_PROXY, PATH } f... |
<<<<<<<
type Derived = (parent: any, config: any) => any
export type ResolveState<State extends IState | null> = State extends undefined
=======
export type ResolveState<State extends IState> = State extends undefined
>>>>>>>
export type ResolveState<State extends IState | null> = State extends undefined |
<<<<<<<
import { IViewDescriptorService, IViewsService, ViewContainerLocation } from 'vs/workbench/common/views';
import { IRemoteTerminalService, ITerminalExternalLinkProvider, ITerminalInstance, ITerminalService, ITerminalGroup, TerminalConnectionState, ITerminalProfileProvider } from 'vs/workbench/contrib/terminal/b... |
<<<<<<<
this.enabled = !this.runningExtensions.some(e => areSameExtensions({ id: e.identifier.value }, { id: this.extension.id }));
=======
this.enabled = !this.runningExtensions.some(e => areSameExtensions({ id: e.id }, this.extension.identifier));
>>>>>>>
this.enabled = !this.runningExtensions.some(e =... |
<<<<<<<
import { IOffProcessTerminalService, IShellLaunchConfig, ITerminalChildProcess, ITerminalDimensions, ITerminalLaunchError, ITerminalTabLayoutInfoById } from 'vs/platform/terminal/common/terminal';
import { IAvailableShellsRequest, ICommandTracker, IDefaultShellAndArgsRequest, INavigationMode, IRemoteTerminalAtt... |
<<<<<<<
kbExpr: EditorContextKeys.textFocus,
primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.UpArrow,
=======
kbExpr: EditorContextKeys.textInputFocus,
primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.UpArrow,
>>>>>>>
kbExpr: EditorContextKeys.textInputFocus,
primary: KeyMod.CtrlCmd |... |
<<<<<<<
on(event: "qrCodeContent", callback: (args: BarcodeScannedEventData) => void, thisArg?: any);
on(event: "status", callback: (args: MessageEventData) => void, thisArg?: any);
on(event: "error", callback: (args: ErrorEventData) => void, thisArg?: any);
=======
on(event: "barcodeScanned", callback: (args... |
<<<<<<<
import { ResourceTextEdit } from 'vs/editor/common/modes';
=======
import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
>>>>>>>
import { ResourceTextEdit } from 'vs/editor/common/modes';
import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel'; |
<<<<<<<
public readonly onProcessData: Event<IProcessDataEvent | string> = this._onProcessData.event;
private readonly _onProcessReplay = this._register(new Emitter<IPtyHostProcessReplayEvent>());
public readonly onProcessReplay: Event<IPtyHostProcessReplayEvent> = this._onProcessReplay.event;
=======
public read... |
<<<<<<<
import { IPanel } from 'vs/workbench/common/panel';
import { IViewlet } from 'vs/workbench/common/viewlet';
import { Viewlet } from 'vs/workbench/browser/viewlet';
=======
import { IPartService } from 'vs/workbench/services/part/common/partService';
>>>>>>>
import { IPanel } from 'vs/workbench/common/panel';... |
<<<<<<<
const extHostExplorers = col.define(ExtHostContext.ExtHostExplorers).set<ExtHostTreeExplorers>(new ExtHostTreeExplorers(threadService, extHostCommands));
const extHostConfiguration = col.define(ExtHostContext.ExtHostConfiguration).set<ExtHostConfiguration>(new ExtHostConfiguration(threadService.get(MainContex... |
<<<<<<<
import { ActiveViewletContext } from 'vs/workbench/common/viewlet';
=======
import { ExtensionType } from 'vs/platform/extensions/common/extensions';
>>>>>>>
import { ActiveViewletContext } from 'vs/workbench/common/viewlet';
import { ExtensionType } from 'vs/platform/extensions/common/extensions'; |
<<<<<<<
dom.toggleClass(this.signature, 'has-docs', !!signature.documentation);
if (signature.documentation === undefined) { /** no op */ }
else if (typeof signature.documentation === 'string') {
dom.append(this.docs, $('p', {}, signature.documentation));
=======
if (typeof signature.documentation === 'st... |
<<<<<<<
transform(dummyAst, classData).then(result => {
printFile(
process.cwd() +
"/generatedClasses/Azure/" +
classData.functions[0].pkgName.split("-")[1] +
".js",
result
);
});
=======
return classData;
}
export async function generateAzureClass(serviceClass) {
... |
<<<<<<<
import { IWorkspaceIdentifier, IWorkspaceFolderCreationData, IWorkspacesService, rewriteWorkspaceFileForNewLocation, WORKSPACE_FILTER } from 'vs/platform/workspaces/common/workspaces';
import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
=======
import { I... |
<<<<<<<
export function findBestWindowOrFolderForFile<W extends ISimpleWindow>({ windows, newWindow, context, fileUri, workspaceResolver }: IBestWindowOrFolderOptions<W>): W | null {
=======
export function findBestWindowOrFolderForFile<W extends ISimpleWindow>({ windows, newWindow, reuseWindow, context, fileUri, wor... |
<<<<<<<
import { WorkbenchTree } from 'vs/platform/list/browser/listService';
=======
import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
>>>>>>>
import { WorkbenchTree } from 'vs/platform/list/bro... |
<<<<<<<
private _createLeftHandSideEditor(options: IDiffEditorOptions, instantiationService: IInstantiationService, contextKeyService: IContextKeyService): CodeEditorWidget {
=======
private _createLeftHandSideEditor(options: editorBrowser.IDiffEditorConstructionOptions, instantiationService: IInstantiationService)... |
<<<<<<<
import { IWebviewService, Webview, WebviewContentOptions, WebviewEditorOverlay, WebviewElement, WebviewOptions, WebviewExtensionDescription } from 'vs/workbench/contrib/webview/browser/webview';
import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
import { Dimension } from 'vs/base/browser... |
<<<<<<<
c?: boolean;
=======
c?: true;
d?: true;
>>>>>>>
c?: true; |
<<<<<<<
private async _stash(repository: Repository, includeUntracked = false): Promise<void> {
if (repository.workingTreeGroup.resourceStates.length === 0) {
=======
@command('git.stash', { repository: true })
async stash(repository: Repository): Promise<void> {
const noUnstagedChanges = repository.workingTre... |
<<<<<<<
/**
* Returns the final scroll state that the instance will have once the smooth scroll animation concludes.
* If no scroll animation is occurring, it will return the actual scroll state instead.
*/
public getSmoothScrollTargetState(): ScrollState {
return this._smoothScrolling ? this._smoothScrollAni... |
<<<<<<<
},
'extensions.confirmedUriHandlerExtensionIds': {
type: 'array',
description: localize('handleUriConfirmedExtensions', "When an extension is listed here, a confirmation prompt will not be shown when that extension handles a URI."),
default: []
},
'extensions.extensionKind': {
type: ... |
<<<<<<<
/** Compares filenames by name, then by extension. Mixes uppercase and lowercase names together. */
export function compareFileNamesDefault(one: string | null, other: string | null): number {
return compareNamesThenExtensions(one, other, CaseGrouping.None);
}
=======
/** Compares filenames by name then exten... |
<<<<<<<
const isActivityBarHidden = this.partService.isActivityBarHidden();
const isSidebarHidden = this.partService.isSideBarHidden();
const isPanelHidden = this.partService.isPanelHidden();
=======
const isTitlebarHidden = !this.partService.isVisible(Parts.TITLEBAR_PART);
const isPanelHidden = !this.partS... |
<<<<<<<
export function is(value: ShellExecutionDTO | ProcessExecutionDTO | CustomExecutionDTO): value is ProcessExecutionDTO {
let candidate = value as ProcessExecutionDTO;
=======
export function is(value: ShellExecutionDTO | ProcessExecutionDTO): value is ProcessExecutionDTO {
const candidate = value as Proc... |
<<<<<<<
export abstract class BaseTextEditorModel extends EditorModel implements ITextEditorModel, IModeSupport {
=======
export abstract class BaseTextEditorModel extends EditorModel implements ITextEditorModel {
protected textEditorModelHandle: URI | null;
private createdEditorModel: boolean;
>>>>>>>
export abst... |
<<<<<<<
//#region Terminal name change event https://github.com/microsoft/vscode/issues/114898
export interface Pseudoterminal {
/**
* An event that when fired allows changing the name of the terminal.
*
* **Example:** Change the terminal name to "My new terminal".
* ```typescript
* const writeEmitt... |
<<<<<<<
readonly onWillDispose: Event<void> = this._onWillDispose.event;
private _dirty = false;
protected readonly _onDidChangeDirty = this._register(new Emitter<void>());
readonly onDidChangeDirty = this._onDidChangeDirty.event;
private _onDidChangeContent = this._register(new Emitter<NotebookTextModelChangedEve... |
<<<<<<<
//#region Webview Resource Roots
export interface Webview {
/**
* Convert a uri for the local file system to one that can be used inside webviews.
*
* Webviews cannot directly load resoruces from the workspace or local file system using `file:` uris. The
* `toWebviewResource` function takes a ... |
<<<<<<<
import { TerminalProcessMainProxy } from 'vs/workbench/contrib/terminal/electron-browser/terminalProcessMainProxy';
=======
import { IShellLaunchConfig, ITerminalChildProcess } from 'vs/platform/terminal/common/terminal';
import { LocalPty } from 'vs/workbench/contrib/terminal/electron-sandbox/localPty';
impo... |
<<<<<<<
//#region Support `scmResourceState` in `when` clauses #86180 https://github.com/microsoft/vscode/issues/86180
export interface SourceControlResourceState {
/**
* Context value of the resource state. This can be used to contribute resource specific actions.
* For example, if a resource is given a con... |
<<<<<<<
import { ExtensionActivatedByEvent } from 'vs/workbench/api/node/extHostExtensionActivator';
=======
import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
import { SpdLogService } from 'vs/platform/log/node/spdlogService';
>>>>>>>
import { ExtensionActivatedByEvent } from 'vs/... |
<<<<<<<
min = 0;
max = 10;
=======
decimalPattern = new RegExp('[0-9]+([\.][0-9]+)?');
pattern = '';
>>>>>>>
min = 0;
max = 10;
decimalPattern = new RegExp('[0-9]+([\.][0-9]+)?');
pattern = ''; |
<<<<<<<
export interface IRulerColorOption {
readonly size: number;
readonly color: string;
}
export type IRulerOption = number | IRulerColorOption;
=======
export enum RenderLineNumbersType {
Off = 0,
On = 1,
Relative = 2,
Interval = 3,
Custom = 4
}
export interface InternalEditorRenderLineNum... |
<<<<<<<
import { FindMatch, IReadonlyTextBuffer } from 'vs/editor/common/model';
import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
=======
import { IPosition } from 'vs/editor/common/core/position';
import { FindMatch } from 'vs/editor/common/model';
import { RawContextKey, Con... |
<<<<<<<
requireTrust: true,
=======
restricted: true,
// TODO: Remove when workspace trust is enabled by default
scope: ConfigurationScope.APPLICATION,
>>>>>>>
restricted: true,
<<<<<<<
requireTrust: true,
=======
restricted: true,
// TODO: Remove when workspace trust is enabled by default... |
<<<<<<<
import { Event, Emitter } from 'vs/base/common/event';
import { IUserDataSyncService, IUserDataSyncUtilService, IUserDataAutoSyncService, IUserDataSyncStoreService, IUserDataSyncBackupStoreService } from 'vs/platform/userDataSync/common/userDataSync';
=======
import { Event } from 'vs/base/common/event';
impo... |
<<<<<<<
maximizeWindow(): TPromise<void> {
return TPromise.as(void 0);
}
unmaximizeWindow(): TPromise<void> {
return TPromise.as(void 0);
}
minimizeWindow(): TPromise<void> {
return TPromise.as(void 0);
}
showMessageBoxWithCheckbox(options: Electron.MessageBoxOptions): Promise<IMessageBoxResult> {
====... |
<<<<<<<
import { contrastBorder, editorBackground, focusBorder, foreground, registerColor, textBlockQuoteBackground, textBlockQuoteBorder, textLinkActiveForeground, textLinkForeground, textPreformatForeground, transparent } from 'vs/platform/theme/common/colorRegistry';
=======
import { contrastBorder, editorBackgrou... |
<<<<<<<
import { containsDragType } from 'vs/workbench/browser/dnd';
=======
import { terminalStrings } from 'vs/workbench/contrib/terminal/common/terminalStrings';
>>>>>>>
import { containsDragType } from 'vs/workbench/browser/dnd';
import { terminalStrings } from 'vs/workbench/contrib/terminal/common/terminalStrin... |
<<<<<<<
import { hasArgs } from 'vs/code/node/args';
=======
import { RunOnceScheduler } from 'vs/base/common/async';
>>>>>>>
import { hasArgs } from 'vs/code/node/args';
import { RunOnceScheduler } from 'vs/base/common/async'; |
<<<<<<<
let workbenchProperties: { [path: string]: IJSONSchema; } = {
'workbench.editor.showTabs': {
'type': 'boolean',
'description': nls.localize('showEditorTabs', "Controls if opened editors should show in tabs or not."),
'default': true
},
'workbench.editor.labelFormat': {
'type': 'string',
'enum': ['d... |
<<<<<<<
import { ExtHostNotebookController } from 'vs/workbench/api/common/extHostNotebook';
=======
import { ExtHostTheming } from 'vs/workbench/api/common/extHostTheming';
import { IExtHostTunnelService } from 'vs/workbench/api/common/extHostTunnelService';
>>>>>>>
import { ExtHostNotebookController } from 'vs/wor... |
<<<<<<<
public resolve(refresh?: boolean): TPromise<IEditorModel> {
=======
public resolve(): TPromise<IEditorModel, any> {
>>>>>>>
public resolve(): TPromise<IEditorModel> { |
<<<<<<<
revive(configuration);
=======
perf.importEntries(configuration.perfEntries);
>>>>>>>
revive(configuration);
perf.importEntries(configuration.perfEntries); |
<<<<<<<
import { DisposableStore, Disposable, IDisposable } from 'vs/base/common/lifecycle';
import { IShellLaunchConfig, ITerminalProcessExtHostProxy, ISpawnExtHostProcessRequest, ITerminalDimensions, IAvailableShellsRequest, IDefaultShellAndArgsRequest, IStartExtensionTerminalRequest, ITerminalConfiguration, TERMINAL... |
<<<<<<<
import { IAction, IActionRunner } from 'vs/base/common/actions';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
=======
import { IAction, IActionRunner, IActionItem } from 'vs/base/common/actions';
>>>>>>>
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { IAction, IA... |
<<<<<<<
//#region Peng: Notebook
export interface CellStreamOutput {
output_type: 'stream';
text: string;
}
export interface CellErrorOutput {
output_type: 'error';
evalue: string;
traceback: string[];
}
export interface CellDisplayOutput {
output_type: 'display_data';
data: { [key: string]: any ... |
<<<<<<<
@debounce(1000)
=======
>>>>>>> |
<<<<<<<
public resolveKeybinding(kb: Keybinding): ResolvedKeybinding {
// TODO@keybindings
let r = this._keyboardMapper.resolveKeybinding(kb);
if (r.length !== 1) {
console.warn('oh noes => I cannot fulfill API!!!');
return null;
}
return r[0];
=======
public resolveKeybinding(kb: Keybinding): Resol... |
<<<<<<<
export interface TextEditor {
/**
* Inserts the given snippet template and enters snippet mode.
*
* If the editor is already in snippet mode, insertion fails and the returned promise resolves to false.
*
* @param template The snippet template to insert
* @param posOrRange The position or re... |
<<<<<<<
import { registerEditorAction, IActionOptions, EditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
import { BlockCommentCommand } from './blockCommentCommand';
import { LineCommentCommand, Type } from './lineCommentCommand';
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
... |
<<<<<<<
=======
// Restore any backups if they exist for this workspace (empty workspaces are not supported yet)
if (workspace) {
options.untitledFilesToRestore = this.backupService.getWorkspaceUntitledFileBackupsSync(workspace.resource).map(untitledFilePath => {
return { resource: Uri.file(untitledFilePat... |
<<<<<<<
outputs: [{ mime: 'text/markdown', data: valueBytesFromString('_Hello_') }]
=======
outputs: [{ mime: Mimes.markdown, valueBytes: valueBytesFromString('_Hello_') }]
>>>>>>>
outputs: [{ mime: Mimes.markdown, data: valueBytesFromString('_Hello_') }]
<<<<<<<
outputs: [{ mime: 'text/mark... |
<<<<<<<
import { realpath } from 'vs/base/node/pfs';
import * as path from 'path';
import { spawn } from 'child_process';
=======
import { CancellationToken } from 'vs/base/common/cancellation';
>>>>>>>
import { CancellationToken } from 'vs/base/common/cancellation';
import { realpath } from 'vs/base/node/pfs';
impo... |
<<<<<<<
import { Codicon } from 'vs/base/common/codicons';
=======
import { CustomEditorsAssociations, customEditorsAssociationsSettingId, CustomEditorAssociation } from 'vs/workbench/services/editor/browser/editorAssociationsSetting';
>>>>>>>
import { Codicon } from 'vs/base/common/codicons';
import { CustomEditors... |
<<<<<<<
private createSingleFolderWorkspace(singleFolderWorkspaceIdentifier: ISingleFolderWorkspaceIdentifier): TPromise<Workspace> {
const folderPath = URI.file(singleFolderWorkspaceIdentifier);
return stat(folderPath.fsPath)
.then(workspaceStat => {
let ctime: number;
if (isLinux) {
ctime = works... |
<<<<<<<
import { ModelLine, ILineEdit, LineMarker, MarkersTracker } from 'vs/editor/common/model/modelLine';
import { MetadataConsts, LanguageIdentifier } from 'vs/editor/common/modes';
import { Position } from 'vs/editor/common/core/position';
import { Range } from 'vs/editor/common/core/range';
=======
import { Mod... |
<<<<<<<
import { MetadataGenerator, Type, EnumerateType, ReferenceType, ArrayType, Property } from './metadataGenerator';
import { getDecoratorName } from './../utils/decoratorUtils';
=======
import { MetadataGenerator, Type, ReferenceType, Property } from './metadataGenerator';
import * as _ from 'lodash';
>>>>>>>
... |
<<<<<<<
import { parseTree, findNodeAtLocation } from 'vs/base/common/json';
import { toResource, SideBySideEditorInput, EditorInput } from 'vs/workbench/common/editor';
=======
import { SideBySideEditorInput, EditorInput } from 'vs/workbench/common/editor';
import { StringEditorInput } from 'vs/workbench/common/edit... |
<<<<<<<
=======
// TODO: Remove when workspace trust is enabled
getSafeConfigValue(key: string, os: OperatingSystem, useDefaultValue: boolean = true): unknown | undefined {
return this.getSafeConfigValueFullKey(`terminal.integrated.${key}.${this._getOsKey(os)}`, useDefaultValue);
}
getSafeConfigValueFullKey(ke... |
<<<<<<<
* Optional id for the tree item that has to be unique across tree. The id is used to preserve the selection and expansion state of the tree item.
*
* If not provided, an id is generated using the tree item's label. **Note** that when labels change, ids will change and that selection and expansion state... |
<<<<<<<
.registerChannel(ExtensionsLabel);
Registry.as<IEditorRegistry>(EditorExtensions.Editors)
.registerEditorInputFactory(ExtensionsInput.ID, ExtensionsInputFactory);
const editorDescriptor = new EditorDescriptor(
ExtensionsPart.ID,
localize('extensions', "Extensions"),
'vs/workbench/parts/extensions/electro... |
<<<<<<<
let schema: IJSONSchema =
{
id: schemaId,
description: 'Locale Definition file',
type: 'object',
default: {
'locale': 'en'
},
required: ['locale'],
properties: {
locale: {
type: 'string',
enum: ['de', 'en', 'en-US', 'es', 'fr', 'it', 'ja', 'ko', 'ru', 'zh-CN', 'zh-tw'],
descript... |
<<<<<<<
getViewIndex2(modelIndex: number): number | undefined;
getModelIndex(cell: CellViewModel): number | undefined;
getModelIndex2(viewIndex: number): number | undefined;
=======
getVisibleRangesPlusViewportAboveBelow(): ICellRange[];
>>>>>>>
getViewIndex2(modelIndex: number): number | undefined;
getModelIn... |
<<<<<<<
let createTestKeybindingService: (items: ResolvedKeybindingItem[], contextValue?: any) => TestKeybindingService = null;
let currentContextValue: any = null;
=======
let createTestKeybindingService: (items: NormalizedKeybindingItem[], contextValue?: any) => TestKeybindingService = null;
let currentContextV... |
<<<<<<<
private getConflictsOrEmpty(document: vscode.TextDocument): interfaces.IDocumentMergeConflict[] {
=======
private getConflictsOrEmpty(document: vscode.TextDocument, origins: string[]): interfaces.IDocumentMergeConflict[] {
let stepStart = process.hrtime();
>>>>>>>
private getConflictsOrEmpty(document: v... |
<<<<<<<
import { WorkbenchTree } from 'vs/platform/list/browser/listService';
import { OpenMode } from 'vs/base/parts/tree/browser/treeDefaults';
=======
import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
import { IConfigurationService } from 'vs/platform/configuration/common/configur... |
<<<<<<<
=======
private static readonly REPL_INPUT_LINE_HEIGHT = 19;
private static readonly URI = uri.parse(`${DEBUG_SCHEME}:replinput`);
>>>>>>>
private static readonly URI = uri.parse(`${DEBUG_SCHEME}:replinput`); |
<<<<<<<
export function is(value: ShellExecutionDTO | ProcessExecutionDTO | CustomExecutionDTO): value is ProcessExecutionDTO {
let candidate = value as ProcessExecutionDTO;
=======
export function is(value: ShellExecutionDTO | ProcessExecutionDTO): value is ProcessExecutionDTO {
const candidate = value as Proc... |
<<<<<<<
['x', 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: 'text/plain', data: new Uint8Array([3]) }] }], { custom: { metadata: { collapsed: false } }, executionOrder: 1 }],
=======
['x', 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, valueBytes: [3] }... |
<<<<<<<
private opts2: any;
=======
private optsNew: any;
>>>>>>>
private opts2: any;
private optsNew: any;
<<<<<<<
=======
this.singleRecData = [ {
"ID": 0,
"Name": "Food",
"Products": [
{ "ID": 0, "Name": "Bread", "Price... |
<<<<<<<
async run(event?: any): Promise<any> {
if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY || this.contextService.getWorkspace().folders.length === 0) {
=======
async run(): Promise<any> {
if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
>>>>>>>
async run(): Pro... |
<<<<<<<
MenuRegistry.addCommand({ id: 'workbench.action.tasks.showLog', title: nls.localize('ShowLogAction.label', "Show Task Log"), alias: 'Tasks: Show Task Log', category: tasksCategory });
MenuRegistry.addCommand({ id: 'workbench.action.tasks.runTask', title: nls.localize('RunTaskAction.label', "Run Task"), alias: '... |
<<<<<<<
// Sidebar part
=======
// Title bar
this.titlebarPart = this.instantiationService.createInstance(TitlebarPart, Identifiers.TITLEBAR_PART);
this.toDispose.push(this.titlebarPart);
this.toShutdown.push(this.titlebarPart);
serviceCollection.set(ITitleService, this.titlebarPart);
// Viewlet servic... |
<<<<<<<
import { StatusUpdater, StatusBarController } from './scmActivity';
import { SCMViewlet } from 'vs/workbench/parts/scm/electron-browser/scmViewlet';
import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
=======
import { StatusUpdater } from './scmActivity';
import { IConfigurationRegistry, ... |
<<<<<<<
const patternExclusionsHistory = this.viewletSettings['query.folderExclusionsHistory'] || [];
const exclusionsUsePattern = this.viewletSettings['query.exclusionsUsePattern'];
const includesUsePattern = this.viewletSettings['query.includesUsePattern'];
=======
>>>>>>>
const patternExclusionsHistory = ... |
<<<<<<<
const ref = model.getNodeLocation(node);
const parentRef = model.getParentNodeLocation(ref);
if (parentRef) {
set.add(model.getNode(parentRef));
=======
if (node.collapsible && node.children.length > 0 && !node.collapsed) {
set.add(node);
} else if (node.parent) {
set.add(node.pare... |
<<<<<<<
import { Git, CommitOptions } from './git';
import { Repository, Resource, Status, ResourceGroupType } from './repository';
=======
import { Ref, RefType, Git, GitErrorCodes, Branch, Stash } from './git';
import { Repository, Resource, Status, CommitOptions, ResourceGroupType } from './repository';
>>>>>>>
i... |
<<<<<<<
import { Win32UpdateService } from 'vs/platform/update/electron-main/updateService.win32';
import { LinuxUpdateService } from 'vs/platform/update/electron-main/updateService.linux';
import { DarwinUpdateService } from 'vs/platform/update/electron-main/updateService.darwin';
=======
import { IIssueService } fr... |
<<<<<<<
import { MultiCursorSelectionController } from 'vs/editor/contrib/multicursor/multicursor';
import { Selection } from 'vs/editor/common/core/selection';
=======
import { SIDE_BAR_BACKGROUND, PANEL_BACKGROUND } from 'vs/workbench/common/theme';
import { createEditorFromSearchResult } from 'vs/workbench/contrib... |
<<<<<<<
=======
import FileResultsNavigation from 'vs/workbench/parts/files/browser/fileResultsNavigation';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
>>>>>>>
import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.