Moves config interfaces into single file

Author: eamodio

src/annotations/annotationController.ts

@@ -2,7 +2,7 @@
 import { Functions, Iterables } from '../system';
 import { ConfigurationChangeEvent, DecorationRangeBehavior, DecorationRenderOptions, Disposable, Event, EventEmitter, OverviewRulerLane, Progress, ProgressLocation, TextDocument, TextEditor, TextEditorDecorationType, TextEditorViewColumnChangeEvent, ThemeColor, window, workspace } from 'vscode';
 import { AnnotationProviderBase, TextEditorCorrelationKey } from './annotationProvider';
-import { configuration, IConfig, LineHighlightLocations } from '../configuration';
+import { configuration, FileAnnotationType, IConfig, LineHighlightLocations } from '../configuration';
 import { CommandContext, isTextEditor, setCommandContext } from '../constants';
 import { Container } from '../container';
 import { DocumentBlameStateChangeEvent, DocumentDirtyStateChangeEvent, GitDocumentState } from '../trackers/documentTracker';
@@ -14,13 +14,6 @@ import { Logger } from '../logger';
 import { RecentChangesAnnotationProvider } from './recentChangesAnnotationProvider';
 import * as path from 'path';
 
-export enum FileAnnotationType {
-    Gutter = 'gutter',
-    Heatmap = 'heatmap',
-    Hover = 'hover',
-    RecentChanges = 'recentChanges'
-}
-
 export enum AnnotationClearReason {
     User = 'User',
     BlameabilityChanged = 'BlameabilityChanged',

src/annotations/annotationProvider.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { Functions } from '../system';
 import { DecorationOptions, Disposable, TextDocument, TextEditor, TextEditorDecorationType, TextEditorSelectionChangeEvent, Uri, window } from 'vscode';
-import { FileAnnotationType } from '../annotations/annotationController';
+import { FileAnnotationType } from '../configuration';
 import { TextDocumentComparer } from '../comparers';
 import { GitDocumentState, TrackedDocument } from '../trackers/documentTracker';
 

src/annotations/annotations.ts

@@ -1,7 +1,7 @@
 import { Dates, Objects, Strings } from '../system';
 import { DecorationInstanceRenderOptions, DecorationOptions, MarkdownString, ThemableDecorationRenderOptions, ThemeColor, window } from 'vscode';
-import { FileAnnotationType } from './annotationController';
 import { DiffWithCommand, OpenCommitInRemoteCommand, OpenFileRevisionCommand, ShowQuickCommitDetailsCommand, ShowQuickCommitFileDetailsCommand } from '../commands';
+import { FileAnnotationType } from './../configuration';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
 import { CommitFormatter, GitCommit, GitDiffChunkLine, GitService, GitUri, ICommitFormatOptions } from '../gitService';

src/annotations/blameAnnotationProvider.ts

@@ -1,9 +1,9 @@
 'use strict';
 import { Arrays, Iterables } from '../system';
 import { CancellationToken, Disposable, Hover, HoverProvider, languages, Position, Range, TextDocument, TextEditor, TextEditorDecorationType } from 'vscode';
-import { FileAnnotationType } from './annotationController';
 import { AnnotationProviderBase } from './annotationProvider';
 import { Annotations } from './annotations';
+import { FileAnnotationType } from './../configuration';
 import { RangeEndOfLineIndex } from '../constants';
 import { Container } from '../container';
 import { GitDocumentState, TrackedDocument } from '../trackers/documentTracker';

src/annotations/gutterBlameAnnotationProvider.ts

@@ -1,10 +1,9 @@
 'use strict';
 import { Objects, Strings } from '../system';
 import { DecorationOptions, DecorationRenderOptions, Range, TextEditorDecorationType, window } from 'vscode';
-import { FileAnnotationType } from './annotationController';
 import { Annotations } from './annotations';
 import { BlameAnnotationProviderBase } from './blameAnnotationProvider';
-import { GravatarDefaultStyle } from '../configuration';
+import { FileAnnotationType, GravatarDefaultStyle } from '../configuration';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
 import { GitBlameCommit, ICommitFormatOptions } from '../gitService';

src/annotations/heatmapBlameAnnotationProvider.ts

@@ -1,8 +1,8 @@
 'use strict';
 import { DecorationOptions, Range } from 'vscode';
-import { FileAnnotationType } from './annotationController';
 import { Annotations } from './annotations';
 import { BlameAnnotationProviderBase } from './blameAnnotationProvider';
+import { FileAnnotationType } from './../configuration';
 import { GitBlameCommit } from '../gitService';
 import { Logger } from '../logger';
 

src/annotations/hoverBlameAnnotationProvider.ts

@@ -1,8 +1,8 @@
 'use strict';
 import { DecorationOptions, Range } from 'vscode';
-import { FileAnnotationType } from './annotationController';
 import { Annotations } from './annotations';
 import { BlameAnnotationProviderBase } from './blameAnnotationProvider';
+import { FileAnnotationType } from './../configuration';
 import { Container } from '../container';
 import { GitBlameCommit } from '../gitService';
 import { Logger } from '../logger';

src/annotations/recentChangesAnnotationProvider.ts

@@ -1,8 +1,8 @@
 'use strict';
 import { DecorationOptions, MarkdownString, Position, Range, TextEditor, TextEditorDecorationType } from 'vscode';
-import { FileAnnotationType } from './annotationController';
 import { AnnotationProviderBase } from './annotationProvider';
 import { Annotations } from './annotations';
+import { FileAnnotationType } from './../configuration';
 import { RangeEndOfLineIndex } from '../constants';
 import { Container } from '../container';
 import { GitDocumentState, TrackedDocument } from '../trackers/documentTracker';

src/commands/openFileRevision.ts

@@ -1,8 +1,8 @@
 'use strict';
 import { Iterables, Strings } from '../system';
 import { CancellationTokenSource, Range, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
-import { FileAnnotationType } from '../annotations/annotationController';
 import { ActiveEditorCommand, Commands, getCommandUri, openEditor } from './common';
+import { FileAnnotationType } from '../configuration';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
 import { GitUri } from '../gitService';

src/commands/openWorkingFile.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { Range, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
-import { FileAnnotationType } from '../annotations/annotationController';
 import { ActiveEditorCommand, Commands, getCommandUri, openEditor } from './common';
+import { FileAnnotationType } from '../configuration';
 import { Container } from '../container';
 import { GitUri } from '../gitService';
 import { Logger } from '../logger';