refactor: fix lost merge errors

Author: EagleoutIce

src/dataflow/common/environments/environment.ts

@@ -6,7 +6,6 @@
  */
 import { NodeId } from '../../../r-bridge'
 import { DataflowGraph, DataflowGraphEdgeAttribute } from '../../v1/graph'
-import { dataflowLogger } from '../../v1'
 import { resolveByName } from './resolve-by-name'
 import { DataflowScopeName, GlobalScope, LocalScope } from './scopes'
 import { GenericDifferenceInformation, setDifference } from '../../../util/diff'

src/dataflow/common/environments/register.ts

@@ -1,6 +1,6 @@
+import { guard } from '../../../util/assert'
 import { cloneEnvironments, IdentifierDefinition, IEnvironment, REnvironmentInformation } from './environment'
 import { DataflowScopeName, GlobalScope, LocalScope } from './scopes'
-import { guard } from '../../util/assert'
 
 /**
  * Insert the given `definition` --- defined within the given scope --- into the passed along `environments` will take care of propagation.

src/dataflow/v1/graph/equal.ts

@@ -21,7 +21,7 @@ import {
 	DataflowGraphVertexInfo,
 	DataflowGraphVertices
 } from './vertex'
-import { DifferenceReport } from '../../../util/diff';
+import { DifferenceReport } from '../../../util/diff'
 
 /** Used to get an entry point for every id, after that it allows reference-chasing of the graph */
 export type DataflowMap<OtherInfo=NoInfo> = BiMap<NodeId, RNodeWithParent<OtherInfo>>

src/dataflow/v1/graph/graph.ts

@@ -20,8 +20,8 @@ import { log, LogLevel } from '../../util/log'
 import objectHash from 'object-hash'
 import { LocalScope } from '../../dataflow/common/environments/scopes'
 import { convertAllSlicingCriteriaToIds, DecodedCriteria, SlicingCriteria } from '../criterion'
-import { overwriteEnvironments, pushLocalEnvironment, resolveByName } from '../../dataflow/common/environments';
-import { getAllLinkedFunctionDefinitions } from '../../dataflow/v1/internal/linker';
+import { overwriteEnvironments, pushLocalEnvironment, resolveByName } from '../../dataflow/common/environments'
+import { getAllLinkedFunctionDefinitions } from '../../dataflow/v1/internal/linker'
 
 export const slicerLogger = log.getSubLogger({ name: 'slicer' })
 

src/slicing/static/static-slicer.ts

@@ -20,8 +20,8 @@ import { testRequiresRVersion } from './version'
 import { deepMergeObject, MergeableRecord } from '../../../src/util/objects'
 import { LAST_STEP, SteppingSlicer } from '../../../src/core'
 import { NAIVE_RECONSTRUCT } from '../../../src/core/steps/all/static-slicing/10-reconstruct'
-import { DifferenceReport } from '../../../src/util/diff';
-import { guard } from '../../../src/util/assert';
+import { DifferenceReport } from '../../../src/util/diff'
+import { guard } from '../../../src/util/assert'
 
 export const testWithShell = (msg: string, fn: (shell: RShell, test: Mocha.Context) => void | Promise<void>): Mocha.Test => {
 	return it(msg, async function(): Promise<void> {

test/functionality/_helper/shell.ts

@@ -1,6 +1,6 @@
-import { DataflowGraph, EdgeType, initializeCleanEnvironments } from '../../../../../src/dataflow'
-import { define } from '../../../../../src/dataflow/environments'
-import { LocalScope } from '../../../../../src/dataflow/environments/scopes'
+import { define, initializeCleanEnvironments } from '../../../../../src/dataflow/common/environments'
+import { LocalScope } from '../../../../../src/dataflow/common/environments/scopes'
+import { DataflowGraph, EdgeType } from '../../../../../src/dataflow/v1'
 import { assertDataflow, withShell } from '../../../_helper/shell'
 
 describe('while', withShell(shell => {