conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
if (!areSameExtensions({ id: e.identifier.value }, extension)) {
=======
if (!areSameExtensions(e, extension.identifier)) {
>>>>>>>
if (!areSameExtensions({ id: e.identifier.value }, extension.identifier)) { |
<<<<<<<
import { WorkbenchTree } from 'vs/platform/list/browser/listService';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
=======
import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
import { IWorkbenchThemeService, IFileIconTheme } from 'vs/w... |
<<<<<<<
// if (this.remote) {
// await this.code.waitForElement('.monaco-workbench .statusbar-item.statusbar-entry a[title="Editing on TestResolver"]');
// }
=======
if (this.remote) {
await this.code.waitForElement('.monaco-workbench .statusbar-item[title="Editing on TestResolver"]');
}
>>>>>>>
// i... |
<<<<<<<
import { NotebookEditorOptions } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget';
import { EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor';
import { INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
import { NotebookRegistry } from 'vs/workbenc... |
<<<<<<<
import { Controller, Delete, Get, Patch, Post, Put, Response, Route, Security, SuccessResponse, Tags } from '@tsoa/runtime';
=======
import { Controller, Extension, Delete, Get, Patch, Post, Put, Response, Route, Security, SuccessResponse, Tags } from '../../../src';
>>>>>>>
import { Controller, Extension, D... |
<<<<<<<
=======
basename: string;
size?: number;
/**
* This path is transformed for search purposes. For example, this could be
* the `relativePath` with the workspace folder name prepended. This way the
* search algorithm would also match against the name of the containing folder.
*
* If not given, the ... |
<<<<<<<
class BaseDeleteFileAction extends BaseErrorReportingAction {
=======
/* Create New File/Folder (only used internally by explorerViewer) */
export abstract class BaseCreateAction extends BaseRenameAction {
public validateFileName(parent: ExplorerItem, name: string): string {
if (this.element instanceof Ne... |
<<<<<<<
import { ILocalTerminalService, IOffProcessTerminalService, IShellLaunchConfig, ITerminalLaunchError, ITerminalProfile, ITerminalsLayoutInfo, ITerminalsLayoutInfoById, TerminalShellType, WindowsShellType } from 'vs/platform/terminal/common/terminal';
=======
import { ILocalTerminalService, IOffProcessTerminal... |
<<<<<<<
return this.backupFileService.hasBackup(this.resource).then(backupExists => {
let resolveBackupPromise: TPromise<string | IRawText>;
=======
return this.backupFileService.loadBackupResource(this.resource).then(backupResource => {
let resolveBackupPromise: TPromise<IRawText>;
>>>>>>>
ret... |
<<<<<<<
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... |
<<<<<<<
import { IBackupService } from 'vs/code/electron-main/backup';
=======
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
>>>>>>>
import { IBackupService } from 'vs/code/electron-main/backup';
import { IEnvironmentService } from 'vs/platform/environment/common/environment'; |
<<<<<<<
const input = this.instantiationService.createInstance(UntitledEditorInput, resource, hasAssociatedFilePath, modeId, restoreResource);
const contentListener = input.onDidModelChangeContent(() => {
this._onDidChangeContent.fire(resource);
});
=======
const input = this.instantiationService.createIn... |
<<<<<<<
=======
getExtensionsActivationTimes() {
return undefined;
}
getExtensionHostInformation(): IExtensionHostInformation {
return undefined;
}
>>>>>>>
getExtensionHostInformation(): IExtensionHostInformation {
return undefined;
} |
<<<<<<<
import { Body, BodyProp, Get, Header, Path, Post, Query, Request, Route } from '@tsoa/runtime';
=======
import { Body, BodyProp, Get, Header, Path, Post, Query, Request, Route, Res, TsoaResponse } from '../../../src';
>>>>>>>
import { Body, BodyProp, Get, Header, Path, Post, Query, Request, Route, Res, TsoaR... |
<<<<<<<
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 { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
=======
import { INavigatorWithKeyboard } from 'vs/workbench/services/keybinding/common/navigatorKeyboard';
>>>>>>>
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { INavigat... |
<<<<<<<
const navigator: ITreeNavigator<any> = viewer.navigate(element);
if (element instanceof BaseFolderMatch) {
while (!!navigator.next() && !(navigator.current() instanceof BaseFolderMatch)) { }
=======
const navigator: INavigator<any> = viewer.navigate(element);
if (element instanceof FolderMatch) {
... |
<<<<<<<
import { EventType, addDisposableListener, addClass, getClientArea, getDomNodePagePosition } from 'vs/base/browser/dom';
=======
import { EventType, addDisposableListener, addClass } from 'vs/base/browser/dom';
>>>>>>>
import { EventType, addDisposableListener, addClass, getDomNodePagePosition } from 'vs/bas... |
<<<<<<<
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
=======
import { MarkdownRenderer } from 'vs/editor/contrib/markdown/browser/markdownRenderer';
>>>>>>>
import { MarkdownRenderer } from 'vs/editor/contrib/markdown/browser/markdownRenderer';
import { ITelemetryService } from 'vs/pla... |
<<<<<<<
import { ILinkComputerTarget, LinkComputer } from 'vs/editor/common/modes/linkComputer';
import { IRange } from 'vs/editor/common/core/range';
=======
import { Emitter, Event } from 'vs/base/common/event';
import { ILogService } from 'vs/platform/log/common/log';
>>>>>>>
import { ILinkComputerTarget, LinkCom... |
<<<<<<<
import { INotebookEditorContribution, notebooksExtensionPoint, notebookRendererExtensionPoint, notebooksExtensionPoint2 } from 'vs/workbench/contrib/notebook/browser/extensionPoint';
import { NotebookEditorOptions, updateEditorTopPadding } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
=======
... |
<<<<<<<
this.timeout(1000 * 10); // higher timeout for this test
=======
if (process.env['VSCODE_PID']) {
return done(); // TODO@Ben find out why test fails when run from within VS Code
}
>>>>>>>
this.timeout(1000 * 10); // higher timeout for this test
if (process.env['VSCODE_PID']) {
return done();... |
<<<<<<<
if (!isMacintosh && this.getCustomTitleBarStyle()) {
this.windowService.isMaximized().then((max) => {
console.log(this);
this.workbenchLayout.onMaximizeChange(max);
this.workbenchLayout.layout();
});
this.windowService.onDidChangeMaximize(this.workbenchLayout.onMaximizeChange, this.workb... |
<<<<<<<
=======
import { Position } from 'vs/platform/editor/common/editor';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
>>>>>>>
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; |
<<<<<<<
const onThisWindowMaximize = mapEvent(filterEvent(windowsService.onWindowMaximize, id => id === windowId), _ => true);
const onThisWindowUnmaximize = mapEvent(filterEvent(windowsService.onWindowUnmaximize, id => id === windowId), _ => false);
this.onDidChangeFocus = any(onThisWindowFocus, onThisWindowBlur... |
<<<<<<<
private readonly _activateCallback: (event: MouseEvent, uri: string) => void;
private readonly _tooltipCallback: (event: MouseEvent, uri: string, location: IViewportRange) => boolean | void;
=======
private readonly _tooltipCallback: (event: MouseEvent, uri: string, location: IViewportRange, linkHandler: (... |
<<<<<<<
public $acceptActiveTerminalChanged(id: number | null): void {
=======
public async resolveTerminalRenderer(id: number): Promise<vscode.TerminalRenderer> {
// Check to see if the extension host already knows about this terminal.
for (const terminalRenderer of this._terminalRenderers) {
if (terminalRe... |
<<<<<<<
import { Codicon } from 'vs/base/common/codicons';
=======
import { isString } from 'vs/base/common/types';
>>>>>>>
import { Codicon } from 'vs/base/common/codicons';
import { isString } from 'vs/base/common/types'; |
<<<<<<<
import { SIDE_BAR_DRAG_AND_DROP_BACKGROUND, SIDE_BAR_SECTION_HEADER_FOREGROUND, SIDE_BAR_SECTION_HEADER_BACKGROUND, SIDE_BAR_SECTION_HEADER_BORDER } from 'vs/workbench/common/theme';
import { append, $, trackFocus, toggleClass, EventType, isAncestor, Dimension, addDisposableListener, addClass, removeClass } fro... |
<<<<<<<
import {
compareFileNames,
compareFileExtensions,
compareFileNamesDefault,
compareFileExtensionsDefault,
compareFileNamesUpper,
compareFileExtensionsUpper,
compareFileNamesLower,
compareFileExtensionsLower,
compareFileNamesUnicode,
compareFileExtensionsUnicode,
} from 'vs/base/common/comparers';
====... |
<<<<<<<
await this.exec(args, options);
=======
await this.run(args, {
cancellationToken: options.cancellationToken,
env: { 'GIT_HTTP_USER_AGENT': this.git.userAgent }
});
>>>>>>>
await this.exec(args, {
cancellationToken: options.cancellationToken,
env: { 'GIT_HTTP_USER_AGENT': this.git.... |
<<<<<<<
const activeContrastBorderColor = theme.getColor(activeContrastBorder);
if (activeContrastBorderColor) {
collector.addRule(`
.monaco-workbench .search-view .findInFileMatch { border: 1px dashed ${activeContrastBorderColor}; }
`);
=======
const findMatchHighlightBorder = theme.getColor(editorFindMatc... |
<<<<<<<
return Promise.resolve(null);
=======
this.tree.refresh(stat, false).then(() => {
this.tree.setHighlight(stat);
const unbind = this.tree.onDidChangeHighlight((e: IHighlightEvent) => {
if (!e.highlight) {
viewletState.clearEditable(stat);
this.tree.refresh(stat);
unbind.dispose();... |
<<<<<<<
export class CreateNewTerminalAction extends Action {
public static readonly ID = TERMINAL_COMMAND_ID.NEW;
public static readonly LABEL = localize('workbench.action.terminal.new', "Create New Integrated Terminal");
public static readonly SHORT_LABEL = localize('workbench.action.terminal.new.short', "New Te... |
<<<<<<<
stickiness?: TrackedRangeStickiness;
backgroundColor?: string;
=======
backgroundColor?: string | ThemeColor;
>>>>>>>
stickiness?: TrackedRangeStickiness;
backgroundColor?: string | ThemeColor; |
<<<<<<<
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... |
<<<<<<<
const recentFilesPickerContext = ContextKeyExpr.and(inQuickOpenContext, ContextKeyExpr.has(inRecentFilesPickerContextKey));
const quickOpenNavigateNextInRecentFilesPickerId = 'workbench.action.quickOpenNavigateNextInRecentFilesPicker';
KeybindingsRegistry.registerCommandAndKeybindingRule({
id: quickO... |
<<<<<<<
readonly onWindowOpen: Event<number> = fromNodeEventEmitter(app, 'browser-window-created', (_, w: Electron.BrowserWindow) => w.id);
readonly onWindowFocus: Event<number> = fromNodeEventEmitter(app, 'browser-window-focus', (_, w: Electron.BrowserWindow) => w.id);
readonly onWindowBlur: Event<number> = fromNod... |
<<<<<<<
import { Codicon, CSSIcon, registerIcon } from 'vs/base/common/codicons';
=======
import { Codicon, registerCodicon } from 'vs/base/common/codicons';
>>>>>>>
import { Codicon, CSSIcon, registerCodicon } from 'vs/base/common/codicons'; |
<<<<<<<
// #region Sandy - User data synchronization
export namespace window {
export function registerUserDataProvider(name: string, userDataProvider: UserDataProvider): Disposable;
}
export class UserDataError extends Error {
static VersionExists(): FileSystemError;
/**
* Creates a new userData er... |
<<<<<<<
registerNotebookKernelProvider(extension: IExtensionDescription, selector: vscode.NotebookDocumentFilter, provider: vscode.NotebookKernelProvider) {
const handle = ExtHostNotebookController._notebookKernelProviderHandlePool++;
const adapter = new ExtHostNotebookKernelProviderAdapter(this._notebookProxy, ha... |
<<<<<<<
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... |
<<<<<<<
import { CancellationToken, Progress, Uri, workspace } from 'vscode';
import { URI } from 'vscode-uri';
=======
import { CancellationToken, Progress, Uri } from 'vscode';
>>>>>>>
import { CancellationToken, Progress, Uri, workspace } from 'vscode'; |
<<<<<<<
/**
* This is a convenience type so you can check .properties on the items in the Record without having TypeScript throw a compiler error. That's because this Record can't have enums in it. If you want that, then just use the base interface
*/
export interface RefObjectModels extends TsoaRoute.Models ... |
<<<<<<<
import {IConfigurationService, getConfigurationValue, IConfigurationValue} from 'vs/platform/configuration/common/configuration';
import {IStorageService, StorageScope} from 'vs/platform/storage/common/storage';
import {IBackupService} from 'vs/platform/backup/common/backup';
import {IQuickOpenService} from 'vs... |
<<<<<<<
// Spawn shared process after a while
const sharedProcessSpawn = this._register(new RunOnceScheduler(() => this.sharedProcess.spawn(), 3000));
sharedProcessSpawn.schedule();
=======
// Start shared process after a while
const sharedProcess = new RunOnceScheduler(() => getShellEnvironment().then(user... |
<<<<<<<
import { CellDiffSideBySideRenderTemplate, CellDiffSingleSideRenderTemplate, CellDiffViewModelLayoutChangeEvent, DIFF_CELL_MARGIN, INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/common';
import { EDITOR_BOTTOM_PADDING, EDITOR_TOP_PADDING } from 'vs/workbench/contrib/notebook/browser/... |
<<<<<<<
import { ExtHostComments } from './extHostComments';
=======
import { ExtHostSearch } from './extHostSearch';
import { ExtHostUrls } from './extHostUrls';
>>>>>>>
import { ExtHostComments } from './extHostComments';
import { ExtHostSearch } from './extHostSearch';
import { ExtHostUrls } from './extHostUrls';... |
<<<<<<<
import { ICommentService, CommentService } from 'vs/workbench/services/comments/electron-browser/commentService';
=======
import { IEditorService, IResourceEditor } from 'vs/workbench/services/editor/common/editorService';
import { IEditorGroupsService, GroupDirection, preferredSideBySideGroupDirection, Group... |
<<<<<<<
templateId: string;
row: IRow | null;
=======
hasDynamicHeight: boolean;
dynamicSizeSnapshotId: number;
row: IRow;
>>>>>>>
hasDynamicHeight: boolean;
dynamicSizeSnapshotId: number;
<<<<<<<
this.setRowLineHeight = getOrDefault2(options, o => o.setRowLineHeight, DefaultOptions.setRowLineHeight);
===... |
<<<<<<<
},
'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': {
... |
<<<<<<<
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... |
<<<<<<<
function createProxyAgent(
extHostWorkspace: ExtHostWorkspaceProvider,
=======
function createProxyAgents(
extHostWorkspace: ExtHostWorkspace,
>>>>>>>
function createProxyAgents(
extHostWorkspace: ExtHostWorkspaceProvider, |
<<<<<<<
/**
* Class used to execute an extension callback as a task.
*/
export class ExtensionCallbackExecution {
/**
* @param callback The callback that will be called when the extension callback task is executed.
*/
constructor(callback: (terminalRenderer: TerminalRenderer, cancellationToken: Cancella... |
<<<<<<<
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, ... |
<<<<<<<
windowOpen(paths: string[], forceNewWindow?: boolean): TPromise<void> {
=======
toggleMenuBar(windowId: number): TPromise<void> {
this.windowsMainService.toggleMenuBar(windowId);
return TPromise.as(null);
}
openWindow(paths: string[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean }... |
<<<<<<<
export const EDITOR_TOOLBAR_HEIGHT = 22;
export const RUN_BUTTON_WIDTH = 20;
=======
export const EDITOR_TOOLBAR_HEIGHT = 22;
// Context Keys
export const NOTEBOOK_CELL_TYPE_CONTEXT_KEY = 'notebookCellType';
>>>>>>>
export const EDITOR_TOOLBAR_HEIGHT = 22;
export const RUN_BUTTON_WIDTH = 20;
// Context Key... |
<<<<<<<
workspaces: (IWorkspaceIdentifier | string | UriComponents)[];
files: (string | UriComponents)[];
=======
workspaces2: (IWorkspaceIdentifier | string)[]; // IWorkspaceIdentifier or URI.toString()
files: string[];
>>>>>>>
workspaces2: (IWorkspaceIdentifier | string)[]; // IWorkspaceIdentifier or URI.toSt... |
<<<<<<<
import { window, Pseudoterminal, EventEmitter, TerminalDimensions, workspace, ConfigurationTarget } from 'vscode';
import { doesNotThrow, equal, ok } from 'assert';
=======
import { window, Terminal, Pseudoterminal, EventEmitter, TerminalDimensions, workspace, ConfigurationTarget } from 'vscode';
import { doe... |
<<<<<<<
* 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... |
<<<<<<<
return await localTerminalService.createProcess(shellLaunchConfig, initialCwd, cols, rows, env, useConpty, shouldPersist);
}
private _setupPtyHostListeners(offProcessTerminalService: IOffProcessTerminalService) {
this._register(offProcessTerminalService.onPtyHostUnresponsive(() => {
=======
// Mark t... |
<<<<<<<
import { renderMarkdown } from 'vs/base/browser/markdownRenderer';
=======
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
import { insane } from 'vs/base/common/insane/insane';
import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
import { Delegate } from ... |
<<<<<<<
const extHostSearch = rpcProtocol.set(ExtHostContext.ExtHostSearch, new ExtHostSearch(rpcProtocol, schemeTransformer, extHostLogService, extHostConfiguration));
const extHostTask = rpcProtocol.set(ExtHostContext.ExtHostTask, new ExtHostTask(rpcProtocol, extHostWorkspace, extHostDocumentsAndEditors, extHostCon... |
<<<<<<<
import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
import { IViewDescriptorRef, PersistentContributableViewsModel, IAddedViewDescriptorRef } from 'vs/workbench/browser/parts/views/views';
import { IViewDescriptor, IViewsViewlet, IView } from 'vs/workbench/common/views'... |
<<<<<<<
import { Uri, Command, EventEmitter, Event, scm, SourceControl, SourceControlInputBox, SourceControlResourceGroup, SourceControlResourceState, SourceControlResourceDecorations, Disposable, ProgressLocation, window, workspace, WorkspaceEdit, ThemeColor, DecorationData, Memento } from 'vscode';
import { Repositor... |
<<<<<<<
import { ICommandService } from 'vs/platform/commands/common/commands';
=======
import { ILogService } from 'vs/platform/log/common/log';
>>>>>>>
import { ICommandService } from 'vs/platform/commands/common/commands';
import { ILogService } from 'vs/platform/log/common/log';
<<<<<<<
@IStorageService priva... |
<<<<<<<
import { Git, Repository, Ref, Branch, Remote, Commit, GitErrorCodes } from './git';
import { anyEvent, eventToPromise, filterEvent, EmptyDisposable, combinedDisposable, dispose, find } from './util';
=======
import { Git, Repository, Ref, Branch, Remote, Commit, GitErrorCodes, Stash } from './git';
import { ... |
<<<<<<<
import { CommentRule } from 'vs/editor/common/modes/languageConfiguration';
import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
var mockConfigService = ne... |
<<<<<<<
//#region Deprecated support
export interface CompletionItem {
/**
* Indicates if this item is deprecated.
*/
deprecated?: boolean;
}
export enum DiagnosticTag {
/**
* Deprecated or obsolete code.
*
* Diagnostics with this tag are rendered with a strike through.
*/
Deprecated = 2... |
<<<<<<<
import {IgnoreFiltersPage} from "./pages/IgnoreFiltersPage";
=======
import {AnnouncementPreviewPage} from "./pages/AnnouncementPreviewPage";
>>>>>>>
import {IgnoreFiltersPage} from "./pages/IgnoreFiltersPage";
import {AnnouncementPreviewPage} from "./pages/AnnouncementPreviewPage";
<<<<<<<
navigateToIgno... |
<<<<<<<
private async handleExternalDrop(data: DesktopDragAndDropData, target: ExplorerItem, originalEvent: DragEvent): Promise<void> {
if (isWeb) {
data.files.forEach(file => {
const reader = new FileReader();
reader.readAsArrayBuffer(file);
reader.onload = async (event) => {
const name = file.n... |
<<<<<<<
import { IPCClient } from 'vs/base/parts/ipc/common/ipc';
import { registerWindowDriver } from 'vs/platform/driver/electron-browser/driver';
=======
import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
import { PreferencesService } from 'vs/workbench/services/preferences... |
<<<<<<<
const keybinding = firstPart ? chordPart ? new ChordKeybinding([aSimpleKeybinding(firstPart), aSimpleKeybinding(chordPart)]) : aSimpleKeybinding(firstPart) : null;
return new ResolvedKeybindingItem(keybinding ? new USLayoutResolvedKeybinding(keybinding, OS) : null, command || 'some command', null, when ? Co... |
<<<<<<<
terminal: {
external: {
linuxExec: string,
windowsExec: string
}
=======
externalTerminal: {
linuxExec: string,
macExec: string,
windowsExec: string
>>>>>>>
terminal: {
external: {
linuxExec: string,
macExec: string,
windowsExec: string
} |
<<<<<<<
doNotUseTrash?: boolean;
=======
maxSize?: number;
>>>>>>>
doNotUseTrash?: boolean;
maxSize?: number; |
<<<<<<<
import { DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
=======
import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
>>>>>>>
import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
<<<<<<<
this._cellStateListeners ... |
<<<<<<<
import { ITreeNode, ITreeFilter, TreeVisibility, TreeFilterResult, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree';
=======
import { ITreeRenderer, ITreeNode, ITreeFilter, TreeVisibility, TreeFilterResult, ITreeElement } from 'vs/base/browser/ui/tree/tree';
>>>>>>>
import { ITreeNode, ITreeFilter, Tre... |
<<<<<<<
import { addDisposableListener, EventType } from 'vs/base/browser/dom';
=======
import { IEditorService, IResourceEditor } from 'vs/workbench/services/editor/common/editorService';
import { pathsToEditors } from 'vs/workbench/common/editor';
import { IFileService } from 'vs/platform/files/common/files';
impor... |
<<<<<<<
import { Uri, commands, scm, Disposable, window, workspace, QuickPickItem, OutputChannel, Range, WorkspaceEdit, Position, LineChange, SourceControlResourceState, TextDocumentShowOptions, ViewColumn } from 'vscode';
import { Ref, RefType, Git, GitErrorCodes, Branch } from './git';
=======
import { Uri, command... |
<<<<<<<
<location filename="../__main__.py" line="472"/>
=======
<location filename="__main__.py" line="468"/>
>>>>>>>
<location filename="../__main__.py" line="337"/>
<source>Frequency hops: {} | Sweep time: {:.2f} s | FPS: {:.2f}</source>
<translation type="unfinished"></tra... |
<<<<<<<
widget.console.inject(
args['code'] as string,
args['metadata'] as JSONObject
);
=======
void widget.console.inject(args['code'] as string);
>>>>>>>
void widget.console.inject(
args['code'] as string,
args['metadata'] as ... |
<<<<<<<
this._currentChanged.emit(variable);
const newScope = this.scopes.map(scope => {
const findIndex = scope.variables.findIndex(
ele => ele.variablesReference === variable.variablesReference
);
scope.variables[findIndex] = variable;
return { ...scope };
... |
<<<<<<<
await Promise.all([ipySession.initialize(), session.initialize()]);
await Promise.all([ipySession.kernel!.ready, session.kernel!.ready]);
=======
>>>>>>>
<<<<<<<
await ipySession.kernel!.restart();
=======
await ipySessionContext.session.kernel.restart();
>>>>>>>
await... |
<<<<<<<
args: panel => ({
path: panel.console.sessionContext.session?.path,
name: panel.console.sessionContext.session?.name,
=======
args: widget => ({
path: widget.content.console.session.path,
name: widget.content.console.session.name,
>>>>>>>
args: widget => ({
path: wid... |
<<<<<<<
this.toggleClass('jp-mod-light', theme === 'light');
=======
>>>>>>>
<<<<<<<
=======
void value.ready.then(() => {
if (this.isDisposed || value !== this._session) {
return;
}
value.messageReceived.connect(this._onMessage, this);
this.title.label = `Terminal ${value.... |
<<<<<<<
sanitizer: ISanitizer,
needNumbering = true,
=======
sanitizer: ISanitizer
>>>>>>>
sanitizer: ISanitizer,
needNumbering = true,
<<<<<<<
let numberingDict: { [level: number]: number } = { };
each(panel.notebook.widgets, cell => {
=======
each(panel.content.widgets, cell => {
>>... |
<<<<<<<
import { mergeTypeDefs } from '@graphql-tools/merge'
=======
import { GraphQLSchema, GraphQLFieldMap } from 'graphql'
>>>>>>>
import { mergeTypeDefs } from '@graphql-tools/merge'
import { GraphQLSchema, GraphQLFieldMap } from 'graphql' |
<<<<<<<
editor.setGutterMarker(
lineNumber,
'breakpoints',
isRemoveGutter ? null : Private.createMarkerNode()
);
setTimeout(this.setHover);
=======
>>>>>>>
<<<<<<<
export function createHoverNode() {
let hoverGutterElement = document.createElement('div');
hoverGutterElement.... |
<<<<<<<
private _session: IDebugger.ISession | null;
private _sessionChanged = new Signal<this, void>(this);
private _service = new DebugService(null, this);
private _currentLineChanged = new Signal<this, number>(this);
=======
>>>>>>>
private _currentLineChanged = new Signal<this, number>(this); |
<<<<<<<
if (args['isLauncher'] && args['kernelName'] && services.specs) {
return services.specs.kernelspecs[kernelName].display_name;
=======
if (args['isLauncher'] && args['kernelName']) {
return services.kernelspecs.specs.kernelspecs[kernelName].display_name;
>>>>>>>
if (args['isL... |
<<<<<<<
map.set(source, breakpoints);
=======
map.set(
source,
breakpoints.map(point => ({ ...point, verified: true, active: true }))
);
>>>>>>>
map.set(
source,
breakpoints.map(point => ({ ...point, verified: true }))
); |
<<<<<<<
import { azureActiveDirectory } from './azureActiveDirectory'
=======
import { netlify } from './netlify'
import { supabase } from './supabase'
>>>>>>>
import { azureActiveDirectory } from './azureActiveDirectory'
import { netlify } from './netlify'
import { supabase } from './supabase' |
<<<<<<<
import { shapeFromPly } from 'mol-model/shape/formarts/ply/plyData_to_shape';
=======
import { PluginStateObject as SO, PluginStateTransform } from '../objects';
import { trajectoryFromGRO } from 'mol-model-formats/structure/gro';
import { parseGRO } from 'mol-io/reader/gro/parser';
import { parseMolScript } ... |
<<<<<<<
import { Color } from '../../mol-util/color';
=======
import { CustomPropertyDescriptor } from '../../mol-model/custom-property';
>>>>>>>
import { Color } from '../../mol-util/color';
import { CustomPropertyDescriptor } from '../../mol-model/custom-property'; |
<<<<<<<
import { PrismaClient } from '@prisma/client'
=======
/* eslint-disable @typescript-eslint/ban-ts-comment */
import type { GlobalContext } from 'src/globalContext'
const { prismaVersion } = require('@prisma/client')
import gql from 'graphql-tag'
>>>>>>>
/* eslint-disable @typescript-eslint/ban-ts-comment */
... |
<<<<<<<
if (this.wboit?.supported) {
=======
ValueCell.update(this.copyFboTarget.values.uTexSize, Vec2.set(this.copyFboTarget.values.uTexSize.ref.value, width, height));
ValueCell.update(this.copyFboPostprocessing.values.uTexSize, Vec2.set(this.copyFboPostprocessing.values.uTexSize... |
<<<<<<<
const residues = [start as Element], chains = [start as Element];
=======
const residues = [start as ElementIndex], chains = [start as ElementIndex], polymers = [start as ElementIndex];
>>>>>>>
const residues = [start as ElementIndex], chains = [start as ElementIndex];
<<<<<<<
if (newRes... |
<<<<<<<
import { Transformer } from 'mol-state';
import { readFromFile } from 'mol-util/data-source';
import * as PLY from 'mol-io/reader/ply/parse_data/ply_parser'
=======
import { StateTransformer } from 'mol-state';
import { readFromFile, ajaxGetMany } from 'mol-util/data-source';
import * as CCP4 from 'mol-io/rea... |
<<<<<<<
import { GeneColorThemeProvider } from './color/gene';
=======
import { IllustrativeColorThemeProvider } from './color/illustrative';
import { HydrophobicityColorThemeProvider } from './color/hydrophobicity';
>>>>>>>
import { GeneColorThemeProvider } from './color/gene';
import { IllustrativeColorThemeProvid... |
<<<<<<<
export function isLocation(x: any): x is StructureElement {
return !!x && x.kind === 'element-location';
}
=======
export function residueIndex(e: StructureElement) {
if (Unit.isAtomic(e.unit)) {
return e.unit.residueIndex[e.element];
} else {
// T... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.