conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
projectionsMap: new Map<ITargetedInstruction, IProjections>(),
watches: [],
=======
projectionsMap: new Map<IInstruction, IProjections>(),
>>>>>>>
projectionsMap: new Map<IInstruction, IProjections>(),
watches: [],
<<<<<<<
projectionsMap: new Map<ITargetedInstruction, IProjections>()... |
<<<<<<<
import { LoggerService } from '../logging/logger.service';
import { OidcSecurityCommon } from './oidc.security.common';
=======
import { StoragePersistanceService } from '../storage';
import { LoggerService } from './oidc.logger.service';
>>>>>>>
import { StoragePersistanceService } from '../storage';
import... |
<<<<<<<
import { Injectable } from '@angular/core';
import { forkJoin, Observable, of, throwError, TimeoutError, timer } from 'rxjs';
import { map, mergeMap, retryWhen, switchMap, take, timeout } from 'rxjs/operators';
import { AuthStateService } from '../authState/auth-state.service';
import { AuthWellKnownService } f... |
<<<<<<<
import { LoggerService } from '../logging/logger.service';
=======
import { StoragePersistanceService } from '../storage';
>>>>>>>
import { LoggerService } from '../logging/logger.service';
import { StoragePersistanceService } from '../storage';
<<<<<<<
import { OidcSecurityCommon } from './oidc.security.co... |
<<<<<<<
import { OidcSecurityStorage } from '../../lib/services/oidc.security.storage';
=======
import { LoggerService } from '../../lib/services/oidc.logger.service';
>>>>>>>
<<<<<<<
import { TestStorage } from '../common/test-storage.service';
=======
import { AbstractSecurityStorage } from '../../lib/storage';... |
<<<<<<<
import { async, fakeAsync, TestBed, tick } from '@angular/core/testing';
=======
import { TestBed, waitForAsync } from '@angular/core/testing';
>>>>>>>
import { fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
<<<<<<<
it('only calls start refresh session and returns idtoken and... |
<<<<<<<
eagerLoadAuthWellKnownEndpoints: true,
=======
disableRefreshIdTokenAuthTimeValidation: false,
>>>>>>>
eagerLoadAuthWellKnownEndpoints: true,
disableRefreshIdTokenAuthTimeValidation: false,
<<<<<<<
eagerLoadAuthWellKnownEndpoints: true,
=======
... |
<<<<<<<
import { OidcSecurityUserService } from '../userData/oidc.security.user-service';
import { UrlService } from '../utils';
=======
import { RandomService, UrlService } from '../utils';
>>>>>>>
import { OidcSecurityUserService } from '../userData/oidc.security.user-service';
import { RandomService, UrlService }... |
<<<<<<<
}
// @internal
export interface ProcessorConstructor {
transformName(fileName: string, settings: ReadonlyMap<string, any>): string;
new(source: string, sourceFileName: string, targetFileName: string, settings: ReadonlyMap<string, any>): AbstractProcessor;
}
export interface ProcessorUpdateResult {
... |
<<<<<<<
export * from './stitching';
export * from './transforms';
=======
export * from './stitching';
export * from './schemaVisitor';
>>>>>>>
export * from './stitching';
export * from './transforms';
export * from './schemaVisitor'; |
<<<<<<<
import * as TextObjectsWordTest from './TextObjects/Word.test';
=======
import * as MotionIntegrationTest from './MotionIntegration.test';
>>>>>>>
import * as MotionIntegrationTest from './MotionIntegration.test';
import * as TextObjectsWordTest from './TextObjects/Word.test';
<<<<<<<
suite('Extension Tests... |
<<<<<<<
{ keys: 'c i {char}',
command: (args: {character: string}) =>
ActionMoveCursor.byMotions({motions: [ MotionMatchPairs.matchOpening(args, LastCharacterMatching.Exclude, FirstPosPairMatching.Ignore) ]})
//we should not apply the delete move is the first curs... |
<<<<<<<
=======
import {ActionFold} from '../Actions/Fold';
import {MotionLine} from '../Motions/Line';
>>>>>>>
import {ActionFold} from '../Actions/Fold'; |
<<<<<<<
{ keys: 'z .', command: ActionReveal.primaryCursor, args: {revealType: TextEditorRevealType.InCenter} },
{ keys: 'z z', command: ActionReveal.primaryCursor, args: {revealType: TextEditorRevealType.InCenter} },
{ keys: 'ctrl+c', command: () => Configuration.get('bindCtrlC')
=======
... |
<<<<<<<
export class StyleSheetManager extends React.Component<{sheet: ServerStyleSheet}, any> {}
export class ServerStyleSheet {
collectStyles(tree: any): StyleSheetManager;
getStyleTags(): string;
getStyleElement(): Component<any>;
}
=======
export class ServerStyleSheet {
collectStyles(children: ReactEle... |
<<<<<<<
import { InvalidationMode, SyncMode } from "@/core/comm/types";
import { GlobalPoint, Ray } from "@/game/geom";
=======
import { GlobalPoint, LocalPoint } from "@/game/geom";
>>>>>>>
import { InvalidationMode, SyncMode } from "@/core/comm/types";
<<<<<<<
const polygon = computeVisibility... |
<<<<<<<
import { g2l, g2lr, g2lx, g2ly, g2lz } from "@/game/units";
=======
import { g2l, g2lr, g2lx, g2ly, g2lz, getUnitDistance } from "@/game/units";
import { addBlocker, getBlockers, getVisionSources, setVisionSources, sliceBlockers } from "@/game/visibility/utils";
import tinycolor from "tinycolor2";
>>>>>>>
im... |
<<<<<<<
import { calculateDelta } from "../tools/utils";
=======
import { calculateDelta } from "../tools/tools";
import { SelectTool } from "../tools/select";
>>>>>>>
import { SelectTool } from "../tools/select";
import { calculateDelta } from "../tools/utils"; |
<<<<<<<
import Tools from "@/game/ui/tools/tools.vue";
import { getRef } from "@/core/utils";
=======
import { uuidv4 } from "@/core/utils";
>>>>>>>
<<<<<<<
=======
import { ServerAura } from "@/game/comm/types/shapes";
import { EventBus } from "@/game/event-bus";
>>>>>>>
<<<<<<<
deleteShapes()
==... |
<<<<<<<
}
export function getFogColour(opposite: boolean = false): string {
const tc = gameManager.fowColour.spectrum("get");
if (Settings.IS_DM)
tc.setAlpha(opposite ? 1 : Settings.fowOpacity);
else
tc.setAlpha(1);
return tc.toRgbString();
}
export function alphSort(a: string, b: stri... |
<<<<<<<
import { labelMap } from '../common';
=======
import { auth } from '../../../assets/data-test-attributes';
>>>>>>>
import { labelMap } from '../common';
import { auth } from '../../../assets/data-test-attributes'; |
<<<<<<<
this.storage = new Storage(this.config.cache!);
TrustedAuthority.setTrustedAuthoritiesFromConfig(this.config.auth.knownAuthorities!, this.config.auth.instanceMetadata!);
this.cacheContext = new CacheContext();
=======
B2cAuthority.setKnownAuthorities(this.config.auth.knownAutho... |
<<<<<<<
private readonly _renderState: WebGLRenderState = this._globalGameObject.getOrAddComponent(WebGLRenderState);
=======
>>>>>>> |
<<<<<<<
idTokenClaims: StringDict;
refreshToken: string;
accessToken: string;
expiresOn: Date;
extExpiresOn?: Date; // TODO: Check what this maps to in other libraries
userRequestState?: string; // TODO: remove, just check how state is handled in other libraries
familyId?: string; // TODO: C... |
<<<<<<<
</div>
`
=======
`;
>>>>>>>
</div>
`; |
<<<<<<<
export class CredentialsClass {
=======
const CREDENTIALS_TTL = 50 * 60 * 1000; // 50 min, can be modified on config if required in the future
export class Credentials {
>>>>>>>
const CREDENTIALS_TTL = 50 * 60 * 1000; // 50 min, can be modified on config if required in the future
export class CredentialsCl... |
<<<<<<<
const packageInfo = require('../../package.json');
=======
import { version } from '../../package.json';
import { appendToUserAgent } from '@aws-sdk/util-user-agent-browser';
>>>>>>>
const packageInfo = require('../../package.json');
import { appendToUserAgent } from '@aws-sdk/util-user-agent-browser'; |
<<<<<<<
import { Amplify, ConsoleLogger as Logger, Credentials } from '@aws-amplify/core';
=======
import Amplify, { ConsoleLogger as Logger, Credentials } from '@aws-amplify/core';
import Auth from '@aws-amplify/auth';
>>>>>>>
import { Amplify, ConsoleLogger as Logger, Credentials } from '@aws-amplify/core';
import... |
<<<<<<<
/**
* JWK Key Format string (Type MUST be defined for window crypto APIs)
*/
export const KEY_FORMAT_JWK = "jwk";
=======
// JWK Key Format string (Type MUST be defined for window crypto APIs)
export const KEY_FORMAT_JWK = "jwk";
// Supported wrapper SKUs
export enum WrapperSKU {
React = "@azure/msal-r... |
<<<<<<<
public sendMFACode(confirmationCode: string, callbacks: { onSuccess: (session: CognitoUserSession) => void, onFailure: (err: any) => void }, mfaType: string): void;
public forgetDevice(callbacks: {onSuccess: (success: string) => void, onFailure: (err: Error) => void}): void;
public forge... |
<<<<<<<
@Input() authState: AuthState;
@Input() hide: string[] = [];
=======
@Input() authState: AuthState;
>>>>>>>
@Input() authState: AuthState;
@Input() hide: string[] = [];
<<<<<<<
let authComponent = this.framework && this.framework.toLowerCase() === 'ionic' ? new ComponentMount(ForgotPasswordCom... |
<<<<<<<
@Input() signUpConfig: any;
=======
@Input() hide: string[] = [];
>>>>>>>
@Input() signUpConfig: any;
@Input() hide: string[] = [];
<<<<<<<
const authComponent = this.framework && this.framework.toLowerCase() === 'ionic' ?
new ComponentMount(SignUpComponentIonic, {
authState: this.auth... |
<<<<<<<
import { includes, labelMap, composePhoneNumber } from '../common';
import { UsernameAttributes, UsernameFieldOutput } from '../types';
=======
import { includes } from '../common';
import { auth } from '../../../assets/data-test-attributes';
>>>>>>>
import { includes, labelMap, composePhoneNumber } from '..... |
<<<<<<<
=======
AWSKinesisFirehoseProvider,
AmazonPersonalizeProvider,
>>>>>>>
AWSKinesisFirehoseProvider,
AmazonPersonalizeProvider,
<<<<<<<
/**
* @deprecated use named import
*/
export default Amplify;
=======
export {
Auth,
Analytics,
Storage,
API,
PubSub,
I18n,
Logger,
Hub,
Cache,
JS,
ClientD... |
<<<<<<<
identityPoolId: "awsCognitoIdentityPoolId",
mandatorySignIn: false,
};
=======
identityPoolId: "awsCognitoIdentityPoolId",
mandatorySignIn: false
}
>>>>>>>
identityPoolId: "awsCognitoIdentityPoolId",
mandatorySignIn: false
}
<<<<<<<
identityPoolId: "awsCognitoIdentityPoolId"
};
... |
<<<<<<<
import { Component, Input } from '@angular/core';
import { AmplifyService, AuthState } from '../../../providers';
import { UsernameAttributes } from '../types';
import { countrylist, country } from '../../../assets/countries';
import { emailFieldTemplate, usernameFieldTemplate, phoneNumberFieldTemplate } from ... |
<<<<<<<
<div class="amplify-form-container" *ngIf="_show">
<div class="amplify-form-body">
<div class="amplify-form-row" *ngIf="!shouldHide('SignIn')">
<div class="amplify-form-cell-left">
<a class="amplify-form-link"
(click)="onSignIn()"
>Back to Sign In</a>
=======
<div class=... |
<<<<<<<
// for backward compatibility
if (!this._config['AWSPinpoint']) {
this._config['AWSPinpoint'] = Object.assign({}, this._config);
}
=======
>>>>>>> |
<<<<<<<
<amplify-auth-sign-in-ionic
*ngIf="!shouldHide('SignIn')"
[authState]="authState"
></amplify-auth-sign-in-ionic>
<amplify-auth-sign-up-ionic
*ngIf="!shouldHide('SignUp')"
[authState]="authState"
[signUpConfig]="_signUpConfig"
></amplify-auth-sign-up-ionic>
<amplify-auth-confirm-sign-up-ionic
*ngIf... |
<<<<<<<
},
userTimeoutReached: {
code: "user_timeout_reached",
desc: "User defined timeout for device code polling reached",
=======
},
tokenClaimsRequired: {
code: "token_claims_cnf_required_for_signedjwt",
desc: "Cannot generate a POP jwt if the token_claims are not p... |
<<<<<<<
CognitoUser.prototype.getUsername = () => {
return 'username';
}
=======
CognitoUser.prototype.getUserData = (callback) => {
callback(null, 'data');
}
>>>>>>>
CognitoUser.prototype.getUsername = () => {
return 'username';
}
CognitoUser.prototype.getU... |
<<<<<<<
// Auth
if (config['aws_cognito_identity_pool_id'] || config['aws_user_pools_id']) {
amplifyConfig.Auth = {
userPoolId: config['aws_user_pools_id'],
userPoolWebClientId: config['aws_user_pools_web_client_id'],
region: config['aws_cognito_region'],
identityPoolId: config['aws_cognito_identity_poo... |
<<<<<<<
[usernameAttributes]="_usernameAttributes"
=======
[hide]="hide"
>>>>>>>
[usernameAttributes]="_usernameAttributes"
[hide]="hide"
<<<<<<<
[usernameAttributes]="_usernameAttributes"
=======
[hide]="hide"
>>>>>>>
[usernameAttributes]="_usernameAttributes"
[hi... |
<<<<<<<
import { appendToUserAgent } from '@aws-sdk/util-user-agent-browser';
const BASE_USER_AGENT = `aws-amplify/${version}`;
=======
>>>>>>>
const BASE_USER_AGENT = `aws-amplify/${version}`; |
<<<<<<<
<div>
<amplify-auth-sign-in-ionic [authState]="authState"></amplify-auth-sign-in-ionic>
</div>
<div>
<amplify-auth-sign-up-ionic
*ngIf="!shouldHide('SignUp')"
[authState]="authState"
[hide]="hide"
></amplify-auth-sign-up-ionic>
</div>
<div>
<amplify-auth-confirm-sign-... |
<<<<<<<
const {
userPoolId,
userPoolWebClientId,
cookieStorage,
oauth,
region,
identityPoolId,
mandatorySignIn
} = this._config;
=======
const { userPoolId, userPoolWebClientId, cookieStorage, oauth, r... |
<<<<<<<
import {OracleDriver} from "../driver/oracle/OracleDriver";
=======
import {EntitySchema} from "../";
>>>>>>>
import {EntitySchema} from "../";
import {OracleDriver} from "../driver/oracle/OracleDriver"; |
<<<<<<<
import {Constants, SSOTypes} from "./Constants";
import { AuthenticationParameters, QPDict } from "./AuthenticationParameters";
=======
import {Constants, SSOTypes, PromptState} from "./Constants";
import { AuthenticationParameters } from "./AuthenticationParameters";
>>>>>>>
import {Constants, SSOTypes, Pro... |
<<<<<<<
import {EntityManager} from "../../entity-manager/EntityManager";
=======
import {OrmUtils} from "../../util/OrmUtils";
import {InsertResult} from "../InsertResult";
>>>>>>>
import {OrmUtils} from "../../util/OrmUtils";
<<<<<<<
import {Broadcaster} from "../../subscriber/Broadcaster";
=======
import {Tabl... |
<<<<<<<
const column = this.expressionMap.aliasNamePrefixingEnabled
? this.expressionMap.mainAlias!.name + "." + metadata.discriminatorColumn.databaseName
: metadata.discriminatorColumn.databaseName;
const condition = `${this.replacePropertyNames(... |
<<<<<<<
import {UniqueMetadata} from "./UniqueMetadata";
=======
import {TreeType} from "./types/TreeTypes";
import {TreeMetadataArgs} from "../metadata-args/TreeMetadataArgs";
>>>>>>>
import {TreeType} from "./types/TreeTypes";
import {TreeMetadataArgs} from "../metadata-args/TreeMetadataArgs";
import {UniqueMetada... |
<<<<<<<
if (alias.metadata.discriminatorColumn) {
const discriminatorValues = rawResults.map(result => result[this.buildColumnAlias(alias.name, alias.metadata.discriminatorColumn!.databaseName)]);
const metadata = alias.metadata.childEntityMetadatas.find(childEntityMetadata => {
=======... |
<<<<<<<
import {ColumnOptions} from "../decorator/options/ColumnOptions";
import {ForeignKeyMetadata} from "../metadata/ForeignKeyMetadata";
import {LazyRelationsWrapper} from "../lazy-loading/LazyRelationsWrapper";
import {UniqueMetadata} from "../metadata/UniqueMetadata";
=======
>>>>>>>
import {UniqueMetadata} fr... |
<<<<<<<
import {Broadcaster} from "../subscriber/Broadcaster";
=======
import {SqlInMemory} from "../driver/SqlInMemory";
import {TableUnique} from "../schema-builder/table/TableUnique";
>>>>>>>
import {SqlInMemory} from "../driver/SqlInMemory";
import {TableUnique} from "../schema-builder/table/TableUnique";
import... |
<<<<<<<
await Promise.all(entities.map(async (entity, entityIndex) => {
if (this.queryRunner.connection.driver instanceof OracleDriver && insertResult.raw instanceof Array && this.expressionMap.extraReturningColumns.length > 0) {
insertResult.raw = insertResult.raw.reduce((newRaw, ra... |
<<<<<<<
this.isCascadeInsert = args.options.cascade === true || (args.options.cascade instanceof Array && args.options.cascade.indexOf("insert") !== -1);
this.isCascadeUpdate = args.options.cascade === true || (args.options.cascade instanceof Array && args.options.cascade.indexOf("update") !== -1);
... |
<<<<<<<
import { getDefaultRollup } from './validations';
import { ConfigOptions, RollupSettings } from './types';
=======
import { SettingsOptions, RollupConfig } from './types';
>>>>>>>
import { getDefaultRollup } from './validations';
import { SettingsOptions, RollupSettings } from './types'; |
<<<<<<<
constructor({ context, worker = false, configOptions = {} }) {
=======
hookInterface: any;
shortcodes: ShortcodeDefs;
constructor({ context, worker = false }) {
>>>>>>>
hookInterface: any;
shortcodes: ShortcodeDefs;
constructor({ context, worker = false, configOptions = {} }) {
<<<<<<<
... |
<<<<<<<
import { UnifiedCacheManager } from "../cache/UnifiedCacheManager";
import { AccountEntity } from "../cache/entities/AccountEntity";
import { IAccount } from "../account/IAccount";
import { AccountCache, InMemoryCache } from "../cache/utils/CacheTypes";
=======
import { UnifiedCacheManager } from "../unifiedC... |
<<<<<<<
import type { ConfigOptions, PluginOptions, RollupSettings, ShortcodeDef } from './types';
=======
import type { SettingsOptions, PluginOptions, ShortcodeDef } from './types';
>>>>>>>
import type { SettingsOptions, PluginOptions, ShortcodeDef, RollupSettings } from './types';
<<<<<<<
const rollupSchema = yu... |
<<<<<<<
import type { SettingsOptions, PluginOptions } from './types';
import type { ShortcodeDef } from '../shortcodes/types';
=======
import type { SettingsOptions, PluginOptions, ShortcodeDef, RollupSettings } from './types';
>>>>>>>
import type { SettingsOptions, PluginOptions, RollupSettings } from './types';
i... |
<<<<<<<
export class Size extends ValueWithRandom implements ISize, IOptionLoader<ISize> {
=======
/**
* [[include:Options/Particles/Size.md]]
* @category Options
*/
export class Size implements ISize, IOptionLoader<ISize> {
>>>>>>>
/**
* [[include:Options/Particles/Size.md]]
* @category Options
*/
export clas... |
<<<<<<<
import {Canvas} from "./Canvas";
import {EventListeners} from "./Utils/EventListeners";
import type {IRepulse} from "../Interfaces/IRepulse";
import type {IBubble} from "../Interfaces/IBubble";
import type {IImage} from "../Interfaces/IImage";
import type {IContainerInteractivity} from "../Interfaces/IContainer... |
<<<<<<<
import { Trail } from "../Trail";
import type { RecursivePartial } from "../../../../Types";
import { Noise } from "../Noise/Noise";
=======
import { Trail } from "./Trail";
import type { RecursivePartial } from "../../../../Types/RecursivePartial";
import { Noise } from "./Noise/Noise";
>>>>>>>
import { Tra... |
<<<<<<<
import { toggle } from './toggle';
=======
import { tab } from './tab';
import toggle from './toggle';
>>>>>>>
import { toggle } from './toggle';
import { tab } from './tab';
<<<<<<<
const toggleClasses = toggle(context);
=======
const tabClasses = tab(context);
>>>>>>>
const toggleClasses = toggle... |
<<<<<<<
import { getIPFSURL } from './get-ipfs-url';
=======
import path = require('path');
>>>>>>>
import { getIPFSURL } from './get-ipfs-url';
import path = require('path');
<<<<<<<
const path = getRoot();
=======
const root = getRoot()
>>>>>>>
const root = getRoot();
<<<<<<<
`${path}/.decentraland/l... |
<<<<<<<
import {
readBody,
cleanUrl,
isExternalUrl,
bareImportRE,
removeQueryTimestamp
} from '../utils'
=======
import { clientPublicPath } from './serverPluginClient'
import { readBody, cleanUrl, isExternalUrl, bareImportRE } from '../utils'
>>>>>>>
import { clientPublicPath } from './serverPluginClient'... |
<<<<<<<
Highcharts.charts[this.quoteChart].series[3].addPoint([time, this.positionData.quoteAmount], false);
Highcharts.charts[this.quoteChart].series[4].addPoint([time, this.positionData.quoteHeldAmount], this.showStats);
Highcharts.charts[this.baseChart].series[0].addPoint([time, this.positionData.v... |
<<<<<<<
KEEPALIVE,
=======
SUBSCRIPTION_KEEPALIVE,
SUBSCRIPTION_END,
>>>>>>>
KEEPALIVE,
SUBSCRIPTION_END,
<<<<<<<
it('sends back any type of error', function (done) {
const client = new SubscriptionClient(`ws://localhost:${TEST_PORT}/`);
=======
it('does not crash on unsub for Object.prototype m... |
<<<<<<<
import * as Backoff from 'backo2';
import {EventEmitter, ListenerFn} from 'eventemitter3';
import {MiddlewareInterface} from './middleware';
=======
>>>>>>>
<<<<<<<
private subscriptionTimeout: number;
private waitingSubscriptions: {[id: string]: boolean}; // subscriptions waiting for SUBSCRIPTION_SUC... |
<<<<<<<
const KEEP_ALIVE_TEST_PORT = TEST_PORT + 1;
const DELAYED_TEST_PORT = TEST_PORT + 2;
const CAPTURE_TEST_PORT = TEST_PORT + 3;
=======
const KEEP_ALIVE_TEST_PORT = TEST_PORT + 1;
const DELAYED_TEST_PORT = TEST_PORT + 2;
const RAW_TEST_PORT = TEST_PORT + 4;
>>>>>>>
const KEEP_ALIVE_TEST_PORT = TEST_PORT + 1;
c... |
<<<<<<<
this.wsServer.on('connection', (socket: WebSocket) => {
// NOTE: the old GRAPHQL_SUBSCRIPTIONS protocol support should be removed in the future
if (socket.protocol === undefined ||
(socket.protocol.indexOf(GRAPHQL_WS) === -1 && socket.protocol.indexOf(GRAPHQL_SUBSCRIPTIONS) === -1)) {
... |
<<<<<<<
const connectionSubscriptions: ConnectionSubscriptions = {};
const connectionContext: ConnectionContext = {};
request.on('message', this.onMessage(request, connectionSubscriptions, connectionContext));
request.on('close', () => {
this.onClose(request, connectionSubscriptions)();
... |
<<<<<<<
getUpdateMenuItem(): MenuOpts {
// TODO - localization
if (AppUpdater.status === UpdateStatus.UpdateReadyToInstall) {
return {
id: 'auto-update',
label: 'Restart to Update...',
click: () => AppUpdater.quitAndInstall(),
enabled: true,
};
} else if (AppUp... |
<<<<<<<
AppUpdater.on('update-available', async (update: UpdateInfo) => {
=======
AppUpdater.on('checking-for-update', async (...args) => {
await AppMenuBuilder.refreshAppUpdateMenu();
});
AppUpdater.on('update-available', async (update: UpdateInfo) => {
await AppMenuBuilder.refreshAppUpdateMenu();
>>>>>>>
App... |
<<<<<<<
import { FileInfo, SharedConstants } from '@bfemulator/app-shared';
=======
import { FileInfo } from '@bfemulator/app-shared';
import { CommandService } from '@bfemulator/sdk-shared';
>>>>>>>
import { FileInfo, SharedConstants } from '@bfemulator/app-shared';
import { CommandService } from '@bfemulator/sdk-s... |
<<<<<<<
width: safeLowerBound(settings.windowState.width, 0),
height: safeLowerBound(settings.windowState.height, 0),
x: safeLowerBound(settings.windowState.left, 0),
y: safeLowerBound(settings.windowState.top, 0)
=======
width: initBounds.width,
... |
<<<<<<<
import { SharedConstants, newNotification, Notification } from '@bfemulator/app-shared';
=======
import { PersistentSettings, Settings, SharedConstants } from '@bfemulator/app-shared';
>>>>>>>
import { PersistentSettings, Settings, SharedConstants, newNotification, Notification } from '@bfemulator/app-shared... |
<<<<<<<
=======
import StoreBackend from "../../data/StoreBackend"
import { Hypermerge } from "../../modules/hypermerge"
import CloudClient from "../../modules/discovery-cloud/Client"
let racf = require("random-access-chrome-file")
import { setupControlPanel, toggleControl } from "./control"
process.hrtime = requir... |
<<<<<<<
import StoreBackend from "./data/StoreBackend"
let commandWindow: chrome.app.window.AppWindow
=======
// This should be a real typescript file but we're having trouble
// finding the AppWindow type which has a contentWindow on it.
let mainWindow: chrome.app.window.AppWindow
>>>>>>>
import StoreBackend from ... |
<<<<<<<
=======
if (docId.startsWith("98bbA")) {
console.log("CHANGE", docId, changes)
}
>>>>>>>
<<<<<<<
for (const docId in this.docHandles) {
const handle = this.docHandles[docId]
const connections = handle.connections()
=======
port.onDisconnect.addListener(() =>
... |
<<<<<<<
import { Log } from "./log";
const log = new Log("DiscordBot");
=======
import {UserSyncroniser} from "./usersyncroniser";
>>>>>>>
import { Log } from "./log";
import {UserSyncroniser} from "./usersyncroniser";
const log = new Log("DiscordBot");
<<<<<<<
const jsLog = new Log("discord.js");
cli... |
<<<<<<<
public determineCodeLanguage: boolean = false;
=======
public disableInviteNotifications: boolean = false;
>>>>>>>
public disableInviteNotifications: boolean = false;
public determineCodeLanguage: boolean = false; |
<<<<<<<
client.on("messageDelete", (msg) => {this.DeleteDiscordMessage(msg); });
=======
client.on("guildMemberAdd", (newMember) => { this.AddGuildMember(newMember); });
client.on("guildMemberRemove", (oldMember) => { this.RemoveGuildMember(oldMember); });
client.on("guildMemberUpdate", (_, ne... |
<<<<<<<
/* Caches */
private roomIdsForGuildCache: Map<string, {roomIds: string[], ts: number}>;
=======
private provisioner: Provisioner;
>>>>>>>
private provisioner: Provisioner;
/* Caches */
private roomIdsForGuildCache: Map<string, {roomIds: string[], ts: number}>; |
<<<<<<<
public static GetUrlFromMxc(mxc: string, homeserverUrl: string, width: number = 0,
height: number = 0, method: "crop"|"scale" = "crop"): string {
const part = mxc.substr("mxc://".length);
if (width || height) {
let u = `${homeserverUrl}/_matrix/med... |
<<<<<<<
private isEmbedInBody(msg: Discord.Message, embed: Discord.MessageEmbed): boolean {
if (!embed.url) {
return false;
}
return msg.content.includes(embed.url);
}
}
=======
>>>>>>> |
<<<<<<<
let ATTACHMENT = {} as any;
let MSGTYPE = "";
let SENT_MSG_CONTENT = {} as any;
=======
>>>>>>>
let ATTACHMENT = {} as any;
let MSGTYPE = "";
let SENT_MSG_CONTENT = {} as any;
<<<<<<<
ATTACHMENT = {};
MSGTYPE = "";
SENT_MSG_... |
<<<<<<<
import { IMatrixEvent, IMatrixMediaInfo, IMatrixMessage } from "./matrixtypes";
=======
import { IMatrixEvent, IMatrixMediaInfo } from "./matrixtypes";
import { Appservice, Intent } from "matrix-bot-sdk";
>>>>>>>
import { IMatrixEvent, IMatrixMediaInfo, IMatrixMessage } from "./matrixtypes";
import { Appserv... |
<<<<<<<
import { IRoomStoreEntry } from "./db/roomstore";
import { Appservice, MatrixClient } from "matrix-bot-sdk";
import { DiscordStore } from "./store";
=======
import { TimedCache } from "./structures/timedcache";
import { MetricPeg } from "./metrics";
>>>>>>>
import { IRoomStoreEntry } from "./db/roomstore";
... |
<<<<<<<
log.info(`Skipping event due to age ${event.unsigned.age} > ${AGE_LIMIT}`);
=======
// throw new Unstable.EventTooOldError(
// `Skipping event due to age ${event.unsigned.age} > ${AGE_LIMIT}`,
// );
return;
>>>>>>>
log.info(`Skipping... |
<<<<<<<
import { DiscordBridgeConfig } from "./config";
=======
import { DiscordBridgeConfig, DiscordBridgeConfigChannelDeleteOptions } from "./config";
import { Bridge } from "matrix-appservice-bridge";
>>>>>>>
import { DiscordBridgeConfig, DiscordBridgeConfigChannelDeleteOptions } from "./config";
<<<<<<<
... |
<<<<<<<
import { AppserviceMock } from "./mocks/appservicemock";
import { MockUser } from "./mocks/user";
=======
import { MockChannel } from "./mocks/channel";
>>>>>>>
import { AppserviceMock } from "./mocks/appservicemock";
import { MockUser } from "./mocks/user";
import { MockChannel } from "./mocks/channel";
imp... |
<<<<<<<
public nickname: string;
=======
public roles = [];
>>>>>>>
public nickname: string;
public roles = []; |
<<<<<<<
// 2020-12-07: If this fails to build in TypeScript with
// "Namespace 'serveStatic' has no exported member 'RequestHandlerConstructor'.",
// remove @types/express-serve-static-core and @types/serve-static from yarn.lock
// and run yarn.
// See https://github.com/DefinitelyTyped/DefinitelyTy... |
<<<<<<<
import * as cliArgs from "command-line-args";
import * as usage from "command-line-usage";
import * as uuid from "uuid/v4";
import { IMatrixEvent } from "./matrixtypes";
=======
import { MetricPeg, PrometheusBridgeMetrics } from "./metrics";
>>>>>>>
import * as cliArgs from "command-line-args";
import * as u... |
<<<<<<<
public async resolveEndpointsAsync(telemetryManager?: TelemetryManager, correlationId?: string): Promise<ITenantDiscoveryResponse> {
=======
public async resolveEndpointsAsync(telemetryManager: TelemetryManager, correlationId: string): Promise<Authority> {
>>>>>>>
public async resolveEndpointsAsy... |
<<<<<<<
import { MatrixClient } from "matrix-bot-sdk";
=======
import { Client as MatrixClient } from "matrix-js-sdk";
import {
IMatrixMessageParserCallbacks,
IMatrixMessageParserOpts,
MatrixMessageParser,
} from "matrix-discord-parser";
>>>>>>>
import { MatrixClient } from "matrix-bot-sdk";
import {
... |
<<<<<<<
import { CompletionItemProvider, TextDocument, Position, CompletionItem, CompletionItemKind, workspace } from 'vscode'
import { readFile, statSync } from 'fs';
import { join, resolve as pathResolve, dirname as pathDir } from 'path';
=======
import { CompletionItemProvider, TextDocument, Position, CompletionIt... |
<<<<<<<
import { RadioButtonModule } from 'app/lib/radio-button/radio-button.module';
import { RadioButtonDemoComponent } from 'app/lib/radio-button/radio-button-demo/radio-button-demo.component';
=======
import { IconModule } from '../lib/icon';
import { FormsModule } from '@angular/forms';
import { HomeComponent } ... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.