conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
import {FileController} from "./Controller/FileController";
import {AdminController} from "./Controller/AdminController";
=======
import {DebugController} from "./Controller/DebugController";
import {App as uwsApp} from "./Server/sifrr.server";
>>>>>>>
import {FileController} from "./Controller/FileControlle... |
<<<<<<<
private previousConstraint : MediaStreamConstraints;
private focused : boolean = true;
private lastUpdateScene : Date = new Date();
private setTimeOutlastUpdateScene? : NodeJS.Timeout;
=======
private discussionManager: DiscussionManager;
private userInputManager?: UserInputManager;... |
<<<<<<<
private previousConstraint : MediaStreamConstraints;
private focused : boolean = true;
private lastUpdateScene : Date = new Date();
private setTimeOutlastUpdateScene? : NodeJS.Timeout;
=======
private hasCamera = true;
>>>>>>>
private previousConstraint : MediaStreamConstraints;
... |
<<<<<<<
import {FileController} from "./Controller/FileController";
=======
import {AdminController} from "./Controller/AdminController";
>>>>>>>
import {FileController} from "./Controller/FileController";
import {AdminController} from "./Controller/AdminController"; |
<<<<<<<
export class MapController extends BaseController{
=======
//todo: delete this
export class MapController {
App: Application;
>>>>>>>
//todo: delete this
export class MapController extends BaseController{ |
<<<<<<<
import Jwt, {JsonWebTokenError} from "jsonwebtoken";
import {
SECRET_KEY,
MINIMUM_DISTANCE,
GROUP_RADIUS,
ALLOW_ARTILLERY,
ADMIN_API_URL,
ADMIN_API_TOKEN
} from "../Enum/EnvironmentVariable"; //TODO fix import by "_Enum/..."
import {World} from "../Model/World";
=======
import {MINIMUM... |
<<<<<<<
import {DEBUG_MODE, POSITION_DELAY, ZOOM_LEVEL} from "../../Enum/EnvironmentVariable";
import {
ITiledMap,
ITiledMapLayer,
ITiledMapLayerProperty, ITiledMapObject,
ITiledTileSet
} from "../Map/ITiledMap";
=======
import {DEBUG_MODE, POSITION_DELAY, RESOLUTION, ZOOM_LEVEL} from "../../Enum/Envi... |
<<<<<<<
export var pdfPageSelection = "pdfPageSelection";
=======
export var serifGroupSet = "serifGroupSet";
>>>>>>>
export var pdfPageSelection = "pdfPageSelection";
export var serifGroupSet = "serifGroupSet"; |
<<<<<<<
* Returns the current flighting assignment for the user
*/
protected getFlightingAssignments(clipperId: string): Promise<any> {
let fetchNonLocalData = () => {
return new Promise<ResponsePackage<string>>((resolve, reject) => {
let userFlightUrl = UrlUtils.addUrlQueryValue(Constants.Urls.userFlight... |
<<<<<<<
guilds: new Map(),
channels: new Map(),
messages: new Map(),
unavailableGuilds: new Map(),
};
async function cleanMessageCache() {
// Find all messages for each channel and if more than 100 we need to remove the oldest messages.
const messagesPerChannel = new Map<string, Message[]>();
for (const... |
<<<<<<<
export const memberHasPermission = (
memberID: string,
ownerID: string,
roleData: RoleData[],
memberRoleIDs: string[],
=======
export function memberHasPermission(
member_id: string,
owner_id: string,
role_data: RoleData[],
member_role_ids: string[],
>>>>>>>
export function memberHasPermissio... |
<<<<<<<
return axios.post(this.searchUrl(), this.query)
=======
return axios.get(this.searchUrl(), this.query)
.then((response)=>{
this.results = response.data
this.resultsListener.onNext(this.results)
return this.results
})
>>>>>>>
return axios.post(this.searchUrl(), this.query)
.then((re... |
<<<<<<<
let current = containerElement.firstChild;
if (current) {
let parent = current.parentElement;
let nextNode;
do {
nextNode = current.nextSibling;
parent.removeChild(current);
current = nextNode;
} while (current);
}
app.renderComponent('PpmClient', containerElement, null);
=======
app.re... |
<<<<<<<
import { ChangeType, Color, Device, KeyedTemplate, ObservableArray, profile, Property, Screen, StackLayout, View, Trace } from "@nativescript/core";
import * as types from "@nativescript/core/utils/types";
import { layout } from "@nativescript/core/utils/utils";
=======
import {ChangeType, ObservableArray} fr... |
<<<<<<<
export function renderHook<P, R>(
callback: (props: P) => R,
options?: RenderHookOptions<P>
): RenderHookResult<P, R>
export const testHook: typeof renderHook
=======
>>>>>>>
export function renderHook<P, R>(
callback: (props: P) => R,
options?: RenderHookOptions<P>
): RenderHookResult<P, R> |
<<<<<<<
['screen_height_in', data.params.screen_height_in],
['screen_height_px', data.params.screen_height_px],
=======
['screen_height_in', data.params.screen_height_px],
['screen_height_px', data.params.screen_height_px]... |
<<<<<<<
const parser: nearley.Parser = new nearley.Parser(nearley.Grammar.fromCompiled(EntryPointTemplate.default));
parser.feed(params);
=======
const parser: nearley.Parser = new nearley.Parser(nearley.Grammar.fromCompiled(EntryPointTemplate));
parser.feed(TezosLanguageUtil.normalize... |
<<<<<<<
import { percySnapshot } from 'ember-percy';
=======
import { selectChoose, selectSearch } from 'ember-power-select/test-support';
>>>>>>>
import { percySnapshot } from 'ember-percy';
import { selectChoose, selectSearch } from 'ember-power-select/test-support'; |
<<<<<<<
import { TezosConseilClient } from '../../../reporting/tezos/TezosConseilClient'
import { ConseilServerInfo } from 'types/conseil/QueryTypes';
import { ContractMapDetailsItem } from 'types/conseil/ConseilTezosTypes';
=======
import { TezosParameterFormat } from '../../../types/tezos/TezosChainTypes';
>>>>>>>... |
<<<<<<<
import idNormalizer, {TYPE_ID} from 'src/normalizers/id'
import {defaultTimeRange} from 'src/shared/data/timeRanges'
import {
Dashboard,
TimeRange,
Cell,
Source,
Template,
URLQueries,
} from 'src/types'
import {CellType, DashboardName} from 'src/types/dashboard'
=======
import {Dashboard, TimeRa... |
<<<<<<<
onChooseValue: (item: TemplateValue) => void
=======
onUpdateDefaultTemplateValue: (v: string) => void
notify?: (message: Notification) => void
>>>>>>>
onUpdateDefaultTemplateValue: (item: TemplateValue) => void
notify?: (message: Notification) => void |
<<<<<<<
import { BattleStatusWindow } from "../windows/battle/BattleStatusWindow";
=======
import { ability_categories } from "../Ability";
>>>>>>>
import { BattleStatusWindow } from "../windows/battle/BattleStatusWindow";
import { ability_categories } from "../Ability"; |
<<<<<<<
export default class InstitutionModel extends OsfModel {
=======
export interface Assets {
logo: string;
}
/**
* Model for OSF APIv2 institutions. This model may be used with one of several API endpoints. It may be queried
* directly, or accessed via relationship fields.
*
* @class Institution
*/
ex... |
<<<<<<<
import { UserState } from './user/reducers/user.state';
import { CheckoutState } from './checkout/reducers/checkout.state';
=======
import { CartState } from './checkout/cart/reducers/cart-state';
import { SearchState } from './home/reducers/search.state';
>>>>>>>
import { UserState } from './user/reducers/u... |
<<<<<<<
private emit(result: CompilationResult, callback: ts.WriteFileCallback) {
const emitOutput = this.program.emit(
undefined,
callback,
undefined,
false,
this.finalTransformers ? this.finalTransformers(this.program) : undefined,
);
=======
private emit(result: CompilationResult, preEmitDiagn... |
<<<<<<<
let tsConfigContent: tsConfig.TsConfig = undefined;
let projectDirectory = process.cwd();
=======
let tsConfigContent: TsConfig = undefined;
>>>>>>>
let tsConfigContent: TsConfig = undefined;
let projectDirectory = process.cwd(); |
<<<<<<<
import {OrdersComponent} from "./orders/orders.component";
=======
import {WorkerSettingsComponent} from "./worker-settings/worker-settings.component";
import {WorkerSettingsResolverService} from "./worker-settings/services/worker-settings-resolver.service";
>>>>>>>
import {OrdersComponent} from "./orders/or... |
<<<<<<<
'service:status-messages',
=======
'service:toast',
'service:ready',
>>>>>>>
'service:status-messages',
'service:toast',
'service:ready', |
<<<<<<<
'service:analytics',
=======
'service:features',
>>>>>>>
'service:features',
'service:analytics', |
<<<<<<<
frameComponent: FunctionalFrameComponent | React.Component;
=======
tabs: EmbeddedWidget[] | undefined;
frameComponent: {
forceUpdate(): void,
createNew?(oldEntity: EntityPack<ModifiableEntity>): (Promise<EntityPack<ModifiableEntity> | undefined>) | undefined
};
>>>>>>>
frameComponent: Func... |
<<<<<<<
queryName: any;
parentColumn?: string;
parentValue?: any;
=======
queryName: PseudoType | QueryKey;
simpleColumnName?: string;
simpleValue?: any;
>>>>>>>
queryName: PseudoType | QueryKey;
parentColumn?: string;
parentValue?: any; |
<<<<<<<
frameComponent: {
forceUpdate(): void,
createNew?(): (Promise<EntityPack<ModifiableEntity> | undefined>) | undefined
};
entityComponent: React.Component | null | undefined;
pack: EntityPack<ModifiableEntity> | undefined;
=======
frameComponent: React.Component<any, any>;
entityComponent: R... |
<<<<<<<
render() {
=======
protected render() {
const classes = {
'mdc-top-app-bar--fixed':
this.type === 'fixed' || this.type === 'prominentFixed',
'mdc-top-app-bar--short':
this.type === 'shortCollapsed' || this.type === 'short',
'mdc-top-app-bar--short-collapsed': this... |
<<<<<<<
protected resetFoundation() {
if (this.mdcFoundation) {
this.mdcFoundation.destroy();
this.mdcFoundation.init();
}
}
=======
/**
* Layout is called on mousedown / touchstart as the dragging animations of
* slider are calculated based off of the bounding rect which can change
... |
<<<<<<<
(reason: string, matchingIdentities: ReadonlyArray<Identity>): Promise<ReadonlyArray<Identity>>;
=======
(reason: string, matchingIdentities: ReadonlyArray<PublicIdentity>, meta?: any): Promise<
ReadonlyArray<PublicIdentity>
>;
>>>>>>>
(reason: string, matchingIdentities: ReadonlyArray<Identity>,... |
<<<<<<<
options: Ed25519Keypair | ReadonlyArray<Slip10RawIndex> | number,
): Promise<Identity> {
=======
options: Ed25519Keypair | readonly Slip10RawIndex[] | number,
): Promise<PublicIdentity> {
>>>>>>>
options: Ed25519Keypair | readonly Slip10RawIndex[] | number,
): Promise<Identity> {
<<<<<<<
... |
<<<<<<<
options: 'Options',
=======
required: 'Required',
optional: 'Optional',
>>>>>>>
required: 'Required',
options: 'Options',
optional: 'Optional', |
<<<<<<<
import { SubscriptionEvent } from "../rpcclients";
/*** adaptor ***/
=======
>>>>>>>
import { SubscriptionEvent } from "../rpcclients"; |
<<<<<<<
Participant,
// Governance
ElectorProperties,
Electors,
Electorate,
Fraction,
ElectionRule,
VersionedId,
ProposalExecutorResult,
ProposalResult,
ProposalStatus,
Proposal,
// NFTs
BnsUsernamesByOwnerQuery,
=======
BnsBlockchainNft,
BnsBlockchainsByChainIdQuery,
BnsBlockchainsQ... |
<<<<<<<
import { ChainId, Nonce, PublicIdentity, SignedTransaction, TxCodec, UnsignedTransaction } from "@iov/bcp-types";
import { Slip10RawIndex } from "@iov/crypto";
=======
import { Nonce, SignedTransaction, TxCodec, UnsignedTransaction } from "@iov/bcp-types";
import { Ed25519Keypair, Slip10RawIndex } from "@iov/... |
<<<<<<<
import { ChainId, PrehashType, PublicIdentity, SignableBytes, SignatureBytes } from "@iov/bcp-types";
import { Slip10RawIndex } from "@iov/crypto";
=======
import { ChainId, PublicKeyBundle, SignatureBytes } from "@iov/base-types";
import { PrehashType, SignableBytes } from "@iov/bcp-types";
import { Ed25519K... |
<<<<<<<
ChainId,
=======
ConfirmedTransaction,
>>>>>>>
ChainId,
ConfirmedTransaction, |
<<<<<<<
export { ChainAddressPair, Participant, ElectorProperties, Electors, Electorate, Fraction, ElectionRule, VersionedId, ProposalExecutorResult, ProposalResult, ProposalStatus, Proposal, BnsUsernamesByOwnerQuery, BnsUsernamesByUsernameQuery, BnsUsernamesQuery, BnsUsernameNft, BnsTx, AddAddressToUsernameTx, CreateM... |
<<<<<<<
console.log(colors.yellow(" * from @iov/bns"));
console.log(colors.yellow(" - bnsCodec"));
console.log(colors.yellow(" - BnsConnection"));
console.log(colors.yellow(" - bnsConnector"));
console.log(colors.yellow(" - RegisterUsernameTx"));
console.log(colors.yellow(" * from @iov/core"))... |
<<<<<<<
private readonly identities: Identity[];
private readonly privkeyPaths: Map<IdentityId, ReadonlyArray<Slip10RawIndex>>;
=======
private readonly identities: PublicIdentity[];
private readonly privkeyPaths: Map<IdentityId, readonly Slip10RawIndex[]>;
>>>>>>>
private readonly identities: Identity[];
... |
<<<<<<<
const ganacheMnemonic: string =
"oxygen fall sure lava energy veteran enroll frown question detail include maximum";
const atomicSwapErc20ContractAddress = "0x9768ae2339B48643d710B11dDbDb8A7eDBEa15BC" as Address;
const ethereumBaseUrl: string = "http://localhost:8545";
=======
const ganacheMnemonic = "oxyge... |
<<<<<<<
import { generateMask, resolveResult, makeAuthorData } from "./util";
=======
>>>>>>>
import { generateMask, resolveResult, makeAuthorData } from "./util";
<<<<<<<
export interface Options {
results?: number;
mask?: number[];
excludeMask?: number[];
// getRatings?: boolean;
testMode?: boolean;
d... |
<<<<<<<
}
catch (e) {
this.showToast('Invalid username or password');
=======
} catch (e) {
const toast = this.toastCtrl.create({
message : 'Invalid username or password',
duration : 5000,
showCloseButton: true,
});
toast.present();
... |
<<<<<<<
if (this.channel.direct){
this.router.navigate(['direct', channelId], { relativeTo: this.route });
}else {
this.router.navigate(['channel', channelId], { relativeTo: this.route });
}
=======
this.router.navigate(['channel', channelId]);
>>>>>>>
if (this.channel.direct){
... |
<<<<<<<
server: '',
subscriptionServer: '?' // TODO set subscription server on production
=======
server: 'http://localhost:3000',
>>>>>>>
server: 'http://localhost:3000',
subscriptionServer: '?' // TODO set subscription server on production |
<<<<<<<
import { UnixTimeToStringPipe } from '../../pipes/unix-time-to-string';
=======
import { ServiceWorkerModule } from '@angular/service-worker';
import { PushNotificationsService } from './services/push-notifications.service';
import { UserDataService } from './services/user-data/user-data.service';
>>>>>>>
im... |
<<<<<<<
verifyEmail: {
merge: {
header: 'Merge account?',
body: 'Would you like to merge <strong>{{email}}</strong> into your account? This action is irreversible.',
verifyButton: 'Merge account',
denyButton: 'Do not merge account',
verifySuccess: ... |
<<<<<<<
const metricsPublishingEnabledFunc = glue42gd?.getMetricsPublishingEnabled;
const canUpdateMetric = metricsPublishingEnabledFunc ? metricsPublishingEnabledFunc : () => true;
=======
const identity = internalConfig.connection.identity;
>>>>>>>
const metricsPublishingEnabledFun... |
<<<<<<<
canUpdateMetric: () => boolean;
=======
system: string;
service: string;
instance: string;
>>>>>>>
canUpdateMetric: () => boolean;
system: string;
service: string;
instance: string; |
<<<<<<<
//export * from './colorpicker/index';
export * from './data-table/index';
=======
export * from './colorpicker/index';
>>>>>>>
export * from './colorpicker/index';
export * from './data-table/index'; |
<<<<<<<
node_blurb: {
fork: {
title: 'Forked:',
manage_contributors: 'Manage Contributors',
},
private_tooltip: 'This project is private',
},
forks: {
fork: 'Fork',
title: 'Forks',
back: 'Back to Analytics',
new: 'New fork',
... |
<<<<<<<
switch (longheader.getPacketType()) {
=======
var packetOffset: PacketOffset;
switch (header.getPacketType()) {
>>>>>>>
var packetOffset: PacketOffset;
switch (longheader.getPacketType()) {
<<<<<<<
return this.parseClientInitialPacket(connection, head... |
<<<<<<<
import {AntiMemLeak} from '../../core/anti-mem-leak';
=======
import {AwsSsoAccount} from '../../models/aws-sso-account';
>>>>>>>
import {AntiMemLeak} from '../../core/anti-mem-leak';
import {AwsSsoAccount} from '../../models/aws-sso-account'; |
<<<<<<<
import {AwsSsoAccount} from '../../models/aws-sso-account';
=======
import {environment} from '../../../environments/environment';
import {KeychainService} from '../../services-system/keychain.service';
>>>>>>>
import {environment} from '../../../environments/environment';
import {KeychainService} from '../.... |
<<<<<<<
this.workspaceService.credentialEmit.emit({status: err.stack, accountName: session.account.accountName});
});
=======
this.appService.logger('Error in Aws Credential process', LoggerLevel.ERROR, this, err.stack);
throw new Error(err);
});
>>>>>>>
this.appService.logg... |
<<<<<<<
import { Injectable } from '@angular/core';
import { NativeService } from './native-service';
=======
import {Injectable} from '@angular/core';
import {NativeService} from './native-service';
import {AppService, LoggerLevel} from './app.service';
>>>>>>>
import {Injectable} from '@angular/core';
import {Nati... |
<<<<<<<
import { InternalAddress } from '../address';
import { InternalCheckoutSelectors } from '../checkout';
=======
import { Address } from '../address';
>>>>>>>
import { Address } from '../address';
import { InternalCheckoutSelectors } from '../checkout';
<<<<<<<
updateAddress(address: InternalAddress, opti... |
<<<<<<<
const action = this._quoteActionCreator.loadQuote(options);
return this._store.dispatch(action);
}
loadConfig(options?: RequestOptions): Promise<CheckoutSelectors> {
const action = this._configActionCreator.loadConfig(options);
return this._store.dispatch(action, { que... |
<<<<<<<
updateAddressAction = Observable.of(createAction(UPDATE_BILLING_ADDRESS_REQUESTED));
submitOrderAction = Observable.of(createAction(OrderActionType.SubmitOrderRequested));
=======
updateAddressAction = Observable.of(createAction(BillingAddressActionTypes.UpdateBillingAddressRequested))... |
<<<<<<<
import { CheckoutActionType } from './checkout-actions';
import CheckoutRequestSender from './checkout-request-sender';
import { getCheckout } from './checkouts.mock';
=======
import createCheckoutClient from './create-checkout-client';
import 'rxjs/add/operator/toArray';
import 'rxjs/add/operator/toPromise';... |
<<<<<<<
import { InternalAddress } from '../../address';
import { CheckoutStore, InternalCheckoutSelectors } from '../../checkout';
=======
import { Address } from '../../address';
import { CheckoutSelectors, CheckoutStore } from '../../checkout';
>>>>>>>
import { Address } from '../../address';
import { CheckoutSto... |
<<<<<<<
import { CartActionCreator } from '../cart';
import { getDefaultLogger } from '../common/log';
import { getEnvironment } from '../common/utility';
=======
>>>>>>>
import { getDefaultLogger } from '../common/log';
import { getEnvironment } from '../common/utility';
<<<<<<<
new GiftCertificateActionCr... |
<<<<<<<
import { CountryRequestSender, CountryResponseBody } from '../geography';
import { InternalOrderResponseBody, OrderRequestBody, OrderRequestSender } from '../order';
import { PaymentMethodsResponseBody, PaymentMethodRequestSender, PaymentMethodResponseBody } from '../payment';
=======
import { CountryRequestS... |
<<<<<<<
import { InternalAddress } from '../../address';
import { CheckoutStore, InternalCheckoutSelectors } from '../../checkout';
import ShippingAddressActionCreator from '../shipping-address-action-creator';
import ShippingOptionActionCreator from '../shipping-option-action-creator';
=======
import { Address } fro... |
<<<<<<<
remote: {
customerMessage: string;
provider: string;
useStoreCredit: boolean;
};
phoneNumber: string;
=======
>>>>>>> |
<<<<<<<
=======
import { Coupon } from '../coupon';
import { Currency } from '../currency';
>>>>>>> |
<<<<<<<
loadCheckout(options?: RequestOptions): Promise<CheckoutSelectors> {
const action = this._quoteActionCreator.loadQuote(options);
return this._store.dispatch(action)
.then(() => this.getState());
=======
loadCheckout(id: string, options?: RequestOptions): Promise<CheckoutSe... |
<<<<<<<
return store => Observable.create((observer: Observer<PaymentStrategyExecuteAction>) => {
const state = store.getState();
const { payment = {} as Payment, useStoreCredit } = payload;
const meta = { methodId: payment.methodId };
=======
return store => {
... |
<<<<<<<
if (!cart) {
throw new MissingDataError();
}
this._verifyCart(cart, options)
.then(() => this._checkoutClient.submitOrder(this._mapToOrderRequestBody(payload), options))
=======
this._checkoutValidator.validate(cart, options)
... |
<<<<<<<
customerGroupId: number;
customerGroupName: string;
=======
>>>>>>>
<<<<<<<
phoneNumber: string;
=======
>>>>>>>
<<<<<<<
remote?: {
customerMessage?: string;
provider: string;
useStoreCredit?: boolean;
};
=======
remote?: {
billing: string;
... |
<<<<<<<
updateAddress(address: InternalAddress, options?: ShippingRequestOptions): ThunkAction<ShippingStrategyUpdateAddressAction> {
=======
updateAddress(address: Address, options: ShippingActionOptions = {}): ThunkAction<ShippingStrategyUpdateAddressAction> {
>>>>>>>
updateAddress(address: Address, op... |
<<<<<<<
import CheckoutErrorSelector from './checkout-error-selector';
import CheckoutSelector from './checkout-selector';
import CheckoutStatusSelector from './checkout-status-selector';
=======
import CheckoutStoreSelector from './checkout-store-selector';
import CheckoutStoreStatusSelector from './checkout-store-s... |
<<<<<<<
import { DEFAULT_PARTITION } from '../shared/regions/regionUtilities'
=======
import { SsmDocumentNode } from '../ssmDocument/explorer/ssmDocumentNode'
>>>>>>>
import { DEFAULT_PARTITION } from '../shared/regions/regionUtilities'
import { SsmDocumentNode } from '../ssmDocument/explorer/ssmDocumentNode' |
<<<<<<<
s3Client: S3Client
=======
ssmDocumentClient: SsmDocumentClient
>>>>>>>
s3Client: S3Client
ssmDocumentClient: SsmDocumentClient
<<<<<<<
s3Client: new MockS3Client({}),
=======
ssmDocumentClient: new MockSsmDocumentClient(),
>>>>>>>
s3Client: new MockS3C... |
<<<<<<<
public constructor(private readonly args: SamCliLocalInvokeInvocationArguments) {
this.args.skipPullImage = !!this.args.skipPullImage
=======
private readonly templateResourceName: string
private readonly templatePath: string
private readonly eventPath: string
private readonly envi... |
<<<<<<<
/**
* Validates debug configuration properties.
*/
function validateConfig(
folder: vscode.WorkspaceFolder | undefined,
config: AwsSamDebuggerConfiguration,
): boolean {
const cftRegistry = CloudFormationTemplateRegistry.getRegistry()
let rv: { isValid: boolean; message?: string } = { isValid... |
<<<<<<<
import { ExtContext } from './shared/extensions'
=======
import { activate as activateStepFunctions } from './stepFunctions/activation'
>>>>>>>
import { ExtContext } from './shared/extensions'
import { activate as activateStepFunctions } from './stepFunctions/activation'
<<<<<<<
extensionContext... |
<<<<<<<
const CLOUD9_APPNAME = 'AWS Cloud9'
export enum IDE {
vscode,
cloud9,
}
export function getIdeType(): IDE {
if (vscode.env.appName === CLOUD9_APPNAME) {
return IDE.cloud9
}
return IDE.vscode
}
interface IdeProperties {
shortName: string
longName: string
commandPalette... |
<<<<<<<
localResourceRoots: [
ext.visualizationResourcePaths.localScriptsPath,
ext.visualizationResourcePaths.visualizationCache
],
=======
localResourceRoots: [
ext.visualizationResourcePaths.localScriptsPath,
ext.vis... |
<<<<<<<
import { getLambdaFileNameFromHandler } from '../utils'
import { addCodiconToString } from '../../shared/utilities/textUtilities'
=======
import { getLambdaDetails } from '../utils'
>>>>>>>
import { addCodiconToString } from '../../shared/utilities/textUtilities'
import { getLambdaDetails } from '../utils' |
<<<<<<<
python: 'ms-python.python'
}
/**
* Long-lived, extension-scoped, shared globals.
*/
export interface ExtContext extends vscode.ExtensionContext {
//extensionContext: vscode.ExtensionContext
awsContext: AwsContext
regionProvider: RegionProvider
settings: SettingsConfiguration
outputCha... |
<<<<<<<
import { APIGateway, CloudFormation, CloudWatchLogs, IAM, Lambda, Schemas, StepFunctions, STS } from 'aws-sdk'
import { ApiGatewayClient } from '../../../shared/clients/apiGatewayClient'
=======
import { CloudFormation, CloudWatchLogs, IAM, Lambda, Schemas, StepFunctions, STS, SSM } from 'aws-sdk'
>>>>>>>
im... |
<<<<<<<
import * as telemetry from '../telemetry/telemetry'
import { TelemetryService } from '../telemetry/telemetryService'
=======
import { recordLambdaInvokeLocal, recordSamAttachDebugger, Result, Runtime } from '../telemetry/telemetry'
>>>>>>>
import * as telemetry from '../telemetry/telemetry'
<<<<<<<
... |
<<<<<<<
import { Runtime } from 'aws-sdk/clients/lambda'
=======
import { getIdeProperties } from '../../shared/extensionUtilities'
>>>>>>>
import { Runtime } from 'aws-sdk/clients/lambda'
import { getIdeProperties } from '../../shared/extensionUtilities' |
<<<<<<<
public schedule: Function;
public scheduleIterable: Function;
public scheduleOnce: Function;
public later: Function;
=======
>>>>>>>
public scheduleIterable: Function;
<<<<<<<
/*
Alias of Backburner.prototype.schedule()
Defer the passed function to run inside the specified queue.
... |
<<<<<<<
if (name.startsWith(`--`) && !name.startsWith(`--no-`)) {
registerDynamic(machine, node, [`isNegatedOption`, name, option.hidden || name !== longestName], node, [`pushFalse`, name]);
=======
if (name.startsWith(`--`)) {
re... |
<<<<<<<
/**
* The schema used to validate the Command instance.
*
* The easiest way to validate it is by using the [Yup](https://github.com/jquense/yup) library.
*
* @example
* yup.object().shape({
* a: yup.number().integer(),
* b: yup.number().integer(),
* })
*/
export type Schema<C extends Command<any> ... |
<<<<<<<
const sessionId = (
Date.now().toString(36) +
Math.random()
.toString(36)
.substr(2, 5)
).toUpperCase();
=======
const extractXsrfTokenFromJwt = (jwt: string) => {
const parts = jwt.split(".");
if (parts.length === 3) {
return JSON.parse(atob(parts[1])).xsrf;
}
};
// @VisibleForTesting... |
<<<<<<<
import { Router, NavigationStart, ActivatedRouteSnapshot, NavigationExtras, UrlSegment } from '@angular/router';
import { Subject } from 'rxjs';
import { pairwise, filter } from 'rxjs/operators';
=======
import {
Router,
NavigationStart,
ActivatedRouteSnapshot,
UrlSegment,
PRIMARY_OUTLET,
Navigati... |
<<<<<<<
export interface RemoteCallGetSchemaTreeParams {
types:string[];
}
export interface RemoteCallGetSchemaTreeResult extends RemoteCallResultBase {
schemas:SchemaTreeNode[];
total:number;
}
=======
export interface RemoteCallMixinDeleteParams {
qualifiedMixin... |
<<<<<<<
private makeDisplayName(item: ViewItem<ContentSummaryAndCompareStatus>): string {
return StringHelper.isEmpty(item.getDisplayName()) ? StringHelper.escapeHtml("<Unnamed " +
this.convertName(item.getModel... |
<<<<<<<
drawTicks: true,
=======
visible: false,
>>>>>>>
drawTicks: true,
visible: false, |
<<<<<<<
this.reset();
this.notifySucceed(issue);
=======
>>>>>>>
this.reset(); |
<<<<<<<
=======
// page shader catches mouse events
// so bind listener to it to highlight underlying views
>>>>>>>
<<<<<<<
this.highlightSelected();
//this.shade();
=======
this.shade();
>>>>>>>
//this.shade(); |
<<<<<<<
///<reference path='FormOccurrenceDraggableLabel.ts' />
=======
///<reference path='HelpTextContainer.ts' />
///<reference path='FormItemSetLabel.ts' />
>>>>>>>
///<reference path='HelpTextContainer.ts' />
///<reference path='FormOccurrenceDraggableLabel.ts' /> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.