conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
=======
export const fileListWrapperClass = style({
height: 'auto',
minHeight: '150px',
maxHeight: '400px',
paddingBottom: '40px',
overflow: 'hidden',
overflowY: 'scroll'
});
export const moveFileUpButtonStyle = style({
backgroundImage: 'var(--jp-icon-move-file-up)'
});
export const moveFileD... |
<<<<<<<
=======
export const commitDetailFilePathStyle = style({
fontSize: 'var(--jp-ui-font-size1)',
marginRight: '4px',
paddingLeft: '4px',
textOverflow: 'ellipsis',
overflow: 'hidden',
whiteSpace: 'nowrap',
borderRadius: '2px',
flex: '1 1 auto'
});
>>>>>>>
<<<<<<<
export const warningLabel = sty... |
<<<<<<<
import { useCallback, useContext, useEffect, useRef, useState } from 'react';
=======
import {
useCallback,
useContext,
useEffect,
useState,
useRef,
useMemo,
} from 'react';
>>>>>>>
import {
useCallback,
useContext,
useEffect,
useRef,
useState,
useMemo,
} from 'react';
<<<<<<<
cons... |
<<<<<<<
import { Observable, Subject, Subscription as RxSubscription } from 'rxjs';
import { filter, take } from 'rxjs/operators';
=======
import { Observable, Subject, Subscription } from 'rxjs';
import { filter, publish, take } from 'rxjs/operators';
>>>>>>>
import { Observable, Subject, Subscription as RxSubscrip... |
<<<<<<<
import { Observable, of, Subject } from 'rxjs';
import { map, mergeMap, tap } from 'rxjs/operators';
import { formatTypeNames, gankTypeNamesFromResponse } from '../lib';
import { Exchange, ExchangeResult, Operation, OperationType } from '../types';
=======
import { merge, Subject } from 'rxjs';
import { map, ... |
<<<<<<<
// TODO: Rename this variable to uppercase?
// tslint:disable-next-line: variable-name
const combatTable_DEATH = "D";
=======
const COMBATTABLE_DEATH = "D";
>>>>>>>
const COMBATTABLE_DEATH = "D";
<<<<<<<
5: [ 0 , combatTable_DEATH],
6: [ 0 , combatTable_DEATH ]
=======
... |
<<<<<<<
=======
/**
* Only applies if id = 'quiver' (show the number of arrows on the quiver)
*/
showCount: boolean;
>>>>>>>
<<<<<<<
public getCntSectionObjects(type : string) : number {
return this.getSectionObjects(type).length;
// Code from cracrayol fork (reverted, it wil... |
<<<<<<<
=======
};
public Core = <CoreType>(core?: CoreType): CoreType => {
if (!this.ready && core) this.onInstanceReady(core);
return this.core as CoreType;
};
private onInstanceReady(core?: { [key: string]: any }) {
this.ready = true;
if (core)
// Copy core object structure without... |
<<<<<<<
`api:${version}:siem`,
`app:${version}:siem`,
`ui:${version}:catalogue/siem`,
`ui:${version}:navLinks/siem`,
`ui:${version}:siem/show`,
=======
`ui:${version}:logs/save`,
>>>>>>>
`api:${version}:si... |
<<<<<<<
import { Subscription, timer } from "rxjs";
=======
import { Subscription } from "rxjs/Subscription";
import { timer } from "rxjs/observable/timer";
import { catchError, take } from "rxjs/operators";
>>>>>>>
import { Subscription, timer } from "rxjs";
import { take } from "rxjs/operators";
<<<<<<<
... |
<<<<<<<
initializePlugin(compilation: Compilation) {
=======
initializePlugin(compilation: Compilation): void {
const entryPaths =
typeof this.options.paths === "function"
? this.options.paths()
: this.options.paths;
entryPaths.forEach((p) => {
if (!fs.existsSync(p)) throw new... |
<<<<<<<
namespacedImportName: string | null;
externalFragments: LoadedFragment[];
=======
addTypename: boolean;
>>>>>>>
addTypename: boolean;
namespacedImportName: string | null;
externalFragments: LoadedFragment[];
<<<<<<<
/* The following configuration are for preset configuration and should not be... |
<<<<<<<
Float: 'Double',
=======
Float: 'Float',
};
export const KOTLIN_SCALARS = {
ID: 'Any',
String: 'String',
Boolean: 'Boolean',
Int: 'Int',
Float: 'Float',
>>>>>>>
Float: 'Double',
};
export const KOTLIN_SCALARS = {
ID: 'Any',
String: 'String',
Boolean: 'Boolean',
Int: 'Int',
Float: ... |
<<<<<<<
declare var NSURL, AVPlayer, AVPlayerViewController, UIView, CMTimeMakeWithSeconds, NSNotificationCenter, CMTimeGetSeconds, CMTimeMake, kCMTimeZero;
=======
declare var NSURL, AVPlayer, AVPlayerViewController, AVPlayerItemDidPlayToEndTimeNotification, UIView, CMTimeMakeWithSeconds, NSNotification, NSNotificat... |
<<<<<<<
menu(translator, false, frame, theme),
tableEditing(),
tablePlugin,
=======
menu(translator, false, theme),
>>>>>>>
menu(translator, false, theme),
tableEditing(),
tablePlugin, |
<<<<<<<
import { Alerts } from '@tinacms/alerts'
=======
import {
MediaManager,
MediaStore,
MediaUploadOptions,
Media,
ListOptions,
MediaList,
} from '@tinacms/media'
import { Alerts, EventsToAlerts } from '@tinacms/alerts'
>>>>>>>
import { Alerts, EventsToAlerts } from '@tinacms/alerts'
<<<<<<<
======... |
<<<<<<<
const uploadStats = await upload_lib.uploadFromActions(
=======
const gitHubVersion = await getGitHubVersion(apiDetails);
const uploadStats = await upload_lib.upload(
>>>>>>>
const gitHubVersion = await getGitHubVersion(apiDetails);
const uploadStats = await upload_lib.uploadFromActions... |
<<<<<<<
import AsyncStorage from '@react-native-community/async-storage';
import {Platform} from 'react-native';
=======
>>>>>>>
import {Platform} from 'react-native';
<<<<<<<
const result = service.summariesContainingExposures(15, summaries);
expect(result).toHaveLength(2);
expect(result[0]).toStrictEq... |
<<<<<<<
if(this.callMain){
// source file that is being debugged
this.writeOutput(''
+ 'program: ' + program
+ '\nmain function: ' + this.mainFunction + '()'
);
this.rSession.callFunction('source', program, [], true, 'base');
this.rSession.callFunction('.vsc.lookForMain', this.mainFunction);
... |
<<<<<<<
private editActive: boolean = false;
private editingPackage: boolean = false;
private packageName; // This is the deployed BND's package name
private packageVersion; // This is the deployed BND's package version
private packageDescription; // This is the deployed BND's package description
private ... |
<<<<<<<
this.checkChanges();
const attributesMetadata: any = this[AttributeMetadata];
=======
const attributesMetadata: any = this[AttributeMetadataIndex];
>>>>>>>
this.checkChanges();
const attributesMetadata: any = this[AttributeMetadataIndex];
<<<<<<<
this.checkChanges();
const attrib... |
<<<<<<<
import {TestBed} from '@angular/core/testing';
import { format, parse } from 'date-fns';
import {Author} from '../../test/models/author.model';
import {AUTHOR_API_VERSION, AUTHOR_MODEL_ENDPOINT_URL, CustomAuthor} from '../../test/models/custom-author.model';
import {AUTHOR_BIRTH, AUTHOR_ID, AUTHOR_NAME, BOOK_TI... |
<<<<<<<
import {DsfParser} from "./dsf/DsfParser";
=======
import {DsdiffParser} from "./dsdiff/DsdiffParser";
>>>>>>>
import {DsfParser} from "./dsf/DsfParser";
import {DsdiffParser} from "./dsdiff/DsdiffParser";
<<<<<<<
case '.dsf':
return 'dsf';
=======
case '.dff':
return 'dsdiff... |
<<<<<<<
import common from "../common/Util";
import {TagType} from "../common/GenericTagTypes";
import {IOptions} from "../";
import {ITokenizer} from "strtok3";
import * as Token from "token-types";
import {FourCcToken} from "../common/FourCC";
import FileType = require("file-type");
import {IPicture} from "../index";... |
<<<<<<<
this.addTag(tagKey, dataAtom.value.toString("utf-8"));
=======
case 18: // Unknown: Found in m4b in combination with a '©gen' tag
this.tags.push({id: tagKey, value: dataAtom.value.toString("utf-8")});
>>>>>>>
case 18: // Unknown: Found in m4b in combination with a '©gen' t... |
<<<<<<<
import * as strtok3 from "strtok3";
import * as Token from "token-types";
import * as Chunk from "./Chunk";
import {Readable} from "stream";
import {ID3v2Parser} from "../id3v2/ID3v2Parser";
import {FourCcToken} from "../common/FourCC";
import {BasicParser} from "../common/BasicParser";
=======
import * as st... |
<<<<<<<
import { RawTelemetryReporterToDap, RawTelemetryReporter } from '../../telemetry/telemetryReporter';
=======
import { NodeTarget, INodeTargetLifecycleHooks } from './nodeTarget';
import { absolutePathToFileUrl } from '../../common/urlUtils';
import { resolve } from 'path';
import Cdp from '../../cdp/api';
>>... |
<<<<<<<
import { delay } from '../../common/promiseUtil';
=======
import { absolutePathToFileUrl } from '../../common/urlUtils';
>>>>>>>
import { delay } from '../../common/promiseUtil';
import { absolutePathToFileUrl } from '../../common/urlUtils'; |
<<<<<<<
import { expect } from 'chai';
=======
import { join } from 'path';
>>>>>>>
import { expect } from 'chai';
import { join } from 'path'; |
<<<<<<<
import { CodeSearchSourceMapRepository } from '../common/sourceMaps/codeSearchSourceMapRepository';
import { BreakpointsPredictor, BreakpointPredictionCache } from './breakpointPredictor';
import { CorrelatedCache } from '../common/sourceMaps/mtimeCorrelatedCache';
import { join } from 'path';
=======
import ... |
<<<<<<<
=======
configFile: string,
codeQL: CodeQL,
>>>>>>>
codeQL: CodeQL,
<<<<<<<
async function addRemoteQueries(resultMap: { [language: string]: string[] }, queryUses: string, configFile?: string) {
=======
async function addRemoteQueries(
configFile: string,
codeQL: CodeQL,
resultMap: { [language... |
<<<<<<<
import { SettingsService } from "../../state/settings.service"
=======
import { SettingsService } from "../../state/settings.service"
import { FileStateService } from "../../state/fileState.service"
import { FileStateHelper } from "../../util/fileStateHelper"
>>>>>>>
import { SettingsService } from "../../st... |
<<<<<<<
import { splitSortingOrderAscendingAction } from "./sortingOrderAscending/sortingOrderAscending.splitter"
=======
import { splitSearchPanelModeAction } from "./searchPanelMode/searchPanelMode.splitter"
>>>>>>>
import { splitSortingOrderAscendingAction } from "./sortingOrderAscending/sortingOrderAscending.spl... |
<<<<<<<
import { SearchPanelModeActions } from "./store/appSettings/searchPanelMode/searchPanelMode.actions"
=======
import { isActionOfType } from "../util/reduxHelper"
>>>>>>>
import { SearchPanelModeActions } from "./store/appSettings/searchPanelMode/searchPanelMode.actions"
import { isActionOfType } from "../uti... |
<<<<<<<
=======
import { addBlacklistItem, removeBlacklistItem } from "../../state/store/fileSettings/blacklist/blacklist.actions"
import { focusNode } from "../../state/store/dynamicSettings/focusedNodePath/focusedNodePath.actions"
import { MetricService } from "../../state/metric.service"
>>>>>>>
import { MetricSe... |
<<<<<<<
LoadingGifService.subscribe(this.$rootScope, this)
AttributeSideBarService.subscribe(this.$rootScope, this)
=======
LoadingStatusService.subscribe(this.$rootScope, this)
>>>>>>>
AttributeSideBarService.subscribe(this.$rootScope, this)
LoadingStatusService.subscribe(this.$rootScope, this) |
<<<<<<<
import { ExportBlacklistType, ExportCCFile } from "./codeCharta.api.model"
=======
import { StoreService } from "./state/store.service"
import { resetFiles } from "./state/store/files/files.actions"
>>>>>>>
import { StoreService } from "./state/store.service"
import { resetFiles } from "./state/store/files/f... |
<<<<<<<
=======
viewModel = {
itemPath: "/root",
itemType: BlacklistType.exclude,
error: ""
};
>>>>>>>
<<<<<<<
=======
it("add single blacklist entry", () => {
blacklistPanelController.addBlacklistEntry();
expect(getFilteredBlacklistBy({path... |
<<<<<<<
private cameraTargetService: CameraTargetService,
=======
private searchPanelModeService: SearchPanelModeService,
>>>>>>>
private cameraTargetService: CameraTargetService,
private searchPanelModeService: SearchPanelModeService, |
<<<<<<<
import { CodeChartaService } from "../../codeCharta.service";
=======
import {Settings, SettingsService} from "../../core/settings/settings.service";
>>>>>>>
import {CodeChartaService} from "../../codeCharta.service";
import { CodeChartaService } from "../../codeCharta.service";
import {SettingsService} from... |
<<<<<<<
export const VALID_NODE_WITH_PATHS : CodeMapNode = {
name: "root",
path: "/root",
attributes: {},
type: "Folder",
children: [
{
name: "big leaf",
path: "/root/big leaf",
type: "File",
attributes: { RLOC: 100, Functions: 10, MCC: 1 },
link: "http://www.google.de"
},
{
name: "Parent L... |
<<<<<<<
import {MapTreeViewHoverEventSubscriber, MapTreeViewLevelController} from "../mapTreeView/mapTreeView.level.component";
import {ThreeCameraService} from "./threeViewer/threeCameraService";
import {IAngularEvent, IRootScopeService} from "angular";
import {CodeMapNode} from "../../core/data/model/CodeMap";
import... |
<<<<<<<
this.character.viewState$.subscribe((viewState) => {
if (viewState === ViewState.OVERVIEW) {
this.changeToOverview();
}
});
this.takeControlService.controlledPlayer$.subscribe(controlledPlayer => {
if (controlledPlayer) {
this.viewerOptions.setFpvCameraOptions(this... |
<<<<<<<
=======
import { SettingsPanelPageObject } from "../settingsPanel/settingsPanel.po"
import { Browser, Page } from "puppeteer"
>>>>>>>
import { SettingsPanelPageObject } from "../settingsPanel/settingsPanel.po"
import { Browser, Page } from "puppeteer" |
<<<<<<<
import { CharacterService } from './character.service';
import { GameSettingsService } from './game-settings.service';
=======
import { Throttle } from 'lodash-decorators';
import { ApolloService } from '../../core/configured-apollo/network/apollo.service';
import { notifyKillMutation } from '../../graphql/no... |
<<<<<<<
isolateNode() {
this.hide();
this.codeMapActionsService.isolateNode(this.contextMenuBuilding);
}
showAllNodes() {
this.hide();
this.codeMapActionsService.showAllNodes();
=======
focusNode() {
this.hideContextMenu();
this.codeMapActionsService.fo... |
<<<<<<<
map = NodeDecorator.decorateMap(_.cloneDeep(TEST_FILE_WITH_PATHS.map), fileMeta, metricData)
=======
fileStates = _.cloneDeep(FILE_STATES)
map = _.cloneDeep(TEST_FILE_WITH_PATHS.map)
NodeDecorator.decorateMap(map, fileMeta, metricData)
>>>>>>>
map = _.cloneDeep(TEST_FILE_WITH_PATHS.map)
NodeDecor... |
<<<<<<<
import { CameraTargetService } from "./store/appSettings/cameraTarget/cameraTarget.service"
=======
import { IdToNodeService } from "./store/lookUp/idToNode/idToNode.service"
import { IdToBuildingService } from "./store/lookUp/idToBuilding/idToBuilding.service"
>>>>>>>
import { CameraTargetService } from "./... |
<<<<<<<
import { CharacterService, MeModelState, ViewState } from '../../services/character.service';
=======
import { MatDialog, MatSnackBar } from '@angular/material';
import { CharacterService, MeModelState } from '../../services/character.service';
>>>>>>>
import { MatDialog, MatSnackBar } from '@angular/materia... |
<<<<<<<
markFolder(node: CodeMapNode, color: string) {
let s = this.settingsService.settings;
let newMarkedPackage: MarkedPackage = this.getNewMarkedPackage(node.path, color);
if (!s.markedPackages || s.markedPackages == []) {
this.addFirstPackageToSettings(newMarkedPackage, s);... |
<<<<<<<
import { LoadingStatusService } from "./loadingStatus.service"
=======
import { FileStateService, FileStateSubscriber } from "./fileState.service"
import { setFileSettings } from "./store/fileSettings/fileSettings.actions"
import { FileStateHelper } from "../util/fileStateHelper"
import { SettingsMerger } fro... |
<<<<<<<
=======
import { TreeMapSettingsActions } from "./treeMap/treeMap.actions"
import { splitFilesAction } from "./files/files.splitter"
>>>>>>>
import { splitFilesAction } from "./files/files.splitter" |
<<<<<<<
const clone = require("rfdc")()
=======
import { IsLoadingMapActions, setIsLoadingMap } from "../../state/store/appSettings/isLoadingMap/isLoadingMap.actions"
import { setIsLoadingFile } from "../../state/store/appSettings/isLoadingFile/isLoadingFile.actions"
>>>>>>>
import { IsLoadingMapActions, setIsLoadin... |
<<<<<<<
this.getMapMesh().setBuildingHighlight(this.listOfBuildingsToHighlight, this.selected, settings)
}
public highlightSingleBuilding(building: CodeMapBuilding) {
this.addBuildingToHighlightingList(building)
this.highlightBuildings()
=======
//TODO: Remove once all settings are in the store
settings... |
<<<<<<<
import { CodeMapNode, BlacklistType, BlacklistItem, FileSettings, ExportCCFile, FileMeta } from "../codeCharta.model"
=======
import { CCFile, CodeMapNode, BlacklistType, BlacklistItem, FileSettings, ExportCCFile, AttributeTypes } from "../codeCharta.model"
>>>>>>>
import { CodeMapNode, BlacklistType, Blackl... |
<<<<<<<
import { hierarchy } from "d3"
=======
import { MetricService } from "../state/metric.service"
>>>>>>>
import { hierarchy } from "d3"
import { MetricService } from "../state/metric.service"
<<<<<<<
attributes: { unary: 40 },
isBlacklisted: undefined,
=======
attributes: { [MetricService.UNARY_MET... |
<<<<<<<
import { BlacklistItem, BlacklistType } from "../model/codeCharta.model"
=======
import { BlacklistItem, BlacklistType } from "../codeCharta.model"
>>>>>>>
import { BlacklistItem, BlacklistType } from "../model/codeCharta.model"
<<<<<<<
import { SettingsMerger } from "../util/settingsMerger"
=======
>>>>... |
<<<<<<<
import { CodeMapPreRenderService } from "../codeMap/codeMap.preRender.service"
=======
import { StoreService } from "../../state/store.service"
>>>>>>>
import { CodeMapPreRenderService } from "../codeMap/codeMap.preRender.service"
import { StoreService } from "../../state/store.service"
<<<<<<<
let codeMap... |
<<<<<<<
import { sortingOrderAscending } from "./sortingOrderAscending/sortingOrderAscending.reducer"
=======
import { searchPanelMode } from "./searchPanelMode/searchPanelMode.reducer"
>>>>>>>
import { sortingOrderAscending } from "./sortingOrderAscending/sortingOrderAscending.reducer"
import { searchPanelMode } fr... |
<<<<<<<
blacklistPanelController.viewModel = viewModel;
settingsServiceMock.settings.map.nodes = simpleHierarchy;
=======
blacklistItem = {path: "/root", type: BlacklistType.exclude};
settingsServiceMock.settings.map.root = simpleHierarchy;
>>>>>>>
blacklistItem = {path: "/ro... |
<<<<<<<
if (!this.createPathMode) {
screenSpaceCameraController.enableTilt = false;
screenSpaceCameraController.enableRotate = false;
screenSpaceCameraController.enableZoom = false;
const canvas = viewer.canvas;
document.onclick = () => canvas.requestPointerLock();
}
... |
<<<<<<<
import { ExportCCFile } from "./codeCharta.api.model"
=======
import { Files } from "./model/files"
>>>>>>>
import { ExportCCFile } from "./codeCharta.api.model"
import { Files } from "./model/files" |
<<<<<<<
import { Edge, EdgeVisibility, Node, Settings } from "../../codeCharta.model"
import { SETTINGS, CODE_MAP_BUILDING, DEFAULT_SETTINGS, OUTGOING_NODE, INCOMING_NODE } from "../../util/dataMocks"
=======
import { Edge, EdgeVisibility, Node } from "../../codeCharta.model"
import { TEST_NODE_LEAF, TEST_NODE_ROOT, ... |
<<<<<<<
colorRangeService.onFilesSelectionChanged(undefined)
=======
withMockedMetricService()
colorRangeService.onFilesSelectionChanged()
>>>>>>>
colorRangeService.onFilesSelectionChanged() |
<<<<<<<
import "./nodeContextMenu/nodeContextMenu";
=======
import "./layoutSwitcher/layoutSwitcher";
>>>>>>>
import "./nodeContextMenu/nodeContextMenu";
import "./layoutSwitcher/layoutSwitcher";
<<<<<<<
"app.codeCharta.ui.nodeContextMenu",
=======
"app.codeCharta.ui.layoutSwitcher",
>>>>>>>
... |
<<<<<<<
EdgeVisibility,
FileMeta,
=======
EdgeVisibility,
>>>>>>>
EdgeVisibility,
FileMeta,
<<<<<<<
import { APIVersions, ExportCCFile, ExportCCFile_0_1 } from "../codeCharta.api.model"
=======
import { Files } from "../model/files"
>>>>>>>
import { APIVersions, ExportCCFile, ExportCCFile_0_1 } from "../cod... |
<<<<<<<
import { defaultSortingOrderAscending } from "./sortingOrderAscending/sortingOrderAscending.actions"
=======
import { defaultSearchPanelMode } from "./searchPanelMode/searchPanelMode.actions"
>>>>>>>
import { defaultSortingOrderAscending } from "./sortingOrderAscending/sortingOrderAscending.actions"
import {... |
<<<<<<<
import { CharacterService } from '../../services/character.service';
=======
import { EndGameDialogComponent } from '../end-game-dialog/end-game-dialog.component';
import { MdDialog } from '@angular/material';
import { CharacterService } from '../../services/character.service';
>>>>>>>
import { EndGameDialog... |
<<<<<<<
import { setCameraTarget } from "../../../state/store/appSettings/cameraTarget/cameraTarget.actions"
=======
import { FilesService } from "../../../state/store/files/files.service"
>>>>>>>
import { setCameraTarget } from "../../../state/store/appSettings/cameraTarget/cameraTarget.actions"
import { FilesServi... |
<<<<<<<
import "./metricValueHovered/metricValueHovered.module"
=======
import "./downloadButton/downloadButton.module"
import "./globalSettingsButton/globalSettingsButton.module"
>>>>>>>
import "./metricValueHovered/metricValueHovered.module"
import "./downloadButton/downloadButton.module"
import "./globalSettingsB... |
<<<<<<<
import _ from "lodash"
import { MapColors } from "../../../../model/codeCharta.model"
=======
import { MapColors } from "../../../../codeCharta.model"
>>>>>>>
import { MapColors } from "../../../../model/codeCharta.model" |
<<<<<<<
import { CameraTargetService } from "./store/appSettings/cameraTarget/cameraTarget.service"
=======
import { IsAttributeSideBarVisibleService } from "./store/appSettings/isAttributeSideBarVisible/isAttributeSideBarVisible.service"
>>>>>>>
import { CameraTargetService } from "./store/appSettings/cameraTarget/... |
<<<<<<<
export type PlayerState = "WAITING" | "READY" | "ALIVE" | "IN_BUILDING" | "DEAD" | "CONTROLLED";
=======
export type PlayerState = "WAITING" | "READY" | "ALIVE" | "DEAD";
>>>>>>>
export type PlayerState = "WAITING" | "READY" | "ALIVE" | "DEAD" | "CONTROLLED"; |
<<<<<<<
private gameService: GameService,
private cd: ChangeDetectorRef) {
character.currentStateValue;
=======
private gameService: GameService) {
>>>>>>>
private gameService: GameService,
private cd: ChangeDetectorRef) { |
<<<<<<<
export class MetricService implements FilesSelectionSubscriber, BlacklistSubscriber, AttributeTypesSubscriber {
=======
export class MetricService implements FilesSelectionSubscriber, BlacklistSubscriber {
public static UNARY_METRIC = "unary"
>>>>>>>
export class MetricService implements FilesSelectionSubsc... |
<<<<<<<
import {CodeMap, CodeMapDependency, CodeMapNode} from "../data/model/CodeMap";
=======
import {CodeMap, CodeMapNode} from "../data/model/CodeMap";
import {hierarchy, HierarchyNode} from "d3-hierarchy";
>>>>>>>
import {CodeMap, CodeMapDependency, CodeMapNode} from "../data/model/CodeMap";
import {hierarchy, H... |
<<<<<<<
import { GameDialogsComponent } from './views/game-container/game-dialogs/game-dialogs.component';
=======
import { BuildingsComponent } from './views/buildings/buildings.component';
import { BuildingsService } from './services/buildings.service';
import { CollisionDetectorService } from './services/collision... |
<<<<<<<
public setScales(scales: Vector3) {
=======
public get buildings(): CodeMapBuilding[] {
return this._buildings
}
public setScales(scales: THREE.Vector3) {
>>>>>>>
public get buildings(): CodeMapBuilding[] {
return this._buildings
}
public setScales(scales: Vector3) { |
<<<<<<<
FileMeta,
FileSelectionState,
FileState,
=======
EdgeVisibility,
>>>>>>>
EdgeVisibility,
<<<<<<<
import { APIVersions, ExportCCFile } from "../codeCharta.api.model"
import { Files } from "../model/files"
=======
>>>>>>> |
<<<<<<<
public static validate(file: { nodes: CodeMapNode[] }): { error: string[]; warning: string[]; title: string } {
let minorApiWrongMessage = ""
let result = { error: [], warning: [], title: "Error" }
=======
private static FILE_IS_INVALID = "file is empty or invalid"
private static API_VERSION_IS_INVALID... |
<<<<<<<
import { CCAction, FileSettings, State } from "../model/codeCharta.model"
=======
import { CCAction, State } from "../codeCharta.model"
>>>>>>>
<<<<<<<
import { setFileSettings } from "./store/fileSettings/fileSettings.actions"
import { SettingsMerger } from "../util/settingsMerger"
=======
>>>>>>>
<<<<... |
<<<<<<<
import ignore from "ignore"
import { CodeMapHelper } from "../../util/codeMapHelper"
import { hierarchy } from "d3"
import { TreeMapGenerator } from "../../util/treeMapGenerator"
=======
import { IsAttributeSideBarVisibleActions } from "../../state/store/appSettings/isAttributeSideBarVisible/isAttributeSideBa... |
<<<<<<<
export const VALID_NODE_WITH_ROOT_UNARY: CodeMapNode = {
name: "root",
attributes: { unary: 200 },
type: "Folder",
path: "/root",
children: [
{
name: "first leaf",
type: "File",
path: "/root/first leaf",
attributes: { unary: 100, Functions: 10, MCC: 1 }
},
{
name: "second leaf",
typ... |
<<<<<<<
import "../ui/loadingGif/loadingGif.module"
=======
import _ from "lodash"
>>>>>>>
import "../ui/loadingGif/loadingGif.module"
import _ from "lodash"
<<<<<<<
"app.codeCharta.state", ["app.codeCharta.ui.loadingGif"]
).service(
"fileStateService", FileStateService
).service(
"settingsService", Set... |
<<<<<<<
isWhiteBackground: null
=======
maximizeDetailPanel: null,
isWhiteBackground: null,
resetCameraIfNewFileIsLoaded: null
>>>>>>>
isWhiteBackground: null,
resetCameraIfNewFileIsLoaded: null |
<<<<<<<
import "./metricType/metricType.module"
import "./loadingGif/loadingGif.module"
=======
>>>>>>>
<<<<<<<
"app.codeCharta.ui.metricType",
"app.codeCharta.ui.loadingGif",
=======
>>>>>>>
"app.codeCharta.ui.metricType", |
<<<<<<<
import { GameConfig } from '../../../services/game-config';
import { CesiumService } from 'angular-cesium';
import { environment } from '../../../../../environments/environment';
=======
import { GameSettingsService } from '../../../services/game-settings.service';
import { CharacterService, ViewState } from ... |
<<<<<<<
import { ThreeSceneService } from "../codeMap/threeViewer/threeSceneService"
import { CodeMapBuilding } from "../codeMap/rendering/codeMapBuilding"
=======
import { StoreService } from "../../state/store.service"
>>>>>>>
import { StoreService } from "../../state/store.service"
import { ThreeSceneService } fr... |
<<<<<<<
getMapMesh: jest.fn().mockReturnValue({
clearHighlight: jest.fn(),
highlightBuilding: jest.fn(),
clearSelection: jest.fn(),
selectBuilding: jest.fn()
}),
clearHighlight: jest.fn(),
highlightBuilding: jest.fn(),
clearSelection: jest.fn(),
selectBuilding: jest.fn()
})()
}
fu... |
<<<<<<<
get state() {
return this._character && this._character.getValue() && this._character.getValue().state;
=======
get pitch() {
return this._character.getValue().pitch;
}
get state() : MeModelState {
return this._character.getValue().state;
>>>>>>>
get pitch() {
return this._characte... |
<<<<<<<
import { CameraTargetService } from "./store/appSettings/cameraTarget/cameraTarget.service"
=======
import { SortingOptionService } from "./store/dynamicSettings/sortingOption/sortingOption.service"
import { SortingOrderAscendingService } from "./store/appSettings/sortingOrderAscending/sortingOrderAscending.s... |
<<<<<<<
angular.module("app.codeCharta.ui.experimentalSettingsPanel", ["app.codeCharta.ui.rangeSlider", "app.codeCharta.ui.aggregateSettingsPanel", "app.codeCharta.ui.statisticSettingsPanel", "app.codeCharta.core"])
=======
angular.module("app.codeCharta.ui.experimentalSettingsPanel", ["app.codeCharta.ui.rangeSlider"... |
<<<<<<<
export function setSwaggerOkResponse(func: Function, dto: any, isArray?: boolean) {
if (swagger) {
const responses = Reflect.getMetadata(swagger.DECORATORS.API_RESPONSE, func) || {};
const groupedMetadata = {
[200]: {
type: dto,
isArray,
description: '',
},
};
... |
<<<<<<<
getManyBase: `Retrieve many ${modelName}`,
getOneBase: `Retrieve one ${modelName}`,
createManyBase: `Create many ${modelName}`,
createOneBase: `Create one ${modelName}`,
updateOneBase: `Update one ${modelName}`,
replaceOneBase: `Replace one ${modelName}`,
deleteOneBase:... |
<<<<<<<
shapes: new Set(["country"] as Array<Shape>),
=======
simplify: 0,
shapes: new Set(["switzerland"] as Array<Shape>),
>>>>>>>
simplify: 0,
shapes: new Set(["country"] as Array<Shape>), |
<<<<<<<
public getConfig(): any {
return this.editor && this.editor.config;
=======
getConfig(): any {
return this.editor.config;
>>>>>>>
getConfig(): any {
return this.editor && this.editor.config; |
<<<<<<<
=======
circuitChecks = await compileAndLoadCircuit('performChecksBeforeUpdate_test.circom')
})
it('UpdateStateTree should produce the correct state root', async () => {
const user1StateTreeIndex = 1
const user1VoteOptionIndex = 0
const user1VoteOptionWeight = 5
... |
<<<<<<<
new (options?: ILazyLoadOptions, elements?: NodeListOf<HTMLElement>);
update: (elements?: NodeListOf<HTMLElement>) => void;
destroy: () => void;
load: (element: HTMLElement, force?: boolean) => void;
loadAll: () => void;
loadingCount: number;
=======
new (options?: ILazyLoadOptions, e... |
<<<<<<<
LC().onRequest(UpdateConnectionExplorerRequest, ({ conn, tables, columns }) => {
connectionExplorer.setTreeData(conn, tables, columns, connectionExplorerView);
=======
languageClient.onRequest(UpdateConnectionExplorerRequest, ({ conn, tables, columns }) => {
connectionExplorer.setTreeData(... |
<<<<<<<
import { IExtensionPlugin } from '@sqltools/types';
import Context from '@sqltools/vscode/context';
=======
import { IExtensionPlugin, IExtension } from '@sqltools/types';
import { EXT_NAME } from '@sqltools/core/constants';
import { getEditorQueryDetails } from '@sqltools/vscode/utils/query';
>>>>>>>
import... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.