conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
export const EMPTY_OBJECT = {}
Object.freeze(EMPTY_OBJECT)
declare var window: any
=======
declare var window, global, Symbol
>>>>>>>
export const EMPTY_OBJECT = {}
Object.freeze(EMPTY_OBJECT)
declare var window: any
<<<<<<<
import { isObservableMap, ObservableMap, IKeyValueMap } from "../types/observa... |
<<<<<<<
import { fail, isPlainObject, isES6Map, deepEqual } from "../utils/utils"
=======
import { fail, isPlainObject, invariant, isES6Map } from "../utils/utils"
>>>>>>>
import { fail, isPlainObject, isES6Map } from "../utils/utils" |
<<<<<<<
/**
* Warn if computed values are accessed outside a reactive context
*/
warnOnUnsafeComputationReads = false
=======
/**
* Don't catch and rethrow exceptions. This is useful for inspecting the state of
* the stack when an exception occurs while debugging.
*/
disable... |
<<<<<<<
import Interactive from '../../elements/interactive.js';
import { getScriptName } from '../../util/file.js';
import DependencyGraph from "../../model/dependency-graph.js"
=======
import {Interactive, getScriptName} from '../../index.js';
>>>>>>>
import {Interactive, getScriptName} from '../../index.js';
impo... |
<<<<<<<
isComputing: boolean = false; // to check for cycles
=======
setter: (value: T) => void;
>>>>>>>
isComputing: boolean = false; // to check for cycles
setter: (value: T) => void; |
<<<<<<<
export class Atom implements IAtom {
isPendingUnobservation: boolean; // for effective unobserving
isObserved = false;
observers = new DerivationsSets();
=======
export class BaseAtom implements IAtom {
isDirty = false;
staleObservers = [];
observers = new SimpleSet<IDerivation>();
>>>>>>>
export clas... |
<<<<<<<
})
test("505, don't throw when accessing subclass fields in super constructor (typescript)", t => {
const values: any = { }
class A {
@observable a = 1
constructor() {
values.b = (this as any)['b']
values.a = this.a
}
}
class B extends A {
@observable b = 2
}
new B()
t.deepEqual(values, ... |
<<<<<<<
// TODO: kill these shallow and other deprecated stuff
shallowBox<T>(value?: T, name?: string): IObservableValue<T> {
=======
shallowBox<T = any>(value?: T, name?: string): IObservableValue<T> {
>>>>>>>
// TODO: kill these shallow and other deprecated stuff
shallowBox<T = any>(value?: T, ... |
<<<<<<<
tokensMetadata(symbols: string[]): TokenMetadata[] | Promise<TokenMetadata[]>;
tokenTransfersByContractAddress(contractAddress: string, limit?: number, page?: number): TransferPage | Promise<TransferPage>;
tokenTransfersByContractAddressForHolder(contractAddress: string, holderAddress: string, filte... |
<<<<<<<
import PageDetailsToken from '@app/modules/tokens/pages/PageDetailsToken.vue'
=======
import PageKnowledgeBase from '@app/modules/other/pages/PageKnowledgeBase.vue'
import PagePrivacyPolicy from '@app/modules/other/pages/PagePrivacyPolicy.vue'
>>>>>>>
import PageDetailsToken from '@app/modules/tokens/pages/P... |
<<<<<<<
import { BlocksServiceImpl, MockBlockRepository } from '@app/server/modules/blocks'
import { ChartsServiceImpl, MockChartsRepository } from '@app/server/modules/charts'
import { MockExchangeServiceImpl } from '@app/server/modules/exchanges'
import { MockTxsRepository, TxsServiceImpl } from '@app/server/modules/... |
<<<<<<<
let projectRoot: string, sumanConfig, main: string,
usingRunner: boolean, testDebugLogPath: string, sumanPaths: Array<string>,
sumanObj: Object, integrantPreFn: Function;
=======
let projectRoot: string, sumanConfig, main: string,
usingRunner: boolean, testDebugLogPath: string, sumanPaths: Array<strin... |
<<<<<<<
const API_VERSION = 28;
=======
const API_VERSION = 22;
>>>>>>>
const API_VERSION = 28;
<<<<<<<
=======
if (msg.name != "setPluginMenuData") console.log("onWebMessage, msg: ", msg.name, msg.args);
>>>>>>>
<<<<<<<
postMessage: function(name, args, transferList): void {
console.log("postMess... |
<<<<<<<
=======
export { ElMessage } from './message'
export { ElAvatar } from './avatar'
>>>>>>>
export { ElAvatar } from './avatar'
<<<<<<<
/** Avatar Component */
export class Avatar extends ElAvatar {}
=======
>>>>>>> |
<<<<<<<
// eslint-disable-next-line no-unused-vars
import { Middleware, MiddlewareAPI } from 'redux';
=======
import { compose, Middleware, MiddlewareAPI } from 'redux';
import partial from 'lodash/fp/partial';
import partialRight from 'lodash/fp/partialRight';
>>>>>>>
import { Middleware, MiddlewareAPI } from 'redu... |
<<<<<<<
import { Apollo } from 'apollo-angular';
=======
>>>>>>> |
<<<<<<<
import { IdeaPageComponent } from './components/idea/idea-page/idea-page.component';
import { IdeaCardComponent } from './components/idea/idea-card/idea-card.component';
import { IdeaModalComponent } from './components/idea/idea-modal/idea-modal.component';
=======
import { ErrorHandlerComponent } from './co... |
<<<<<<<
},
{
path: 'login',
component: LoginComponent
=======
},
{
path: 'board/login',
component: BoardLoginComponent
},
{
path: 'board/dashboard',
canActivate: [BoardAuthGuard],
component: BoardDashboardComponent
>>>>>>>
},
{
path: 'login',
component: LoginCompon... |
<<<<<<<
if (owner &&
this.traitCollection.hasDifferentColorAppearanceComparedToTraitCollection &&
this.traitCollection.hasDifferentColorAppearanceComparedToTraitCollection(previousTraitCollection)) {
owner.notify({ eventName: iosView.traitCollectionColorAppear... |
<<<<<<<
// << article-push-to-observablearray
TKUnit.wait(ASYNC);
=======
// ```
// </snippet>
TKUnit.waitUntilReady(() => repeater.isLayoutValid);
>>>>>>>
// << article-push-to-observablearray
TKUnit.wait(ASYNC);
TKUnit.waitUntilReady(() => repeater.is... |
<<<<<<<
import { ref, watch, computed } from 'vue'
=======
import { ref, watch, computed, reactive, Ref } from '@vue/composition-api'
>>>>>>>
import { ref, watch, computed, reactive, Ref } from 'vue'
<<<<<<<
buildState: () => S,
getters: G = {} as G
// methods: Record<string | symbol, StoreMethod>
): Combined... |
<<<<<<<
=======
private map: Map & IMapboxInstance;
private $mapContainer: HTMLElement | null;
private $link: HTMLLinkElement;
>>>>>>>
<<<<<<<
private markerContainer: HTMLElement;
=======
>>>>>>>
private markerContainer: HTMLElement;
<<<<<<<
// init
public addMarkerContainer(): void {
co... |
<<<<<<<
IIconService: Symbol.for('IIconService'),
=======
IInteractionService: Symbol.for('IInteractionService'),
>>>>>>>
IIconService: Symbol.for('IIconService'),
IInteractionService: Symbol.for('IInteractionService'), |
<<<<<<<
IconService,
IControl,
IControlService,
=======
>>>>>>>
IControl,
IControlService,
<<<<<<<
import { inject, injectable } from 'inversify';
import { Map } from 'mapbox-gl';
=======
>>>>>>>
import { inject, injectable } from 'inversify';
import { Map } from 'mapbox-gl';
<<<<<<<
public map: AMa... |
<<<<<<<
=======
private map: Map & IMapboxInstance;
private $mapContainer: HTMLElement | null;
private $link: HTMLLinkElement;
>>>>>>>
<<<<<<<
private markerContainer: HTMLElement;
=======
>>>>>>>
private markerContainer: HTMLElement;
<<<<<<<
// init
public addMarkerContainer(): void {
co... |
<<<<<<<
import {
IScale,
IScaleOptions,
ISourceCFG,
ScaleAttributeType,
} from '@antv/l7';
=======
import { IActiveOption, IScale, IScaleOptions, ISourceCFG } from '@antv/l7';
import Active from './Active';
>>>>>>>
import { IActiveOption, IScale, IScaleOptions, ISourceCFG } from '@antv/l7';
import Active fro... |
<<<<<<<
export * from './services/asset/IFontService';
export * from './services/component/IControlService';
export * from './services/component/IMarkerService';
export * from './services/component/IPopUpService';
=======
export * from './services/log/ILogService';
>>>>>>>
export * from './services/asset/IFontServic... |
<<<<<<<
// init map
addMarkerContainer(): void;
getMarkerContainer(): HTMLElement;
// MapEvent // 定义事件类型
on(type: string, hander: (...args: any[]) => void): void;
off(type: string, hander: (...args: any[]) => void): void;
// get dom
getContainer(): HTMLElement | null;
getSize(): [number, number];
/... |
<<<<<<<
IconService,
IControl,
IControlService,
=======
>>>>>>>
IControl,
IControlService,
<<<<<<<
import { inject, injectable } from 'inversify';
import { Map } from 'mapbox-gl';
=======
>>>>>>>
import { inject, injectable } from 'inversify';
import { Map } from 'mapbox-gl';
<<<<<<<
public map: AMa... |
<<<<<<<
IconService,
IControl,
IControlService,
=======
>>>>>>>
IControl,
IControlService,
<<<<<<<
import { inject, injectable } from 'inversify';
import { Map } from 'mapbox-gl';
=======
>>>>>>>
import { inject, injectable } from 'inversify';
import { Map } from 'mapbox-gl';
<<<<<<<
public map: AMa... |
<<<<<<<
IFontService,
=======
IEncodeFeature,
>>>>>>>
IEncodeFeature,
IFontService,
<<<<<<<
ILayerStyleAttribute,
ILayerStyleOptions,
IMapService,
=======
>>>>>>>
IMapService,
<<<<<<<
public styleOption: ILayerStyleOptions = {
opacity: 1.0,
};
// 样式属性
public styleAttributes: {
[k... |
<<<<<<<
IFontService,
=======
IEncodeFeature,
>>>>>>>
IEncodeFeature,
IFontService,
<<<<<<<
ILayerStyleAttribute,
ILayerStyleOptions,
IMapService,
=======
>>>>>>>
IMapService,
<<<<<<<
public styleOption: ILayerStyleOptions = {
opacity: 1.0,
};
// 样式属性
public styleAttributes: {
[k... |
<<<<<<<
this.controlService.destroy();
this.removeAllListeners();
=======
this.rendererService.destroy();
this.map.destroy();
>>>>>>>
this.controlService.destroy();
this.removeAllListeners();
this.rendererService.destroy();
this.map.destroy(); |
<<<<<<<
IControlService: Symbol.for('IControlService'),
=======
IStyleAttributeService: Symbol.for('IStyleAttributeService'),
>>>>>>>
IControlService: Symbol.for('IControlService'),
IStyleAttributeService: Symbol.for('IStyleAttributeService'), |
<<<<<<<
IconService,
IControl,
IControlService,
=======
>>>>>>>
IControl,
IControlService,
<<<<<<<
import { inject, injectable } from 'inversify';
import { Map } from 'mapbox-gl';
=======
>>>>>>>
import { inject, injectable } from 'inversify';
import { Map } from 'mapbox-gl';
<<<<<<<
public map: AMa... |
<<<<<<<
this.controlService.destroy();
this.removeAllListeners();
=======
this.rendererService.destroy();
this.map.destroy();
>>>>>>>
this.controlService.destroy();
this.removeAllListeners();
this.rendererService.destroy();
this.map.destroy(); |
<<<<<<<
// init map
addMarkerContainer(): void;
getMarkerContainer(): HTMLElement;
// MapEvent // 定义事件类型
on(type: string, hander: (...args: any[]) => void): void;
off(type: string, hander: (...args: any[]) => void): void;
// get dom
getContainer(): HTMLElement | null;
getSize(): [number, number];
/... |
<<<<<<<
=======
private map: Map & IMapboxInstance;
private $mapContainer: HTMLElement | null;
private $link: HTMLLinkElement;
>>>>>>>
<<<<<<<
private markerContainer: HTMLElement;
=======
>>>>>>>
private markerContainer: HTMLElement;
<<<<<<<
// init
public addMarkerContainer(): void {
co... |
<<<<<<<
this.controlService.destroy();
this.removeAllListeners();
=======
this.rendererService.destroy();
this.map.destroy();
>>>>>>>
this.controlService.destroy();
this.removeAllListeners();
this.rendererService.destroy();
this.map.destroy(); |
<<<<<<<
// init map
addMarkerContainer(): void;
getMarkerContainer(): HTMLElement;
// MapEvent // 定义事件类型
on(type: string, hander: (...args: any[]) => void): void;
off(type: string, hander: (...args: any[]) => void): void;
// get dom
getContainer(): HTMLElement | null;
getSize(): [number, number];
/... |
<<<<<<<
this.controlService.destroy();
this.removeAllListeners();
=======
this.rendererService.destroy();
this.map.destroy();
>>>>>>>
this.controlService.destroy();
this.removeAllListeners();
this.rendererService.destroy();
this.map.destroy(); |
<<<<<<<
const docStyle = window.document.documentElement.style;
type ELType = HTMLElement | SVGElement;
export function createRendererContainer(
domId: string | HTMLDivElement,
): HTMLDivElement | null {
let $wrapper = domId as HTMLDivElement;
if (typeof domId === 'string') {
$wrapper = document.getElementByI... |
<<<<<<<
IFontService,
=======
IEncodeFeature,
>>>>>>>
IEncodeFeature,
IFontService,
<<<<<<<
ILayerStyleAttribute,
ILayerStyleOptions,
IMapService,
=======
>>>>>>>
IMapService,
<<<<<<<
public styleOption: ILayerStyleOptions = {
opacity: 1.0,
};
// 样式属性
public styleAttributes: {
[k... |
<<<<<<<
import { error, info, success, warn } from '@betterer/logger';
import * as Diff from 'diff';
import * as jsonpatch from 'fast-json-patch';
=======
import { error, header, info, success, warn } from '@betterer/logger';
>>>>>>>
import { error, header, info, success, warn } from '@betterer/logger';
import * as ... |
<<<<<<<
// Extract GraphQL no-nullable types
type GetRequiredFieldsType = ReadonlyArray<
IntrospectionInputValue | IntrospectionField
>
export const getRequiredFields = (fields: GetRequiredFieldsType) =>
map(
=======
type GetRequiredFieldsType = ReadonlyArray<IntrospectionInputValue | IntrospectionField>;
// Ext... |
<<<<<<<
player.on(player.exports.Event.SourceUnloaded, updateVideoQualities);
=======
player.on(player.exports.PlayerEvent.SourceUnloaded, updateVideoQualities);
// Update qualities when a new source is loaded
player.on(player.exports.PlayerEvent.SourceLoaded, updateVideoQualities);
>>>>>>>
playe... |
<<<<<<<
import { InternalUIConfig, UIInstanceManager } from '../uimanager';
=======
import {UIInstanceManager} from '../uimanager';
import { PlayerAPI } from 'bitmovin-player';
>>>>>>>
import { UIInstanceManager } from '../uimanager';
import { PlayerAPI } from 'bitmovin-player';
<<<<<<<
player.on(player.exports... |
<<<<<<<
player.addEventHandler(player.EVENT.ON_PLAY, (e) => {
this.isPlayInitiated = true;
playbackStateHandler(e);
});
player.addEventHandler(player.EVENT.ON_PAUSED, (e) => {
this.isPlayInitiated = false;
playbackStateHandler(e);
});
if (player.EVENT.ON_PLAYING) {
//... |
<<<<<<<
player.on(player.exports.Event.SourceUnloaded, updateAudioQualities);
=======
player.on(player.exports.PlayerEvent.SourceUnloaded, updateAudioQualities);
// Update qualities when a new source is loaded
player.on(player.exports.PlayerEvent.SourceLoaded, updateAudioQualities);
>>>>>>>
playe... |
<<<<<<<
import {SettingsToggleButton} from './components/settingstogglebutton';
import {SettingsPanel} from './components/settingspanel';
import {SubtitleSettingsLabel} from './components/subtitlesettings/subtitlesettingslabel';
import {VideoQualitySelectBox} from './components/videoqualityselectbox';
import {Watermark... |
<<<<<<<
import {UIManager, UIInstanceManager} from './uimanager';
import {Button} from './components/button';
import {ControlBar} from './components/controlbar';
import {FullscreenToggleButton} from './components/fullscreentogglebutton';
import {HugePlaybackToggleButton} from './components/hugeplaybacktogglebutton';
im... |
<<<<<<<
import {SettingsPanelPage} from './components/settingspanelpage';
import {SettingsPanelPageBackButton} from './components/settingspanelpagebackbutton';
import {SettingsPanelPageOpenButton} from './components/settingspanelpageopenbutton';
import {SubtitleSettingsPanelPage} from './components/subtitlesettings/sub... |
<<<<<<<
// of the ad playback by checking isAd() in ON_READY, because ON_READY always arrives when the source
// changes.
case player.exports.Event.Ready:
if (adStartedEvent && !player.ads.isLinearAdActive()) {
=======
// of the ad playback by checking isAd().
... |
<<<<<<<
websockets: websockets,
logger: logger,
=======
websockets: websockets,
>>>>>>>
websockets: websockets,
logger: logger,
<<<<<<<
websockets: websockets,
... |
<<<<<<<
as: 'নমস্কাৰ বিশ্ব',
=======
av: 'Ворчӏами дуниял',
>>>>>>>
as: 'নমস্কাৰ বিশ্ব',
av: 'Ворчӏами дуниял', |
<<<<<<<
ko: '여보세요 세계',
ln: 'Mbote Mokili',
=======
ja: 'こんにちは世界',
ko: '안녕 세상아',
>>>>>>>
ja: 'こんにちは世界',
ko: '안녕 세상아',
ln: 'Mbote Mokili', |
<<<<<<<
ja: 'こんにちは世界',
ko: '여보세요 세계',
=======
ko: '안녕 세상아',
>>>>>>>
ja: 'こんにちは世界',
ko: '안녕 세상아', |
<<<<<<<
tl: 'Kamusta Mundo',
=======
tr: 'Merhaba Dünya',
>>>>>>>
tl: 'Kamusta Mundo',
tr: 'Merhaba Dünya', |
<<<<<<<
ms: 'Hai Dunia',
=======
ml: 'ഹലോ വേൾഡ്',
mr: 'नमस्कार जग',
nd: 'Yebo Mhlaba',
ne: 'नमस्कार संसार',
>>>>>>>
ml: 'ഹലോ വേൾഡ്',
mr: 'नमस्कार जग',
ms: 'Hai Dunia',
nd: 'Yebo Mhlaba',
ne: 'नमस्कार संसार', |
<<<<<<<
const divider = document.createElement('div');
divider.className = 'mui-divider';
control.appendChild(divider);
=======
(<HTMLElement>content.querySelector('#conversationcontrol')).style.display = 'block';
>>>>>>>
const divider = document.createElement('div');
... |
<<<<<<<
const confirmationRegistry: number[] = [];
const getConfs = (id: number) => {
return confirmationRegistry[id];
};
function buildMockLockChain(conf = { targetConfirmations: 500 }) {
const id = confirmationRegistry.length;
confirmationRegistry[id] = 0;
const transactionConfidence = () => {
... |
<<<<<<<
import { createNewComposerPlugin } from './plugins/new-composer';
=======
import { createComponentCleanerPlugin } from './plugins/component-cleaner';
>>>>>>>
import { createNewComposerPlugin } from './plugins/new-composer';
import { createComponentCleanerPlugin } from './plugins/component-cleaner'; |
<<<<<<<
type NotPresentWhenInsideJob = 'job_id' | 'status';
interface JobTask extends Omit<Task, NotPresentWhenInsideJob> {
=======
type NotPresentWhenInsideJob = 'job_id' | 'status'
export interface JobTask extends Omit<Task, NotPresentWhenInsideJob> {
>>>>>>>
type NotPresentWhenInsideJob = 'job_id' | 'status';
exp... |
<<<<<<<
// Addresses of value txs must have last trit == 0.
if (bundle.some(tx => tx.value !== 0 && trits(tx.address)[HASH_TRITS_SIZE - 1] !== 0)) {
return false
}
=======
// currentIndex has to be equal to the index in the array
if (bundle.some((tx, index) => tx.currentIndex !== index)) ... |
<<<<<<<
import { add, normalizedBundleHash } from '@iota/signing'
import { INVALID_ADDRESS_LAST_TRIT } from '../../errors'
=======
import { add, normalizedBundle } from '@iota/signing'
>>>>>>>
import { add, normalizedBundle } from '@iota/signing'
import { INVALID_ADDRESS_LAST_TRIT } from '../../errors' |
<<<<<<<
import * as moment from 'moment';
=======
import { StepType } from '../../models/step.model';
>>>>>>>
import * as moment from 'moment';
import { StepType } from '../../models/step.model'; |
<<<<<<<
this.dialogService.confirm('Uninstall the hub from MarkLogic?', 'Cancel', 'Uninstall').subscribe(() => {
this.uninstallStatus = '';
this.isUninstalling = true;
let emitter = this.install.messageEmitter.subscribe((payload: any) => {
this.percentComplete = payload.percentComplete;
... |
<<<<<<<
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {MatDialogRef, MAT_DIALOG_DATA} from '@angular/material';
import {EditFlowUiComponent} from './edit-flow-ui.component';
import {Step} from '../../models/step.model';
import {Options} from '../../models/step-options.model';
import {Matchin... |
<<<<<<<
@Input() collections: any;
@Input() selectedStepId: any;
=======
@Input() projectDirectory: any;
>>>>>>>
@Input() collections: any;
@Input() selectedStepId: any;
@Input() projectDirectory: any; |
<<<<<<<
import { ICustomEditorService, IWorkspaceService } from '../../client/common/application/types';
import { IAsyncDisposableRegistry, IConfigurationService, IDisposableRegistry } from '../../client/common/types';
=======
import { ICommandManager, IDocumentManager, IWorkspaceService } from '../../client/common/a... |
<<<<<<<
}
export interface INotebookModel {
readonly file: Uri;
readonly isDirty: boolean;
readonly isUntitled: boolean;
readonly changed: Event<NotebookModelChange>;
readonly cells: ICell[];
getJson(): Promise<Partial<nbformat.INotebookContent>>;
getContent(cells?: ICell[]): Promise<string... |
<<<<<<<
import * as uuid from 'uuid/v4';
import { Disposable, Event, EventEmitter, Uri, WebviewPanel } from 'vscode';
import { arePathsSame } from '../../../datascience-ui/react-common/arePathsSame';
import {
ICustomEditorService,
IWorkspaceService,
WebviewCustomEditorEditingDelegate,
WebviewCustomEdito... |
<<<<<<<
=======
const rewireConsole = false;
>>>>>>>
<<<<<<<
// rewireConsole = true;
=======
//rewireConsole = true;
>>>>>>> |
<<<<<<<
import extractWithTranslationHOC from './withTranslationHOC';
import extractUseTranslationHook from './useTranslationHook';
import extractCustomUseTranslationHook from './customUseTranslationHook';
=======
>>>>>>>
import extractCustomUseTranslationHook from './customUseTranslationHook'; |
<<<<<<<
storage = typemoq.Mock.ofType<INotebookStorage & INotebookModel>();
when(configService.getSettings()).thenReturn({ datascience: { useNotebookEditor: true } } as any);
=======
when(configService.getSettings(anything())).thenReturn({ datascience: { useNotebookEditor: true } } as any);
... |
<<<<<<<
=======
private contentsLoadedPromise: Deferred<void> = createDeferred<void>();
private _file: Uri = Uri.file('');
private _dirty: boolean = false;
private isPromptingToSaveToDisc: boolean = false;
private visibleCells: ICell[] = [];
>>>>>>>
<<<<<<<
const options = await this.edi... |
<<<<<<<
{
avatar: require('../assets/graphics/contributors/maira.png'),
bio:
"Maira is a software engineer at VTEX, currently working with GraphQL every day. She loves web development and learning new technologies that make it even more enjoyable.",
job: 'Developer @ VTEX',
link: 'https://github... |
<<<<<<<
features: Features;
=======
enableSiteSettingsShortcut: boolean;
>>>>>>>
features: Features;
enableSiteSettingsShortcut: boolean;
<<<<<<<
this.features = data.features || {};
=======
this.enableSiteSettingsShortcut = data.enableSiteSettingsShortcut != undefined ?
data.enableSiteSetti... |
<<<<<<<
/* Internal Imports */
import { rootPath } from '../index'
const should = chai.should()
const testArtifactsDir = path.join(rootPath, 'test', 'artifacts.test.tmp')
const testRootPath = path.join(testArtifactsDir, (+new Date()).toString())
const dbRootPath = path.join(testRootPath, 'db')
// If these directorie... |
<<<<<<<
/* External Imports */
import path = require('path')
const rootPath = __dirname
const dbRootPath = path.join(__dirname, 'db')
export * from './src/interfaces'
export { rootPath, dbRootPath }
=======
export * from './src/interfaces'
export * from './src/app'
>>>>>>>
/* External Imports */
import path = requ... |
<<<<<<<
export { parse } from "https://deno.land/std@0.77.0/flags/mod.ts";
=======
export { parse } from "https://deno.land/std@0.74.0/flags/mod.ts";
>>>>>>>
export { parse } from "https://deno.land/std@0.77.0/flags/mod.ts";
<<<<<<<
} from "https://deno.land/std@0.77.0/fmt/colors.ts";
=======
green,
red,
ye... |
<<<<<<<
describe("Renaming Data Sets", () => {
it("Should rename the node", async () => {
showInputBox.mockReset();
renameDataSet.mockReset();
const child = new ZoweNode("HLQ.TEST.DELETE.NODE", vscode.TreeItemCollapsibleState.None, sessNode, null);
showInpu... |
<<<<<<<
=======
import { ISession } from "@zowe/imperative";
import { Profiles } from "./Profiles";
import * as extension from "../src/extension";
>>>>>>>
import { ISession } from "@zowe/imperative";
import { Profiles } from "./Profiles"; |
<<<<<<<
BumpMap = "bumpMap",
RoughnessMap = "roughnessMap",
=======
AlphaMap = "alphaMap",
AOMap = "aoMap",
BumpMap = "bumpMap",
NormalMap = "normalMap",
SpecularMap = "specularMap",
GradientMap = "gradientMap",
RoughnessMap = "roughnessMap",
... |
<<<<<<<
import { ZoweExplorerApiRegister } from "./api/ZoweExplorerApiRegister";
=======
import * as nls from "vscode-nls";
const localize = nls.config({ messageFormat: nls.MessageFormat.file })();
>>>>>>>
import { ZoweExplorerApiRegister } from "./api/ZoweExplorerApiRegister";
import * as nls from "vscode-nls";
con... |
<<<<<<<
const writeText = jest.fn();
=======
const existsSync = jest.fn();
>>>>>>>
const writeText = jest.fn();
const existsSync = jest.fn();
<<<<<<<
Object.defineProperty(vscode.env.clipboard, "writeText", {value: writeText});
=======
Object.defineProperty(fs, "existsSync", {value: existsSync});
>>>>>>>
Object.... |
<<<<<<<
public save(){
return { name: "profile1", profile: {}, type: "zosmf" };
}
public update(){
return { name: "profile1", profile: {}, type: "zosmf" };
}
=======
public delete(){
return { name: "profile1", profile: {}, type: "zosmf" };
}
public get configuration... |
<<<<<<<
import { ZoweExplorerApiRegister } from "./api/ZoweExplorerApiRegister";
import { sortTreeItems, applyIcons, FilterDescriptor, FilterItem, getAppName, resolveQuickPickHelper } from "./utils";
=======
import { sortTreeItems, applyIcons, FilterDescriptor, FilterItem, getAppName, resolveQuickPickHelper, errorHan... |
<<<<<<<
const writeText = jest.fn();
=======
const createBasicZosmfSession = jest.fn();
>>>>>>>
const writeText = jest.fn();
const createBasicZosmfSession = jest.fn();
<<<<<<<
Object.defineProperty(vscode.env.clipboard, "writeText", {value: writeText});
=======
Object.defineProperty(zowe.ZosmfSession, "createBasi... |
<<<<<<<
import * as application from "tns-core-modules/application";
import * as frame from "tns-core-modules/ui/frame";
import { Label } from "tns-core-modules/ui/label/";
import { Page } from "tns-core-modules/ui/page";
import { Color } from "tns-core-modules/ui/frame";
=======
>>>>>>>
import * as application fro... |
<<<<<<<
zowe.DownloadJobs.downloadAllSpoolContentCommon(job.getSession(), {
=======
ZoweExplorerApiRegister.getJesApi(job.profile).downloadSpoolContent({
>>>>>>>
ZoweExplorerApiRegister.getJesApi(job.getProfile()).downloadSpoolContent({
<<<<<<<
const jobJcl = await zowe.G... |
<<<<<<<
vscode.commands.registerCommand("zowe.uss.renameNode", async (node) => ussActions.renameUSSNode(node, ussFileProvider, getUSSDocumentFilePath(node)));
let jobsProvider: ZosJobsProvider;
=======
vscode.workspace.onDidChangeConfiguration(async (e) => {
if (e.affectsConfiguration("Zowe-U... |
<<<<<<<
import { ZoweNode } from "../../src/ZoweNode";
import * as imperative from "@zowe/imperative";
=======
import { ZoweDatasetNode } from "../../src/ZoweDatasetNode";
import * as brtimperative from "@brightside/imperative";
>>>>>>>
import { ZoweDatasetNode } from "../../src/ZoweDatasetNode";
import * as imperat... |
<<<<<<<
createFilterString: mockCreateFilterString,
=======
setItem: jest.fn(),
>>>>>>>
createFilterString: mockCreateFilterString,
setItem: jest.fn(),
<<<<<<<
addRecall: mockAddRecall,
getRecall: mockUSSGetRecall,
removeRecall: moc... |
<<<<<<<
import { getIconByNode } from "./generators/icons";
import { getMessageByNode, MessageContentType } from "./generators/messages";
import * as contextually from "./utils/context";
import { linkProfileDialog } from "./utils/Profilelink";
=======
>>>>>>>
import { linkProfileDialog } from "./utils/profileLink";
... |
<<<<<<<
import { IZoweTree, IZoweTreeNode } from "./ZoweTree";
import { ZoweNode } from "./ZoweNode";
import { Logger, TextUtils, IProfileLoaded, ImperativeConfig, Session, CredentialManagerFactory,
ImperativeError, DefaultCredentialManager } from "@zowe/imperative";
=======
import { IZoweTreeNode, IZoweJobTreeNo... |
<<<<<<<
expect(existsSync.mock.calls.length).toBe(3);
expect(existsSync.mock.calls[0][0]).toBe(extension.ZOWETEMPFOLDER);
=======
expect(existsSync.mock.calls.length).toBe(4);
expect(existsSync.mock.calls[0][0]).toBe(extension.BRIGHTTEMPFOLDER);
>>>>>>>
expect(existsSync.mock.... |
<<<<<<<
node = new ZoweNode("AUSER.TEST.SPFLOG1", vscode.TreeItemCollapsibleState.None, sessNode, null);
expect(extension.getDocumentFilePath(node.mLabel, node)).toEqual("/test/path/temp/_D_/sestest/AUSER.TEST.SPFLOG1.log");
=======
>>>>>>>
node = new ZoweNode("AUSER.TEST.SPFLOG1", vscode.... |
<<<<<<<
});
/*************************************************************************************************************
* Testing openItemFromPath
*************************************************************************************************************/
describe("openItemFromPath tests", () => {
const ses... |
<<<<<<<
=======
import * as ajv from 'ajv';
>>>>>>> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.