conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
private _mineEnergy: KnockoutObservable<number>;
private _maxMineEnergy: KnockoutObservable<number>;
private _mineEnergyGain: number;
private _mineInventory: KnockoutObservableArray<any>;
private _diamonds: KnockoutObservable<number>;
private _maxDailyDeals: number;
=======
private... |
<<<<<<<
//Safari
export const Safari = {
"SizeY": 21,
"SizeX": 25,
}
export const SAFARI_BATTLE_CHANCE = 5;
export const LEGAL_WALK_BLOCKS = [
0,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
... |
<<<<<<<
User,
Registry,
Feedback,
Course,
=======
>>>>>>>
Registry,
<<<<<<<
export {
Stage,
User,
Registry,
TaskChecker,
Feedback,
TaskArtefact,
CourseTask,
Course,
Task,
Student,
Mentor,
TaskResult,
};
=======
export {
Course,
CourseTask,
Feedback,
Mentor,
Stage,
Stu... |
<<<<<<<
TownList["Pewter City"] = new Town("Pewter City", [2], new Shop([ItemList["Pokeball"], ItemList["Greatball"]]));
TownList["Cerulean City"] = new Town("Cerulean City", [4]);
=======
TownList["Pewter City"] = new Town("Pewter City", [2]);
TownList["Cerulean City"] = new Town("Cerulean City", [4], null, dungeonL... |
<<<<<<<
BreedingHelper.progressEggs(Math.floor(Math.sqrt(this.gym.badgeReq * 3 + 1)));
=======
player.gainShards(this.enemyPokemon());
>>>>>>>
BreedingHelper.progressEggs(Math.floor(Math.sqrt(this.gym.badgeReq * 3 + 1)));
player.gainShards(this.enemyPokemon()); |
<<<<<<<
if (!isNaN(route) && !(route == Player.route())) {
=======
console.log("called");
console.log(region);
if (!isNaN(route) && !(route == player.route())) {
>>>>>>>
if (!isNaN(route) && !(route == player.route())) {
<<<<<<<
Game.gameState(GameConstants.Ga... |
<<<<<<<
private _routeKills: Array<KnockoutObservable<number>>;
private _routeKillsNeeded: KnockoutObservable<number>;
private _region: GameConstants.Region;
private _gymBadges: KnockoutObservableArray<GameConstants.Badge>;
private _pokeballs: Array<KnockoutObservable<number>>;
private _notCaugh... |
<<<<<<<
private _caughtShinyList: KnockoutObservableArray<string>;
private _route: KnockoutObservable<number>;
private _caughtPokemonList: KnockoutObservableArray<CaughtPokemon>;
private _routeKills: Array<KnockoutObservable<number>>;
private _routeKillsNeeded: KnockoutObservable<number>;
privat... |
<<<<<<<
import * as notificationService from './notification.service';
=======
import * as studentService from './student.service';
export { RepositoryService } from './repository.service';
>>>>>>>
import * as notificationService from './notification.service';
import * as studentService from './student.service';
exp... |
<<<<<<<
import inspect from 'unist-util-inspect'
import { selectAll } from 'unist-util-select'
import { mdast2tweet, TweetComponent } from './markdown/tweet'
=======
import { homedir } from 'os'
import { createInterface, Interface } from 'readline'
>>>>>>>
import inspect from 'unist-util-inspect'
import { selectAll ... |
<<<<<<<
NavigationTabsService, NavigationTreeContextMenuService,
SettingsMenuService, LogViewerService, LogViewerMenuService, TopNavService,
AppScreenService, CoreSettingsService, AdministrationTopAppBarBootstrapService, SessionExpireService
=======
NavigationTabsService,
NavigationTreeContextMenuService,
... |
<<<<<<<
export * from './useFocus';
export * from './Snackbars';
=======
export * from './useFocus';
export * from './BlocksLocaleService';
>>>>>>>
export * from './useFocus';
export * from './Snackbars';
export * from './BlocksLocaleService'; |
<<<<<<<
import * as userService from './userService';
import * as studentsService from './studentsService';
import * as courseService from './courseService';
import * as taskResultsService from './taskResultsService';
import * as taskService from './tasksService';
import * as awsTaskService from './awsTaskService';
imp... |
<<<<<<<
/** Include previously received partial responses into a final message */
public mergePartialMessages(partials: Message[]) {
// This is highly message dependent
// Overwrite this in derived classes
}
=======
>>>>>>>
/** Include previously received partial responses into a final message */
public ... |
<<<<<<<
const controllerSuccess = createSendDataMessage(MessageType.Response, Buffer.from([1]));
// "A SendDataResponse with wasSent=true was not detected as confirmation!"
expect(predicate(undefined, controllerSuccess)).toBe("confirmation");
=======
const controllerSuccess = createSendDataMessage(
Message... |
<<<<<<<
setTimeout(() => {
if (!this.currentTransaction) return;
this.rejectCurrentTransaction(
new ZWaveError(
"The transaction timed out",
ZWaveErrorCodes.Controller_MessageTimeout,
=======
this.currentTransaction.timeoutInstance = setTimeout(
() =>
this.rejectCurren... |
<<<<<<<
log("io", ` received confirmation response to current transaction`, "debug");
=======
log(
"io",
` received intermediate response to current transaction`,
"debug",
);
>>>>>>>
log(
"io",
` received confirmation response to current transaction`,
"debug... |
<<<<<<<
import { MAX_NODES, ZWaveError, ZWaveErrorCodes } from "@zwave-js/core";
import { getEnumMemberName, JSONObject, num2hex } from "@zwave-js/shared";
import { clamp } from "alcalzone-shared/math";
import type {
=======
import {
MAX_NODES,
MessageOrCCLogEntry,
ZWaveError,
ZWaveErrorCodes,
} from "@zwave-js/c... |
<<<<<<<
'Kuvio esittää varmennetut tapaukset verkostona. Numero on tartunnan järjestysnumero. Mikäli suoraa tartuttajaa ei tiedetä linkitetään tartunta alkuperämaahan. Kuvasta on jätetty pois tartunnat joiden suoraa aiheuttajaa tai alkuperämaata ei ole tiedossa. Suomeen merkatut tartunnat liittyvät suurella toden... |
<<<<<<<
'Corona virus prevention tips': 'Toimintaohjeet koronaviruksen tartunnan ehkäisyyn',
'infectionsPerDisrictAndSize': 'Tartunnat sairaanhoitopiireittäin / sairaanhoitopiirin koko',
'originCountryFooter': 'Suomen tartuntojen lukumäärät alkuperämaittain',
'log': 'Tartuntaloki',
'logFooter': 'Kai... |
<<<<<<<
import { Router, ActivatedRoute, Params } from '@angular/router';
import {Measure} from './measures/measure.model';
=======
import { Http } from '@angular/http';
import { Pia } from '../pia.model';
import 'rxjs/add/operator/map'
>>>>>>>
import { Measure } from './measures/measure.model';
import { Http } from... |
<<<<<<<
asyncApply<A, B>(this: Maybe<(a: Promise<A> | A) => Promise<B>>, arg: Maybe<Promise<A> | A>): Promise<Maybe<B>>;
asyncApply<A, B>(this: Maybe<Promise<A> | A>, fn: Maybe<(a: Promise<A> | A) => Promise<B>>): Promise<Maybe<B>>;
=======
asyncApply<A, B>(
this: Maybe<(a: A) => Promise<B>>,
arg: Maybe... |
<<<<<<<
tooltip: {
background: white,
table: {
backgroundEven: gray100,
backgroundOdd: gray200,
},
},
country: {
legend: {
lineIcon: {
thickness: 2,
width: 20,
height: 20,
},
},
},
=======
cartesianGrid: {
stroke: '#2222',
},
>>>>>>>... |
<<<<<<<
=======
import { AddressHelper } from '../../../core/util/utils';
>>>>>>>
import { AddressHelper } from '../../../core/util/utils';
<<<<<<<
import { AddressHelper } from '../../../core/util/utils';
=======
>>>>>>> |
<<<<<<<
specialPoll(): void {
// A poll only for address changes, triggered from the GUI!
const _call = (element) => {
this.call(
element.instance,
element.method,
element.params && element.params.typeOf === 'function' ? element.params() : element.params,
element.succes... |
<<<<<<<
import { DateFormatter } from '../../../../../core/util/utils';
import { RpcService } from '../../../../../core/core.module';
=======
import { DateFormatter } from '../../../../../wallet/shared/util/utils';
import { RpcService, RpcStateService } from '../../../../../core/core.module';
>>>>>>>
import { DateFo... |
<<<<<<<
import { MdDialog } from '@angular/material';
import { QrCodeModalComponent} from '../qr-code-modal/qr-code-modal.component';
import { DeleteConfirmationModalComponent } from '../../../shared/delete-confirmation-modal/delete-confirmation-modal.component';
import { FlashNotificationService } from '../../../servi... |
<<<<<<<
import { StateService } from '../../../../core/core.module';
import { Amount, Duration } from '../../../../core/util/utils';
=======
import { RpcStateService } from '../../../../core/core.module';
import { Amount, Duration } from '../../../shared/util/utils';
>>>>>>>
import { RpcStateService } from '../../..... |
<<<<<<<
import { ModalsComponent } from '../../modals/modals.component';
import { FlashNotificationService } from '../../services/flash-notification.service';
=======
import { SignatureAddressModalComponent } from '../shared/signature-address-modal/signature-address-modal.component';
>>>>>>>
import { FlashNotificati... |
<<<<<<<
this.listingService.search(pageNumber, max, null, search).take(1).subscribe((listings: Array<any>) => {
this.isLoading = false;
// new page
const page = {
pageNumber: pageNumber,
listings: listings.map(listing => new Template(listing))
};
// should we clear al... |
<<<<<<<
ngOnInit() {
this._sub = this.balanceService.getBalances()
.subscribe(
balances => {
this._balance = balances;
},
error => this.log.er('balanceService subscription error:' + error));
}
ngOnDestroy() {
this._sub.unsubscribe();
}
/*
UI logic
*/
... |
<<<<<<<
export { Shimmer } from './Shimmer';
=======
export { CommandBar as ExperimentCommandBar } from './CommandBar';
export { Shimmer } from './Shimmer';
export { Chiclet } from './Chiclet';
>>>>>>>
export { Shimmer } from './Shimmer';
export { Chiclet } from './Chiclet'; |
<<<<<<<
=======
isCollapsed: boolean = true;
isFixed: boolean = false;
title: string = '';
>>>>>>>
<<<<<<<
blocks: number = 0;
error: string = '';
=======
walletInitialized: boolean = false;
daemonRunning: boolean = false;
multiwallet: any = [];
>>>>>>>
// multiwallet: any = [];
<<<<<<<
... |
<<<<<<<
clearCache() {
this.profileService.shippingDetails = new ShippingDetails()
}
setSteperIndex() {
// @TODO: set stepper completed on 3 index.
this.stepper.selectedIndex = this.profileService.stepper;
}
updateSteperIndex() {
this.profileService.stepper = this.stepper.selectedIndex;
}... |
<<<<<<<
=======
/*
RPC logic
*/
>>>>>>>
/*
RPC logic
*/
<<<<<<<
constructor(
private sendService: SendService,
private balanceService: BalanceService,
private _rpc: RPCService,
private _modals: ModalsService,
private _encryptionStatus: EncryptionStatusService
) {
}
ca... |
<<<<<<<
let params = this.command.trim().split(' ')
.filter(cmd => cmd.trim() !== '');
=======
const params = this.queryParser(this.command);
>>>>>>>
let params = this.queryParser(this.command); |
<<<<<<<
export * from './Customizations';
export * from './Customizer';
=======
export * from './BaseComponent.types';
export * from './Context';
>>>>>>>
export * from './BaseComponent.types'; |
<<<<<<<
=======
this.formData = new ShippingDetails();
this._profileService.get(1).take(1).subscribe(profile => {
this.profile = profile;
// TODO: Select default address..
if (profile.ShippingAddresses && profile.ShippingAddresses.length) {
this.formData.firstName = profile.Shipping... |
<<<<<<<
export interface IComboBoxProps extends ISelectableDroppableTextProps<IComboBox, IComboBox> {
=======
/**
* {@docCategory ComboBox}
*/
export interface IComboBoxProps extends ISelectableDroppableTextProps<IComboBox> {
>>>>>>>
/**
* {@docCategory ComboBox}
*/
export interface IComboBoxProps extends ISelec... |
<<<<<<<
import { Component } from '@angular/core';
import { MatDialog, MatDialogRef } from '@angular/material';
import { ManageWidgetsComponent } from '../../modals/manage-widgets/manage-widgets.component';
=======
import { Component, OnInit } from '@angular/core';
import { RpcStateService } from '../../core/core.mod... |
<<<<<<<
import { Favorite } from '../../core/market/api/favorites/favorite.model';
import { Listing } from '../../core/market/api/listing/listing.model';
=======
import { Template } from 'app/core/market/api/template/template.model';
import { CountryList } from 'app/core/market/api/listing/countrylist.model';
>>>>>>... |
<<<<<<<
private favoritesService: FavoritesService) {
}
=======
private favoritesService: FavoritesService,
private countryList: CountryListService
) { }
>>>>>>>
private favoritesService: FavoritesService,
public countryList: CountryListService
) { }
<<<<<<<
static ShippingDetails = c... |
<<<<<<<
=======
import { MultiwalletComponent } from './multiwallet/multiwallet.component';
>>>>>>>
import { MultiwalletComponent } from './multiwallet/multiwallet.component'; |
<<<<<<<
import { SnackbarService } from '../../../core/snackbar/snackbar.service';
import { MdSnackBarModule } from '@angular/material';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
=======
>>>>>>>
<<<<<<<
providers: [ SnackbarService, ModalsService ]
=======
provid... |
<<<<<<<
Description: "",
Player: "",
Version: process.env.VERSION,
})
=======
Description: '',
Player: '',
Version: '1.0.0',
ImageURL: '',
});
>>>>>>>
Description: "",
Player: "",
Version: process.env.VERSION,
ImageURL: "... |
<<<<<<<
import { TurnTimer } from "./Widgets/TurnTimer";
=======
import { SavedEncounter } from "./Encounter/SavedEncounter";
import {Tag} from "./Combatant/Tag";
>>>>>>>
import { TurnTimer } from "./Widgets/TurnTimer";
<<<<<<<
private roundCounterVisible = ko.observable(false);
=======
private imageCount... |
<<<<<<<
if (!this.playerViewClient) {
return;
}
this.playerViewClient.UpdateEncounter(this.EncounterId, this.SavePlayerDisplay());
Store.Save<EncounterState<CombatantState>>(Store.AutoSavedEncounters, this.EncounterId, this.Save(this.EncounterId, ""));
=======
this.... |
<<<<<<<
import { Server } from 'http';
import { Connection } from 'typeorm';
=======
import { WriteStream } from 'fs';
import { IncomingMessage, Server, ServerResponse } from 'http';
>>>>>>>
import { IncomingMessage, Server, ServerResponse } from 'http';
import { Connection } from 'typeorm'; |
<<<<<<<
metadataServerHost: '',
lastSync: 0,
=======
onDemandBaseUrl: 'https://unstable.life/Flashpoint/Data/Images/',
>>>>>>>
metadataServerHost: '',
lastSync: 0,
onDemandBaseUrl: 'https://unstable.life/Flashpoint/Data/Images/',
<<<<<<<
parser.prop('metaEditsFolderPath', v => source.metaEditsFolderPa... |
<<<<<<<
import { BackOut, DevConsoleStatusResponse } from '@shared/back/types';
import { BrowserApplicationOpts } from '@shared/extensions/interfaces';
=======
import { BackOut } from '@shared/back/types';
>>>>>>>
import { BackOut } from '@shared/back/types';
import { BrowserApplicationOpts } from '@shared/extension... |
<<<<<<<
respond<GetRendererInitDataResponse>(event.target, {
id: req.id,
type: BackOut.GENERIC_RESPONSE,
data: {
preferences: state.preferences,
config: state.config,
fileServerPort: state.fileServerPort,
log: state.log,
services: Array.from(state.services.v... |
<<<<<<<
dialog: DialogLang;
=======
libraries: LibrariesLang;
>>>>>>>
dialog: DialogLang;
libraries: LibrariesLang;
<<<<<<<
export type DialogLang = LangObject<
'programNotFound' |
'phpNotFound' |
'wineNotFound' |
'fileNotFound' |
'pathNotFound' |
'selectFileToExportMeta' |
'selectFolderToExpo... |
<<<<<<<
const proc = exec(
createCommand(appPath, appArgs),
{ env: getEnvironment(opts.fpPath) }
=======
const useWine: boolean = process.platform != 'win32' && appPath.endsWith('.exe');
const proc = launch(
createCommand(appPath, appArgs, useWine),
{ en... |
<<<<<<<
import { FontWeights } from '../../Styling';
=======
import { getWindow } from '../../Utilities';
>>>>>>>
import { FontWeights } from '../../Styling';
import { getWindow } from '../../Utilities'; |
<<<<<<<
export function launchCuration(curation: EditCuration, lang: LangContainer['dialog']) {
linkContentFolder(curation.key);
=======
export async function launchCuration(curation: EditCuration) {
await linkContentFolder(curation.key);
console.log(`Launching Curation ${curation.meta.title}`);
curationLog(`... |
<<<<<<<
frame: !this._main.config.useCustomTitlebar,
=======
icon: path.join(__dirname, '../window/images/icon.png'),
frame: !this._main.config.data.useCustomTitlebar,
>>>>>>>
frame: !this._main.config.useCustomTitlebar,
icon: path.join(__dirname, '../window/images/icon.png'), |
<<<<<<<
import * as YAML from 'yaml';
=======
import { Coerce } from '../../shared/utils/Coerce';
>>>>>>>
import * as YAML from 'yaml';
import { Coerce } from '../../shared/utils/Coerce';
<<<<<<<
export function convertMeta(data: any, onError?: (error: string) => void): ParsedCurationMeta {
=======
function conve... |
<<<<<<<
import { TableRow } from "./table-row.class";
=======
import { DocumentationModule } from "../documentation-component/documentation.module";
>>>>>>>
import { TableRow } from "./table-row.class";
import { DocumentationModule } from "../documentation-component/documentation.module"; |
<<<<<<<
ariaLabel="Close menu">
</ibm-icon-chevron-down>
=======
[title]="open ? closeMenuAria : openMenuAria"
[ariaLabel]="open ? closeMenuAria : openMenuAria">
</ibm-icon-chevron-down16>
>>>>>>>
[title]="open ? closeMenuAria : openMenuAria"
[ariaLabel]="open ? closeMenuAria : openM... |
<<<<<<<
class="bx--select"
style="width: 100%">
<label [attr.for]="id" class="bx--label">{{label}}</label>
=======
class="bx--select">
<label *ngIf="!skeleton" [attr.for]="id" class="bx--label">{{label}}</label>
>>>>>>>
class="bx--select"
style="width: 100%">
<label *ngIf="!skeleton" ... |
<<<<<<<
=======
@HostBinding("attr.role") role = "checkbox";
>>>>>>>
@HostBinding("attr.role") role = "checkbox"; |
<<<<<<<
[sortable]="sortable"
=======
[skeleton]="skeleton"
>>>>>>>
[sortable]="sortable"
[skeleton]="skeleton"
<<<<<<<
[sortable]="sortable"
=======
[skeleton]="skeleton"
>>>>>>>
[sortable]="sortable"
[skeleton]="skeleton"
<<<<<<<
[sortable]="sortable"
=======
[skeleto... |
<<<<<<<
=======
* (size `"default"` is being deprecated as of neutrino v1.2.0, please use `"md"` instead)
* @type {("sm" | "md" | "default")}
* @memberof Switch
>>>>>>> |
<<<<<<<
import {
ChevronDownModule,
CaretLeftModule,
CaretRightModule,
OverflowMenuHorizontalModule
} from "@carbon/icons-angular";
=======
>>>>>>>
import {
ChevronDownModule,
CaretLeftModule,
CaretRightModule,
OverflowMenuHorizontalModule
} from "@carbon/icons-angular";
<<<<<<<
import { PaginationNav } fro... |
<<<<<<<
inline="true"
aria-label="Select row"
=======
[attr.aria-label]="checkboxRowLabel | async"
>>>>>>>
inline="true"
[attr.aria-label]="checkboxRowLabel | async" |
<<<<<<<
Renderer2,
ViewChild
=======
ViewChild,
HostBinding
>>>>>>>
Renderer2,
ViewChild,
HostBinding
<<<<<<<
constructor(private changeDetectorRef: ChangeDetectorRef, private _elementRef: ElementRef, private renderer: Renderer2) {
=======
@HostBinding("attr.role") role = "radiogroup";
private _isIni... |
<<<<<<<
[theme]="type"
[ariaLabel]="title"
[open]="open"
=======
[theme]="modalType"
[hasScrollingContent]="hasScrollingContent"
[modalLabel]="modalTitle"
>>>>>>>
[theme]="type"
[ariaLabel]="title"
[hasScrollingContent]="hasScrollingContent"
[open]="open"
<<<<<<<
<p class="bx--moda... |
<<<<<<<
[size]="size === 'sm' ? size : 'md'"
=======
[size]="size !== 'lg' ? 'sm' : 'default'"
>>>>>>>
[size]="size !== 'lg' ? 'sm' : 'md'" |
<<<<<<<
<ibm-table [sortable]="sortable" style="display: block; width: 650px;" [model]="model" (sort)="paginationSort($event)"></ibm-table>
=======
<ibm-table
style="display: block; width: 650px;"
[skeleton]="skeleton"
[model]="model"
(sort)="paginationSort($event)">
</ibm-table>
>>>>>>>
<ibm-tab... |
<<<<<<<
<ibm-icon-chevron-down size="16" *ngIf="!skeleton" class="bx--select__arrow"></ibm-icon-chevron-down>
=======
<svg ibmIconChevronDown16 *ngIf="!skeleton" class="bx--select__arrow"></svg>
</div>
>>>>>>>
<ibm-icon-chevron-down size="16" *ngIf="!skeleton" class="bx--select__arrow"></ibm-icon-chevron-... |
<<<<<<<
Renderer2,
ViewChild
=======
ViewChild,
HostBinding
>>>>>>>
Renderer2,
ViewChild,
HostBinding
<<<<<<<
constructor(private changeDetectorRef: ChangeDetectorRef, private _elementRef: ElementRef, private renderer: Renderer2) {
=======
@HostBinding("attr.role") role = "radiogroup";
private _isIni... |
<<<<<<<
ignoretz: boolean
tzinfos: any | null
=======
>>>>>>>
<<<<<<<
// @ts-ignore
dtstart: options.dtstart || dtstart,
ignoretz: options.ignoretz,
tzinfos: options.tzinfos
=======
dtstart: options.dtstart || dtstart
>>>>>>>
... |
<<<<<<<
=======
import IterResult, { IterArgs } from './iterresult';
>>>>>>>
import IterResult from './iterresult';
<<<<<<<
private _iter;
}
=======
_iter(iterResult: IterResult): Date | Date[] | null;
}
export {};
>>>>>>>
_iter(iterResult: IterResult): Date | Date[] | null;
} |
<<<<<<<
import { includes, isPresent, isArray, isNumber, toArray } from './helpers'
import Weekday from './weekday'
=======
import { includes, isPresent, isArray, isNumber } from './helpers'
import { Weekday } from './weekday'
>>>>>>>
import { includes, isPresent, isArray, isNumber, toArray } from './helpers'
import... |
<<<<<<<
import { parseMarkers, getConfigDefault } from './utils';
=======
import { getConfigDefault } from './tb-config';
import { parseMarkers } from './utils';
import deviceSettings, { EmulateDeviceSetting } from './simulate-device-options';
>>>>>>>
import { parseMarkers, getConfigDefault } from './utils';
import ... |
<<<<<<<
import { GirParameter } from './gir-parameter'
// Declaring these two together is the easiest way to prevent circular
// imports
=======
import { GirBoolean } from './gir-boolean'
>>>>>>>
import { GirParameter } from './gir-parameter'
import { GirBoolean } from './gir-boolean'
// Declaring these two togeth... |
<<<<<<<
list_sizes(): [ /* sizes */ number[] | null, /* n_sizes */ number ]
/* Methods of GObject.Object */
=======
list_sizes(): /* sizes */ number[] | null
/* Methods of Object */
>>>>>>>
list_sizes(): /* sizes */ number[] | null
/* Methods of GObject.Object */
<<<<<<<
vfunc_list_sizes... |
<<<<<<<
export function convert_with_fallback(str: Gjs.byteArray.ByteArray, to_codeset: string, from_codeset: string, fallback: string): [ /* returnType */ Gjs.byteArray.ByteArray, /* bytes_read */ number | null ]
export function datalist_foreach(datalist: Data, func: DataForeachFunc): void
export function datalist_get... |
<<<<<<<
/* Signals of Gio.Application */
connect(sigName: "activate", callback: ((obj: Application) => void))
connect(sigName: "command-line", callback: ((obj: Application, command_line: ApplicationCommandLine) => number))
connect(sigName: "handle-local-options", callback: ((obj: Application, options: G... |
<<<<<<<
/* Signals of Gtk.Application */
connect(sigName: "window-added", callback: ((obj: Application, window: Window) => void))
connect(sigName: "window-removed", callback: ((obj: Application, window: Window) => void))
/* Signals of Gio.Application */
connect(sigName: "activate", callback: ((obj: ... |
<<<<<<<
import memoizeOne from 'memoize-one';
import { settings } from 'app/settings/settings';
=======
import { buildStats } from './stats';
>>>>>>>
import memoizeOne from 'memoize-one';
import { settings } from 'app/settings/settings';
import { buildStats } from './stats';
<<<<<<<
function buildHiddenStats(
ite... |
<<<<<<<
import { filterPlugs } from '../../d2-loadout-builder/generated-sets/utils';
=======
// tslint:disable-next-line:no-implicit-dependencies
import D2Seasons from 'app/data/d2-seasons.json';
// tslint:disable-next-line:no-implicit-dependencies
import D2Events from 'app/data/d2-events.json';
>>>>>>>
import { fil... |
<<<<<<<
import * as _ from 'lodash';
=======
import * as _ from 'underscore';
import copy from 'fast-copy';
>>>>>>>
import * as _ from 'lodash';
import copy from 'fast-copy';
<<<<<<<
import { Loadout, dimLoadoutService } from '../loadout/loadout.service';
=======
import { Loadout, dimLoadoutService, LoadoutClass ... |
<<<<<<<
import { getActivePlatform } from '../accounts/get-active-platform';
=======
>>>>>>>
<<<<<<<
import {
authenticatedHttpClient,
handleUniquenessViolation,
unauthenticatedHttpClient,
} from './bungie-service-helper';
=======
import { handleUniquenessViolation, httpAdapter } from './bungie-service-help... |
<<<<<<<
if (!mods?.length || mods.every((mod) => doEnergiesMatch(mod, item))) {
assignments[item.id] = [...assignments[item.id], ...mods.map((mod) => mod.modDef.hash)];
=======
if (mods?.length && mods.every((mod) => doEnergiesMatch(mod, item))) {
assignments[item.id] = [...assignments[item.id], ...mods.m... |
<<<<<<<
selectedStoreId: string,
assumeMasterwork: boolean
=======
lockedItems: LockedMap,
selectedStoreId: string
>>>>>>>
lockedItems: LockedMap,
selectedStoreId: string,
assumeMasterwork: boolean
<<<<<<<
(item) => byStatMix(item, assumeMasterwork)
=======
byStatMix(lockedItems[LockableBuck... |
<<<<<<<
import {HomeMediaModule} from '../home-media/home-media.module';
=======
import {HomeFavoriteModule} from '../home-favorite/home-favorite.module';
>>>>>>>
import {HomeMediaModule} from '../home-media/home-media.module';
import {HomeFavoriteModule} from '../home-favorite/home-favorite.module';
<<<<<<<
impor... |
<<<<<<<
import {HomeMediaService} from '../home-media/home-media.service';
import {HomeMediaEntity} from '../home-media/entity';
=======
import {HomeFavoriteService} from '../home-favorite/home-favorite.service';
>>>>>>>
import {HomeMediaService} from '../home-media/home-media.service';
import {HomeMediaEntity} from... |
<<<<<<<
import useDebounce from './useDebounce';
import useDebounceFn from './useDebounceFn';
=======
import usePrevious from './usePrevious';
import useMouse from './useMouse';
>>>>>>>
import useDebounce from './useDebounce';
import useDebounceFn from './useDebounceFn';
import usePrevious from './usePrevious';
imp... |
<<<<<<<
export const Armor2ModPlugCategories = {
general: 2487827355,
helmet: 2912171003,
gauntlets: 3422420680,
chest: 1526202480,
leg: 2111701510,
classitem: 912441879
};
export const getItemDamageShortName: (item: DimItem) => string | undefined = (item) =>
=======
export const getItemDamageShortName =... |
<<<<<<<
import { D2Categories } from '../destiny2/d2-buckets.service';
import { D1Categories } from '../destiny1/d1-buckets.service';
import { getItemInfoSource, itemTags } from '../inventory/dim-item-info';
=======
import { itemTags } from '../settings/settings';
import { getItemInfoSource } from '../inventory/dim-i... |
<<<<<<<
/** New Tile Style */
tallTiles: boolean;
/** Community-curated rolls */
curatedRolls: boolean;
=======
>>>>>>>
/** Community-curated rolls */
curatedRolls: boolean; |
<<<<<<<
import { D1Progression, D1Store, D1Vault, DimStore, DimVault } from '../store-types';
=======
import { D1Store, DimStore } from '../store-types';
>>>>>>>
import { D1Progression, D1Store, DimStore } from '../store-types'; |
<<<<<<<
import usePersistFn from './usePersistFn';
=======
import useMap from './useMap';
>>>>>>>
import usePersistFn from './usePersistFn';
import useMap from './useMap';
<<<<<<<
usePersistFn,
=======
useMap,
>>>>>>>
usePersistFn,
useMap, |
<<<<<<<
import { copy } from 'angular';
import * as _ from 'lodash';
=======
import copy from 'fast-copy';
import * as _ from 'underscore';
>>>>>>>
import copy from 'fast-copy';
import * as _ from 'lodash'; |
<<<<<<<
import { Armor2ModPlugCategories } from 'app/utils/item-utils';
import {
sortProcessModsOrProcessItems,
canTakeAllSeasonalMods,
canTakeAllGeneralMods,
} from './processWorker/processUtils';
import { mapArmor2ModToProcessMod, mapDimItemToProcessItem } from './processWorker/mappers';
=======
import { getS... |
<<<<<<<
import { D1ItemUserReview, DtrReviewer } from '../item-review/destiny-tracker.service';
import { $q, $http } from 'ngimport';
=======
import { D1MembershipInfo, D1ItemUserReview } from '../item-review/destiny-tracker.service';
>>>>>>>
import { D1ItemUserReview, DtrReviewer } from '../item-review/destiny-trac... |
<<<<<<<
case "SA_72":
=======
case SpecialAbilityId.TraditionGuildMages:
case SpecialAbilityId.TraditionWitches:
case SpecialAbilityId.TraditionElves:
case SpecialAbilityId.TraditionDruids:
case SpecialAbilityId.TraditionScharlatane:
case SpecialAbilityId.TraditionZauberbarde... |
<<<<<<<
modes = [
ModeName.Insert,
ModeName.Visual,
ModeName.VisualLine,
ModeName.VisualBlockInsertMode,
ModeName.VisualBlock
];
keys = ["<esc>"];
=======
modes = [ModeName.Insert, ModeName.Visual, ModeName.VisualLine, ModeName.SearchInProgressMode, ModeName.Replace];
keys = ["<escape>"... |
<<<<<<<
import {setupWorkspace, cleanUpWorkspace, assertEqualLines} from './../testUtils';
import ModeNormal from '../../src/mode/modeNormal';
=======
import {setupWorkspace, cleanUpWorkspace} from './../testUtils';
import {NormalMode} from '../../src/mode/modeNormal';
>>>>>>>
import {setupWorkspace, cleanUpWorkspac... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.