Don't depend on /contrib/ from editor's core sources

src/vs/editor/browser/standalone/standaloneEditor.ts

@@ -20,7 +20,7 @@ import { SimpleEditorService, SimpleEditorModelResolverService } from 'vs/editor
 import * as modes from 'vs/editor/common/modes';
 import { IWebWorkerOptions, MonacoWebWorker, createWebWorker as actualCreateWebWorker } from 'vs/editor/common/services/webWorker';
 import { IMarkerData } from 'vs/platform/markers/common/markers';
-import { DiffNavigator } from 'vs/editor/contrib/diffNavigator/common/diffNavigator';
+import { DiffNavigator } from 'vs/editor/browser/widget/diffNavigator';
 import { IEditorService } from 'vs/platform/editor/common/editor';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';

src/vs/editor/editor.all.ts

@@ -8,6 +8,7 @@
 import 'vs/editor/common/controller/coreCommands';
 import 'vs/editor/browser/widget/codeEditorWidget';
 import 'vs/editor/browser/widget/diffEditorWidget';
+import 'vs/editor/browser/widget/diffNavigator';
 
 import 'vs/editor/contrib/bracketMatching/common/bracketMatching';
 import 'vs/css!vs/editor/contrib/bracketMatching/browser/bracketMatching';
@@ -18,7 +19,6 @@ import 'vs/editor/contrib/codelens/browser/codelensController';
 import 'vs/editor/contrib/comment/common/comment';
 import 'vs/editor/contrib/contextmenu/browser/contextmenu';
 import 'vs/editor/contrib/cursorUndo/browser/cursorUndo';
-import 'vs/editor/contrib/diffNavigator/common/diffNavigator';
 import 'vs/editor/contrib/dnd/browser/dnd';
 import 'vs/editor/contrib/find/browser/find';
 import 'vs/editor/contrib/folding/browser/folding';

src/vs/workbench/browser/parts/editor/textDiffEditor.ts

@@ -19,7 +19,7 @@ import { BaseTextEditor, IEditorConfiguration } from 'vs/workbench/browser/parts
 import { TextEditorOptions, TextDiffEditorOptions, EditorInput, EditorOptions, TEXT_DIFF_EDITOR_ID, IFileEditorInput } from 'vs/workbench/common/editor';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
 import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { DiffNavigator } from 'vs/editor/contrib/diffNavigator/common/diffNavigator';
+import { DiffNavigator } from 'vs/editor/browser/widget/diffNavigator';
 import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditorWidget';
 import { TextDiffEditorModel } from 'vs/workbench/common/editor/textDiffEditorModel';
 import { DelegatingWorkbenchEditorService } from 'vs/workbench/services/editor/browser/editorService';

tslint.json

@@ -163,8 +163,7 @@
 					"vs/css!./**/*",
 					"**/vs/base/{common,browser}/**",
 					"**/vs/platform/*/{common,browser}/**",
-					"**/vs/editor/{common,browser}/**",
-					"vs/editor/contrib/diffNavigator/common/diffNavigator" // TODO@Alex
+					"**/vs/editor/{common,browser}/**"
 				]
 			},
 			{