conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
import * as organizationProjectsPage from '../support/Base/pages/OrganizationProjects.po';
import { OrganizationProjectsPageData } from '../support/Base/pagedata/OrganizationProjectsPageData';
import { CustomCommands } from '../support/commands';
=======
import * as addTaskPage from '../support/Base/pages/Add... |
<<<<<<<
=======
import { EditOrganizationDepartmentsMutationComponent } from './edit-organization-departments/edit-organization-departments-mutation/edit-organization-departments-mutation.component';
import { EntityWithMembersModule } from 'apps/gauzy/src/app/@shared/entity-with-members-card/entity-with-members-card.... |
<<<<<<<
import { EmployeeLevelService } from 'apps/gauzy/src/app/@core/services/employee-level.service';
=======
import { OrganizationDepartmentsService } from 'apps/gauzy/src/app/@core/services/organization-departments.service';
import { OrganizationPositionsService } from 'apps/gauzy/src/app/@core/services/organiza... |
<<<<<<<
import { CandidateSourceModule } from './candidate-source/candidate-source.module';
=======
import { CandidateSourceModule } from './candidate_source/candidate_source.module';
import { CandidateDocumentsModule } from './candidate-documents/candidate-documents.module';
>>>>>>>
import { CandidateSourceModule }... |
<<<<<<<
import {EntityManager} from "../../entity-manager/EntityManager";
=======
import {OrmUtils} from "../../util/OrmUtils";
>>>>>>>
import {OrmUtils} from "../../util/OrmUtils";
<<<<<<<
import {PromiseUtils} from "../../util/PromiseUtils";
import {Broadcaster} from "../../subscriber/Broadcaster";
=======
impo... |
<<<<<<<
import { DynamicModulesComponent } from './dynamic-modules/dynamic-modules.component';
import { LifecycleEventsComponent } from './lifecycle-events/lifecycle-events.component';
import { ModuleRefComponent } from './module-reference/module-reference.component';
=======
import { DynamicModulesComponent } from '... |
<<<<<<<
protected handleAttach() {
=======
private handleAttach() {
if (!this.object) return
>>>>>>>
protected handleAttach() {
if (!this.object) return |
<<<<<<<
import {OutputVerifier, PatternToFailure} from "../../common/outputVerifier";
=======
import {DeviceHelper, IDevice} from "../../common/android/deviceHelper";
>>>>>>>
import {OutputVerifier, PatternToFailure} from "../../common/outputVerifier";
import {DeviceHelper, IDevice} from "../../common/android/device... |
<<<<<<<
import {OutputChannel} from "vscode";
=======
enum LogLevel {
None = 0,
Error = 1,
Warning = 2,
Debug = 3,
Trace = 4
}
>>>>>>>
import {OutputChannel} from "vscode";
enum LogLevel {
None = 0,
Error = 1,
Warning = 2,
Debug = 3,
Trace = 4
} |
<<<<<<<
import {ChildProcess} from "child_process";
import {CommandExecutor} from "../utils/commands/commandExecutor";
import {Log} from "../utils/commands/log";
import {OutputChannel} from "vscode";
import {PlatformResolver} from "./platformResolver";
=======
import {IDesktopPlatform} from "./platformResolver";
>>>... |
<<<<<<<
import {SqlServerDriver} from "../driver/sqlserver/SqlServerDriver";
import {MysqlDriver} from "../driver/mysql/MysqlDriver";
import {PromiseUtils} from "../util/PromiseUtils";
import {SqljsEntityManager} from "../entity-manager/SqljsEntityManager";
=======
>>>>>>>
import {SqljsEntityManager} from "../entity... |
<<<<<<<
getUserID(): string;
=======
isCompatibleWithTarget(targetPlatformId: TargetPlatformId): boolean;
>>>>>>>
getUserID(): string;
isCompatibleWithTarget(targetPlatformId: TargetPlatformId): boolean;
<<<<<<<
public getUserID(): string {
return process.env.USERNAME;
}
=======
... |
<<<<<<<
// Validating user input errors
ExpectedIntegerValue = 1001,
=======
// Inter Process Communication errors
ErrorWhileProcessingMessageInIPMSServer = 901,
>>>>>>>
// Validating user input errors
ExpectedIntegerValue = 1001,
// Inter Process Communica... |
<<<<<<<
import {IRunOptions} from "../common/launchArgs";
import * as em from "../common/extensionMessaging";
=======
import {EntryPointHandler} from "../common/entryPointHandler";
import {IRunOptions} from "./launchArgs";
>>>>>>>
import {IRunOptions} from "../common/launchArgs";
import * as em from "../common/exten... |
<<<<<<<
import {ConfigurationReader} from "../common/configurationReader";
import {SettingsHelper} from "./settingsHelper";
=======
import {Telemetry} from "../common/telemetry";
>>>>>>>
import {ConfigurationReader} from "../common/configurationReader";
import {SettingsHelper} from "./settingsHelper";
import {Telem... |
<<<<<<<
public setMainFile(value: string): Q.Promise<void> {
return this.parsePackageInformation()
.then(packageInformation => {
packageInformation.main = value;
return new Node.FileSystem().writeFile(this.informationJsonFilePath(), JSON.stringify(<Object>packageInformation)... |
<<<<<<<
import {IntellisenseHelper} from "./IntellisenseHelper";
import {TelemetryHelper} from "../common/TelemetryHelper";
import {EntryPoint} from "../common/entryPoint";
=======
import {IntellisenseHelper} from "./intellisenseHelper";
import {Telemetry} from "../common/telemetry";
import {TelemetryHelper} from "..... |
<<<<<<<
import 'p2';
import 'pixi';
import 'phaser';
import Label from './Label';
import {Atlases, Constants} from '../../Data';
export default class LabeledButton extends Phaser.Button {
protected id: string;
protected label: Label;
protected maxWidth: number;
protected maxHeight: number;
const... |
<<<<<<<
easingFunction: this.params.transitionEasingFunction,
=======
animateSliceHeight: this.params.transitionAnimateSliceHeight,
animateSliceWidth: this.params.transitionAnimateSliceWidth,
opacity: this.params.transitionOpacity,
>>>>>>>
easingFunction: t... |
<<<<<<<
transitionDuration: 250,
=======
transitionDuration: 500,
transitionOpacity: false,
>>>>>>>
transitionDuration: 250,
transitionOpacity: false, |
<<<<<<<
import isCI from 'is-ci';
import { gt } from 'semver';
=======
import merge from 'deepmerge';
import env from 'dotenv';
import envCi from 'env-ci';
import { gt, inc, ReleaseType } from 'semver';
>>>>>>>
import merge from 'deepmerge';
import env from 'dotenv';
import isCI from 'is-ci';
import { gt, inc, Relea... |
<<<<<<<
import merge from 'deepmerge';
=======
import env from 'dotenv';
>>>>>>>
import merge from 'deepmerge';
import env from 'dotenv'; |
<<<<<<<
export interface RenameInitialValue {
range: IRange;
text?: string;
}
=======
>>>>>>>
export interface RenameInitialValue {
range: IRange;
text?: string;
} |
<<<<<<<
import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
import * as nls from 'vs/nls';
=======
import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';... |
<<<<<<<
import { WorkbenchListFocusContextKey, IListService } from 'vs/platform/list/browser/listService';
=======
import { openFolderCommand, openFileInNewWindowCommand, openFileFolderInNewWindowCommand, openFolderInNewWindowCommand, openWorkspaceInNewWindowCommand } from 'vs/workbench/browser/actions/workspaceActio... |
<<<<<<<
autoGuessEncoding: boolean;
=======
defaultLanguage: string;
>>>>>>>
autoGuessEncoding: boolean;
defaultLanguage: string; |
<<<<<<<
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { CancellationToken } from 'vs/base/common/cancellation';
import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
import { SplitView, Orientation, Sizing } from 'vs/bas... |
<<<<<<<
import './mainThreadComments';
=======
import './mainThreadUrls';
>>>>>>>
import './mainThreadComments';
import './mainThreadUrls'; |
<<<<<<<
workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ConfigureTaskRunnerAction, ConfigureTaskRunnerAction.ID, ConfigureTaskRunnerAction.TEXT), tasksCategory);
if (Env.enableTasks) {
// Task Service
registerSingleton(ITaskService, TaskService);
// Actions
workbenchActionsRegistry.regis... |
<<<<<<<
* Checks if the activity bar is currently hidden or not
*/
isActivityBarHidden(): boolean;
/**
* Set activity bar hidden or not
*/
setActivityBarHidden(hidden: boolean): void;
/**
* Returns iff the titlebar part is currently hidden or not.
=======
* Returns iff the custom titlebar part is vi... |
<<<<<<<
import ActionsRenderer = require('vs/base/parts/tree/browser/actionsRenderer');
import Actions = require('vs/base/common/actions');
import {compareAnything} from 'vs/base/common/comparers';
import ActionBar = require('vs/base/browser/ui/actionbar/actionbar');
import TreeDefaults = require('vs/base/parts/tree/br... |
<<<<<<<
terminal: {
external: {
windowsExec: 'testWindowsShell',
linuxExec: 'testLinuxShell'
}
=======
externalTerminal: {
windowsExec: 'testWindowsShell',
macExec: 'testMacShell',
linuxExec: 'testLinuxShell'
>>>>>>>
terminal: {
external: {
windowsExec: 'testWindowsShe... |
<<<<<<<
import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService';
import {ShowEditorsInGroupAction, CloseEditorsInGroupAction, CloseEditorsInOtherGroupsAction, CloseAllEditorsAction, MoveGroupLeftAction, Move... |
<<<<<<<
import {NativescriptConnectionOptions} from "../driver/nativescript/NativescriptConnectionOptions";
=======
import {ExpoConnectionOptions} from "../driver/expo/ExpoConnectionOptions";
>>>>>>>
import {NativescriptConnectionOptions} from "../driver/nativescript/NativescriptConnectionOptions";
import {ExpoConne... |
<<<<<<<
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... |
<<<<<<<
import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
=======
import { ChunksTextBufferBuilder } from 'vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder';
>>>>>>>
import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pie... |
<<<<<<<
import { InternalTreeExplorerNode } from 'vs/workbench/parts/explorers/common/treeExplorerViewModel';
=======
export interface IEnvironment {
appSettingsHome: string;
disableExtensions: boolean;
userExtensionsHome: string;
extensionDevelopmentPath: string;
extensionTestsPath: string;
}
export interface... |
<<<<<<<
private currentNode: Node;
=======
private nodeLabels = {};
>>>>>>>
private currentNode: Node;
private nodeLabels = {}; |
<<<<<<<
const patternExclusionsHistory = this.viewletSettings['query.folderExclusionsHistory'] || [];
const exclusionsUsePattern = this.viewletSettings['query.exclusionsUsePattern'];
const includesUsePattern = this.viewletSettings['query.includesUsePattern'];
=======
>>>>>>>
const patternExclusionsHistory = ... |
<<<<<<<
=======
import { SettingsComponent } from './components/pages/settings/settings.component';
import { PasswordComponent } from './components/pages/settings/password/password.component';
import { NodeAppButtonComponent } from './components/pages/node/apps/node-app-button/node-app-button.component';
>>>>>>>
imp... |
<<<<<<<
import { FormsModule } from '@angular/forms';
import {
MatToolbarModule,
MatTableModule,
MatButtonModule,
MatIconModule,
MatTooltipModule,
MatChipsModule,
MatMenuModule,
MatSnackBarModule,
MatSlideToggleModule,
MatListModule
} from '@angular/material';
import {FooterComponent} from './compon... |
<<<<<<<
@IContextKeyService contextKeyService: IContextKeyService,
@IConfigurationService private configurationService: IConfigurationService,
=======
@IContextKeyService private contextKeyService: IContextKeyService,
@IConfigurationService protected configurationService: IConfigurationService,
@IWorkbenchT... |
<<<<<<<
import { ContextKeyAndExpr, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
import { OS } from '... |
<<<<<<<
terminal: {
external: {
linuxExec: string,
windowsExec: string
}
=======
externalTerminal: {
linuxExec: string,
macExec: string,
windowsExec: string
>>>>>>>
terminal: {
external: {
linuxExec: string,
macExec: string,
windowsExec: string
} |
<<<<<<<
import { SimpleFileResourceDragAndDrop } from 'vs/workbench/browser/dnd';
import { INextStorage2Service, StorageScope } from 'vs/platform/storage2/common/storage2';
=======
import { IStorageService } from 'vs/platform/storage/common/storage';
import { Scope } from 'vs/workbench/common/memento';
>>>>>>>
impor... |
<<<<<<<
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';... |
<<<<<<<
activeTerminalInstanceIndex: number;
configHelper: TerminalConfigHelper;
terminalInstances: ITerminalInstance[];
createInstance(name?: string): ITerminalInstance;
getInstanceFromId(terminalId: number): ITerminalInstance;
getActiveInstance(): ITerminalInstance;
setActiveInstance(terminalInstance: ITermin... |
<<<<<<<
openWindow(windowId: number, paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean }): TPromise<void> {
=======
openWindow(windowId: number, paths: string[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFil... |
<<<<<<<
GetCommitTemplate = 1 << 15,
DeleteBranch = 1 << 16,
Ignore = 1 << 17
=======
GetCommitTemplate = 1 << 15,
Merge = 1 << 16
>>>>>>>
GetCommitTemplate = 1 << 15,
DeleteBranch = 1 << 16,
Merge = 1 << 17,
Ignore = 1 << 18
<<<<<<<
async deleteBranch(name: string, force?: boolean): Promise<void> {
awa... |
<<<<<<<
private async _openResource(model: Model, resource: Resource): Promise<void> {
=======
private async _openResource(resource: Resource, preview?: boolean): Promise<void> {
>>>>>>>
private async _openResource(model: Model, resource: Resource, preview?: boolean): Promise<void> {
<<<<<<<
@modelCommand('git.... |
<<<<<<<
import {EditorStacksModel, EditorGroup, IEditorIdentifier} from 'vs/workbench/common/editor/editorStacksModel';
=======
import {IDisposable, dispose} from 'vs/base/common/lifecycle';
>>>>>>>
import {EditorStacksModel, EditorGroup, IEditorIdentifier} from 'vs/workbench/common/editor/editorStacksModel';
import... |
<<<<<<<
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... |
<<<<<<<
this._styleSheet = dom.createStyleSheet();
this._decorationOptionProviders = Object.create(null);
=======
this._styleSheet = styleSheet;
this._decorationRenderOptions = Object.create(null);
>>>>>>>
this._styleSheet = styleSheet;
this._decorationOptionProviders = Object.create(null);
<<<<<<<
c... |
<<<<<<<
private REFRESH_SUBSCRIPTION_DELAY: number = 10000;
private isOnline: boolean = false;
=======
>>>>>>>
<<<<<<<
this.node = { key, ...node };
this.nodeService.setCurrentNode(this.node);
this.loadData();
}
private loadData(): void
{
this.nodeService.nodeApps().subscribe(apps => thi... |
<<<<<<<
test('Transform -> FormatString#resolve', function () {
// shorthand functions
assert.equal(new FormatString(1, 'upcase').resolve('foo'), 'FOO');
assert.equal(new FormatString(1, 'downcase').resolve('FOO'), 'foo');
assert.equal(new FormatString(1, 'capitalize').resolve('bar'), 'Bar');
assert.equal(... |
<<<<<<<
import { TextBuffer } from 'vs/editor/common/model/textBuffer';
import { TextBuffer as TextBuffer2 } from 'vs/editor/common/model/textBuffer2';
import { IRawPTBuffer } from './textSource';
=======
import { ITextBuffer } from 'vs/editor/common/model/textBuffer';
>>>>>>>
import { ITextBuffer } from 'vs/editor/... |
<<<<<<<
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... |
<<<<<<<
async deleteBranch(name: string, force?: boolean): Promise<void> {
const args = ['branch', force ? '-D' : '-d', name];
await this.run(args);
}
=======
async merge(name: string): Promise<void> {
const args = ['merge', name];
await this.run(args);
}
>>>>>>>
async deleteBranch(name: string, force... |
<<<<<<<
.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... |
<<<<<<<
import {ITree, IFocusEvent, ISelectionEvent} from 'vs/base/parts/tree/common/tree';
=======
import {ITree, IFocusEvent, ISelectionEvent} from 'vs/base/parts/tree/browser/tree';
import {WorkbenchComponent} from 'vs/workbench/common/component';
import {ViewletEvent} from 'vs/workbench/common/events';
>>>>>>>
i... |
<<<<<<<
import { LinkedMap as Map } from 'vs/base/common/map';
import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
=======
>>>>>>>
import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
import { SideBySideEditor } from 'vs/workbench/browser/parts/editor/sideBySideEditor';
<<<<<<<
import { EditorOptions, ... |
<<<<<<<
import { FooterComponent } from './components/layout/footer/footer.component';
import { AppsComponent } from './components/pages/node/apps/apps.component';
import { LogComponent } from './components/pages/node/apps/log/log.component';
import { AppSshsComponent } from './components/pages/node/apps/app-sshs/app-s... |
<<<<<<<
openWindow(paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean; }): TPromise<void> {
=======
openWindow(paths: string[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): ... |
<<<<<<<
provideCodeActions(resource: URI, range: IRange): TPromise<CodeActionDto[]> {
=======
provideCodeActions(resource: URI, range: IRange, context: modes.CodeActionContext): TPromise<modes.CodeAction[]> {
>>>>>>>
provideCodeActions(resource: URI, range: IRange, context: modes.CodeActionContext): TPromise<Cod... |
<<<<<<<
openWindow(windowId: number, paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean; }): TPromise<void>;
=======
openWindow(windowId: number, paths: string[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFil... |
<<<<<<<
public resolve(refresh?: boolean): TPromise<IEditorModel> {
=======
public resolve(): TPromise<IEditorModel, any> {
>>>>>>>
public resolve(): TPromise<IEditorModel> { |
<<<<<<<
import { IMessageService } from "vs/platform/message/common/message";
=======
import * as nls from 'vs/nls';
import * as browser from 'vs/base/browser/browser';
>>>>>>>
import { IMessageService } from "vs/platform/message/common/message";
import * as nls from 'vs/nls';
import * as browser from 'vs/base/brows... |
<<<<<<<
private nodeService: NodeService,
) {
this.discoveries = data.discoveries;
this.discovery = this.discoveries[0];
}
ngOnInit() {
}
search() {
this.nodeService.searchServices(this.serviceKey, this.currentPage, this.limit, this.discovery)
.subscribe((result: SearchResult) => {
... |
<<<<<<<
registerWebviewPanelSerializer: proposedApiFunction(extension, (viewType: string, serializer: vscode.WebviewPanelSerializer) => {
return extHostWebviews.registerWebviewPanelSerializer(viewType, serializer);
}),
registerUriHandler(handler: vscode.UriHandler) {
return extHostUrls.registerUriHandl... |
<<<<<<<
import { CombinedSpliceable } from 'vs/base/browser/ui/list/splice';
=======
import { clamp } from 'vs/base/common/numbers';
>>>>>>>
import { CombinedSpliceable } from 'vs/base/browser/ui/list/splice';
import { clamp } from 'vs/base/common/numbers'; |
<<<<<<<
import { getWorkspaceLabel, IWorkspacesService, IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, IStoredWorkspaceFolder, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
import { IWindowConfiguration } from 'vs/platform/windows/common/windows';
... |
<<<<<<<
stickiness?: TrackedRangeStickiness;
backgroundColor?: string;
=======
backgroundColor?: string | ThemeColor;
>>>>>>>
stickiness?: TrackedRangeStickiness;
backgroundColor?: string | ThemeColor; |
<<<<<<<
windowsService.open({ cli: environmentService.args, forceNewWindow: true, forceEmpty: true, restoreBackups: true }); // new window if "-n" was used without paths
=======
windowsMainService.open({ cli: environmentService.args, forceNewWindow: true, forceEmpty: true }); // new window if "-n" was used withou... |
<<<<<<<
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... |
<<<<<<<
import { once } from 'vs/base/common/event';
import { domEvent } from 'vs/base/browser/event';
import { append, emmet as $, addClass, removeClass, finalHandler } from 'vs/base/browser/dom';
=======
import { append, $, addClass, removeClass, finalHandler } from 'vs/base/browser/dom';
>>>>>>>
import { once } f... |
<<<<<<<
return this._proxy.$deserializeWebviewPanel(handle, webview.state.viewType, webview.getTitle(), webview.state.state, webview.group, webview.options) // TODO@grid [EXTENSIONS] adopt group identifier
=======
let state;
try {
state = JSON.parse(webview.state.state);
} catch {
state = {};
}... |
<<<<<<<
import * as editorCommon from 'vs/editor/common/editorCommon';
import { guessIndentation, IndentationGuesserTextBufferTarget, IndentationGuesserStringArrayTarget, IndentationGuesserRawTextBufferTarget } from 'vs/editor/common/model/indentationGuesser';
=======
import { ModelRawContentChangedEvent, IModelDecor... |
<<<<<<<
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 { ICommonCodeEditor, isCommonCodeEditor } from 'vs/editor/common/editorCommon';
import { bulkEdit, IResourceEdit } from 'vs/editor/common/services/bulkEdit';
import { TPromise } from 'vs/base/common/winjs.base';
=======
import { TPromise, PPromise } from 'vs/base/common/winjs.base';
>>>>>>>
import { T... |
<<<<<<<
import { AccountID, Asset, AssetCode, AssetID, IAssetInput } from "../";
=======
import { AccountID, Asset, AssetCode, AssetID } from "../";
import { HorizonAssetType } from "../../datasource/types";
>>>>>>>
import { AccountID, Asset, AssetCode, AssetID } from "../";
<<<<<<<
public static fromInput(arg: I... |
<<<<<<<
=======
export interface PushOptions {
setUpstream?: boolean;
withTags?: boolean;
}
>>>>>>>
<<<<<<<
async deleteBranch(name: string, force?: boolean): Promise<void> {
const args = ['branch', force ? '-D' : '-d', name];
await this.run(args);
}
async merge(ref: string): Promise<void> {
const args... |
<<<<<<<
import { WorkbenchTree } from 'vs/platform/list/browser/listService';
import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
=======
import { Location } from 'vs/editor/common/modes';
>>>>>>>
import { WorkbenchTree } from 'vs/platform/list/browser/listService';
import { RawContextKey } fro... |
<<<<<<<
import { BigNumber } from 'bignumber.js';
import { PaymentOperation, Transaction } from "../../model";
=======
import { Transaction } from "../../model";
>>>>>>>
import { BigNumber } from 'bignumber.js';
import { Transaction } from "../../model"; |
<<<<<<<
onDidChangeFocus: Event<boolean>;
onDidChangeMaximize: Event<boolean>;
=======
onDidChangeFocus: Event<boolean> = new Emitter<boolean>().event;
>>>>>>>
onDidChangeFocus: Event<boolean> = new Emitter<boolean>().event;
onDidChangeMaximize: Event<boolean> = new Emitter<boolean>().event; |
<<<<<<<
operations(first: Int, last: Int, before: String, after: String, order: Order): OperationConnection
=======
operations(first: Int, last: Int, before: String, after: String): OperationConnection
payments(first: Int, last: Int, before: String, after: String): OperationConnection
>>>>>>>
operati... |
<<<<<<<
import { compare } from "vs/base/common/strings";
import { asWinJsPromise } from 'vs/base/common/async';
import { Disposable } from 'vs/workbench/api/node/extHostTypes';
=======
import { compare } from 'vs/base/common/strings';
import { TrieMap } from 'vs/base/common/map';
>>>>>>>
import { compare } from "vs... |
<<<<<<<
import { textToMarkedString, MarkedString, markedStringsEquals } from 'vs/base/common/htmlContent';
=======
import { IMarkdownString, MarkdownString, isEmptyMarkdownString } from 'vs/base/common/htmlContent';
import { MarkdownRenderer } from 'vs/editor/contrib/markdown/browser/markdownRenderer';
>>>>>>>
impo... |
<<<<<<<
=======
export interface IPathPaymentOperation extends IBaseOperation {
sendMax: string;
amountSent: string;
amountReceived: string;
destinationAccount: AccountID;
destinationAsset: stellar.Asset;
sourceAsset: stellar.Asset;
}
>>>>>>>
export interface IPathPaymentOperation extends IBaseOperation... |
<<<<<<<
=======
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'; |
<<<<<<<
describe: 'filter rules to restrict dependencies to check updates',
=======
describe: 'filter rules to restrict a subsets of dependencies for updates',
array: true,
>>>>>>>
describe: 'filter rules to restrict dependencies to check updates',
array: true, |
<<<<<<<
command: `diff source:"${projectPath}tests${sep}diffbase${sep}diff_html_diffSpaceIgnore.txt" diff:"${projectPath}tests${sep}diffnew${sep}diff_html_diffSpaceIgnore.txt" read_method:file`,
qualifier: "contains",
test: `${text.red}<p></p>${text.none}\n${text.green}<p... |
<<<<<<<
constructor(root: T, showDetachedWarning: boolean = true);
=======
constructor(root: any, showDetachedWarning?: boolean);
>>>>>>>
constructor(root: T, showDetachedWarning?: boolean);
<<<<<<<
public observe(record: Boolean, callback: Function): T;
=======
public observe(record: Boolean,... |
<<<<<<<
await assertEx.throwsOrRejectsAsync(async () => testConfigureDocker('ASP.NET Core', {}, ['Windows', 'No', '1234']),
=======
await assertEx.throwsOrRejectsAsync(async () => testConfigureDocker('.NET: ASP.NET Core', {}, ['Windows', '1234']),
>>>>>>>
await assertEx.throwsOrRe... |
<<<<<<<
import { DocumentSelector, LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, Middleware, Proposed, ProposedFeatures, DidChangeConfigurationNotification } from 'vscode-languageclient';
=======
import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, Middleware, Configura... |
<<<<<<<
import { suite as SelectTests } from './tests/select.test';
import { suite as ShouldAddTest } from './tests/shouldAdd.test';
import { suite as StringValidatorTests } from './tests/stringValidator.test';
=======
import { typeguards as TypeguardsTest } from './tests/typeguards.test';
>>>>>>>
import { suite as... |
<<<<<<<
=======
export type Func = (...args: any[]) => any;
export type RequiredType = boolean | [boolean, string] | string | Func | [Func, string];
export type RefType = number | string | mongoose.Types.ObjectId | Buffer;
export type RefSchemaType = typeof mongoose.Schema.Types.Number |
typeof mongoose.Schema.Typ... |
<<<<<<<
return this.restApiService
.getRepos(filter, reposPerPage, offset)
.then(repos => {
// Late response.
if (filter !== this._filter || !repos) {
return;
}
this._repos = repos;
this._loading = false;
});
=======
return this.$.restAPI.get... |
<<<<<<<
public add(key: string, volume: number = 1, loop: bool = false): Kiwi.Sound.Audio {
/*
=======
public add(cacheID: string, cache: Kiwi.Files.Cache, volume: number = 1, loop: bool = false): Kiwi.Sound.Audio {
>>>>>>>
public add(key: string, volume: number = 1, ... |
<<<<<<<
this.members.push(child);
child.layer = this.currentLayer;
=======
super.removeChild(child);
//this.members.push(child);
var layer = null;
super.addChild(child);
>>>>>>>
super.removeChild(child);
//this.members.p... |
<<<<<<<
* Adds an Entity to this Group. The Entity must not already be in this Group and it must be supported by the Group.
* @method addChild
* @param {Kiwi.Entity} The child to be added.
* @return {Kiwi.Entity} The child.
**/
public addChild(child: Kiwi.Entity): Kiwi.Entity {
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.