a bunch of ugly hacks to

1) remove cycling dependencies
2) avoid `export import`

Author: jrieken

src/vs/base/test/node/testUtils.ts

@@ -16,4 +16,5 @@ export function getPathFromAmdModule(requirefn: typeof require, relativePath: st
 	return URI.parse(requirefn.toUrl(relativePath)).fsPath;
 }
 
-export import flakySuite = testUtils.flakySuite;
+// export import flakySuite = testUtils.flakySuite;
+export const flakySuite = testUtils.flakySuite;

src/vs/editor/common/tokenizationRegistry.ts

@@ -6,7 +6,7 @@
 import { Color } from 'vs/base/common/color';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ColorId, ITokenizationRegistry, ITokenizationSupport, ITokenizationSupportChangedEvent, ITokenizationSupportFactory } from 'vs/editor/common/languages';
+import { ITokenizationRegistry, ITokenizationSupport, ITokenizationSupportChangedEvent, ITokenizationSupportFactory } from 'vs/editor/common/languages';
 
 export class TokenizationRegistry implements ITokenizationRegistry {
 
@@ -104,8 +104,8 @@ export class TokenizationRegistry implements ITokenizationRegistry {
 	}
 
 	public getDefaultBackground(): Color | null {
-		if (this._colorMap && this._colorMap.length > ColorId.DefaultBackground) {
-			return this._colorMap[ColorId.DefaultBackground];
+		if (this._colorMap && this._colorMap.length > /* ColorId.DefaultBackground */2) {
+			return this._colorMap[/* ColorId.DefaultBackground */2];
 		}
 		return null;
 	}

src/vs/editor/common/viewLayout/lineDecorations.ts

@@ -6,7 +6,17 @@
 import * as strings from 'vs/base/common/strings';
 import { Constants } from 'vs/base/common/uint';
 import { InlineDecoration, InlineDecorationType } from 'vs/editor/common/viewModel';
-import { LinePartMetadata } from 'vs/editor/common/viewLayout/viewLineRenderer';
+
+// TODO@jrieken HACK!
+const enum LinePartMetadata {
+	IS_WHITESPACE = 1,
+	PSEUDO_BEFORE = 2,
+	PSEUDO_AFTER = 4,
+
+	IS_WHITESPACE_MASK = 0b001,
+	PSEUDO_BEFORE_MASK = 0b010,
+	PSEUDO_AFTER_MASK = 0b100,
+}
 
 export class LineDecoration {
 	_lineDecorationBrand: void = undefined;

src/vs/platform/notification/common/notification.ts

@@ -6,10 +6,14 @@
 import { IAction } from 'vs/base/common/actions';
 import { Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import BaseSeverity from 'vs/base/common/severity';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 
-export import Severity = BaseSeverity;
+export enum Severity {
+	Ignore = 0,
+	Info = 1,
+	Warning = 2,
+	Error = 3
+}
 
 export const INotificationService = createDecorator<INotificationService>('notificationService');
 

src/vs/workbench/contrib/tasks/common/tasks.ts

@@ -16,7 +16,10 @@ import { RawContextKey, ContextKeyExpression } from 'vs/platform/contextkey/comm
 import { TaskDefinitionRegistry } from 'vs/workbench/contrib/tasks/common/taskDefinitionRegistry';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { USER_TASKS_GROUP_KEY } from 'vs/workbench/contrib/tasks/common/taskService';
+
+// TODO@jrieken HACK, HACK
+// import { USER_TASKS_GROUP_KEY } from 'vs/workbench/contrib/tasks/common/taskService';
+const USER_TASKS_GROUP_KEY = 'settings';
 
 export const TASK_RUNNING_STATE = new RawContextKey<boolean>('taskRunning', false, nls.localize('tasks.taskRunningContext', "Whether a task is currently running."));
 export const TASKS_CATEGORY = { value: nls.localize('tasksCategory', "Tasks"), original: 'Tasks' };