From d389a7b588adfca8cb65c2c2cd37bfe499f2421c Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 3 Mar 2017 02:44:07 -0500 Subject: [PATCH] Stops using default exports --- src/blameActiveLineController.ts | 12 ++++++------ src/blameAnnotationController.ts | 6 +++--- src/blameAnnotationFormatter.ts | 2 +- src/blameAnnotationProvider.ts | 6 +++--- src/commands/copyMessageToClipboard.ts | 2 +- src/commands/copyShaToClipboard.ts | 2 +- src/commands/diffLineWithPrevious.ts | 2 +- src/commands/diffLineWithWorking.ts | 2 +- src/commands/diffWithPrevious.ts | 2 +- src/commands/diffWithWorking.ts | 2 +- src/commands/showBlame.ts | 2 +- src/commands/showBlameHistory.ts | 2 +- src/commands/showFileHistory.ts | 2 +- src/commands/showQuickCommitDetails.ts | 2 +- src/commands/showQuickFileHistory.ts | 2 +- src/commands/showQuickRepoHistory.ts | 2 +- src/commands/showQuickRepoStatus.ts | 2 +- src/commands/toggleBlame.ts | 4 +++- src/commands/toggleCodeLens.ts | 2 +- src/extension.ts | 10 +++++----- src/git/gitUri.ts | 2 +- src/gitCodeLensProvider.ts | 2 +- src/gitContentProvider.ts | 4 ++-- src/gitProvider.ts | 2 +- src/gitRevisionCodeLensProvider.ts | 4 ++-- src/quickPicks/commitDetails.ts | 2 +- src/quickPicks/gitQuickPicks.ts | 2 +- src/whitespaceController.ts | 2 +- 28 files changed, 45 insertions(+), 43 deletions(-) diff --git a/src/blameActiveLineController.ts b/src/blameActiveLineController.ts index de794c1..5301d4b 100644 --- a/src/blameActiveLineController.ts +++ b/src/blameActiveLineController.ts @@ -1,12 +1,12 @@ 'use strict'; import { Functions, Objects } from './system'; -import { DecorationOptions, DecorationInstanceRenderOptions, DecorationRenderOptions, Disposable, ExtensionContext, Range, StatusBarAlignment, StatusBarItem, TextDocumentChangeEvent, TextEditor, TextEditorDecorationType, TextEditorSelectionChangeEvent, window, workspace } from 'vscode'; -import BlameAnnotationController from './blameAnnotationController'; -import BlameAnnotationFormatter, { BlameAnnotationFormat } from './blameAnnotationFormatter'; -import { TextDocumentComparer, TextEditorComparer } from './comparers'; +import { DecorationOptions, DecorationInstanceRenderOptions, DecorationRenderOptions, Disposable, ExtensionContext, Range, StatusBarAlignment, StatusBarItem, TextEditor, TextEditorDecorationType, TextEditorSelectionChangeEvent, window, workspace } from 'vscode'; +import { BlameAnnotationController } from './blameAnnotationController'; +import { BlameAnnotationFormat, BlameAnnotationFormatter } from './blameAnnotationFormatter'; +import { TextEditorComparer } from './comparers'; import { IBlameConfig, IConfig, StatusBarCommand } from './configuration'; import { DocumentSchemes } from './constants'; -import GitProvider, { GitCommit, GitUri, IGitBlame, IGitCommitLine } from './gitProvider'; +import { GitCommit, GitProvider, GitUri, IGitBlame, IGitCommitLine } from './gitProvider'; import * as moment from 'moment'; const activeLineDecoration: TextEditorDecorationType = window.createTextEditorDecorationType({ @@ -15,7 +15,7 @@ const activeLineDecoration: TextEditorDecorationType = window.createTextEditorDe } } as DecorationRenderOptions); -export default class BlameActiveLineController extends Disposable { +export class BlameActiveLineController extends Disposable { private _activeEditorLineDisposable: Disposable | undefined; private _blame: Promise | undefined; diff --git a/src/blameAnnotationController.ts b/src/blameAnnotationController.ts index 90080ba..3726638 100644 --- a/src/blameAnnotationController.ts +++ b/src/blameAnnotationController.ts @@ -4,9 +4,9 @@ import { DecorationRenderOptions, Disposable, Event, EventEmitter, ExtensionCont import { BlameAnnotationProvider } from './blameAnnotationProvider'; import { TextDocumentComparer, TextEditorComparer } from './comparers'; import { IBlameConfig } from './configuration'; -import GitProvider from './gitProvider'; +import { GitProvider } from './gitProvider'; import { Logger } from './logger'; -import WhitespaceController from './whitespaceController'; +import { WhitespaceController } from './whitespaceController'; export const blameDecoration: TextEditorDecorationType = window.createTextEditorDecorationType({ before: { @@ -19,7 +19,7 @@ export const blameDecoration: TextEditorDecorationType = window.createTextEditor export let highlightDecoration: TextEditorDecorationType; -export default class BlameAnnotationController extends Disposable { +export class BlameAnnotationController extends Disposable { private _onDidToggleBlameAnnotationsEmitter = new EventEmitter(); get onDidToggleBlameAnnotations(): Event { diff --git a/src/blameAnnotationFormatter.ts b/src/blameAnnotationFormatter.ts index 95311ff..745c243 100644 --- a/src/blameAnnotationFormatter.ts +++ b/src/blameAnnotationFormatter.ts @@ -31,7 +31,7 @@ export enum BlameAnnotationFormat { Unconstrained } -export default class BlameAnnotationFormatter { +export class BlameAnnotationFormatter { static getAnnotation(config: IBlameConfig, commit: GitCommit, format: BlameAnnotationFormat) { const sha = commit.sha.substring(0, defaultShaLength); diff --git a/src/blameAnnotationProvider.ts b/src/blameAnnotationProvider.ts index 5e7aed5..471cd06 100644 --- a/src/blameAnnotationProvider.ts +++ b/src/blameAnnotationProvider.ts @@ -1,12 +1,12 @@ 'use strict'; import { Iterables } from './system'; import { DecorationInstanceRenderOptions, DecorationOptions, Disposable, ExtensionContext, Range, TextDocument, TextEditor, TextEditorSelectionChangeEvent, window, workspace } from 'vscode'; -import BlameAnnotationFormatter, { BlameAnnotationFormat, cssIndent, defaultShaLength, defaultAuthorLength } from './blameAnnotationFormatter'; +import { BlameAnnotationFormat, BlameAnnotationFormatter, cssIndent, defaultShaLength, defaultAuthorLength } from './blameAnnotationFormatter'; import { blameDecoration, highlightDecoration } from './blameAnnotationController'; import { TextDocumentComparer } from './comparers'; import { BlameAnnotationStyle, IBlameConfig } from './configuration'; -import GitProvider, { GitUri, IGitBlame } from './gitProvider'; -import WhitespaceController from './whitespaceController'; +import { GitProvider, GitUri, IGitBlame } from './gitProvider'; +import { WhitespaceController } from './whitespaceController'; export class BlameAnnotationProvider extends Disposable { diff --git a/src/commands/copyMessageToClipboard.ts b/src/commands/copyMessageToClipboard.ts index 0c6b164..11def2d 100644 --- a/src/commands/copyMessageToClipboard.ts +++ b/src/commands/copyMessageToClipboard.ts @@ -2,7 +2,7 @@ import { Iterables } from '../system'; import { TextEditor, Uri, window } from 'vscode'; import { ActiveEditorCommand, Commands } from './commands'; -import GitProvider, { GitUri } from '../gitProvider'; +import { GitProvider, GitUri } from '../gitProvider'; import { Logger } from '../logger'; import { copy } from 'copy-paste'; diff --git a/src/commands/copyShaToClipboard.ts b/src/commands/copyShaToClipboard.ts index 64978f1..176990d 100644 --- a/src/commands/copyShaToClipboard.ts +++ b/src/commands/copyShaToClipboard.ts @@ -2,7 +2,7 @@ import { Iterables } from '../system'; import { TextEditor, Uri, window } from 'vscode'; import { ActiveEditorCommand, Commands } from './commands'; -import GitProvider, { GitUri } from '../gitProvider'; +import { GitProvider, GitUri } from '../gitProvider'; import { Logger } from '../logger'; import { copy } from 'copy-paste'; diff --git a/src/commands/diffLineWithPrevious.ts b/src/commands/diffLineWithPrevious.ts index 88aeeff..6976ba4 100644 --- a/src/commands/diffLineWithPrevious.ts +++ b/src/commands/diffLineWithPrevious.ts @@ -2,7 +2,7 @@ import { commands, TextEditor, Uri, window } from 'vscode'; import { ActiveEditorCommand, Commands } from './commands'; import { BuiltInCommands } from '../constants'; -import GitProvider, { GitCommit, GitUri } from '../gitProvider'; +import { GitCommit, GitProvider, GitUri } from '../gitProvider'; import { Logger } from '../logger'; import * as path from 'path'; diff --git a/src/commands/diffLineWithWorking.ts b/src/commands/diffLineWithWorking.ts index 17447cb..f4d080a 100644 --- a/src/commands/diffLineWithWorking.ts +++ b/src/commands/diffLineWithWorking.ts @@ -1,7 +1,7 @@ 'use strict'; import { commands, TextEditor, Uri, window } from 'vscode'; import { ActiveEditorCommand, Commands } from './commands'; -import GitProvider, { GitCommit, GitUri } from '../gitProvider'; +import { GitCommit, GitProvider, GitUri } from '../gitProvider'; import { Logger } from '../logger'; export class DiffLineWithWorkingCommand extends ActiveEditorCommand { diff --git a/src/commands/diffWithPrevious.ts b/src/commands/diffWithPrevious.ts index 0ca255a..7a206d9 100644 --- a/src/commands/diffWithPrevious.ts +++ b/src/commands/diffWithPrevious.ts @@ -3,7 +3,7 @@ import { Iterables } from '../system'; import { commands, Range, TextEditor, Uri, window } from 'vscode'; import { ActiveEditorCommand, Commands } from './commands'; import { BuiltInCommands } from '../constants'; -import GitProvider, { GitCommit, GitUri } from '../gitProvider'; +import { GitCommit, GitProvider, GitUri } from '../gitProvider'; import { Logger } from '../logger'; import * as moment from 'moment'; import * as path from 'path'; diff --git a/src/commands/diffWithWorking.ts b/src/commands/diffWithWorking.ts index 181a61b..92f3d79 100644 --- a/src/commands/diffWithWorking.ts +++ b/src/commands/diffWithWorking.ts @@ -3,7 +3,7 @@ import { Iterables } from '../system'; import { commands, TextEditor, Uri, window } from 'vscode'; import { ActiveEditorCommand, Commands } from './commands'; import { BuiltInCommands } from '../constants'; -import GitProvider, { GitCommit, GitUri } from '../gitProvider'; +import { GitCommit, GitProvider, GitUri } from '../gitProvider'; import { Logger } from '../logger'; import * as path from 'path'; diff --git a/src/commands/showBlame.ts b/src/commands/showBlame.ts index 8659a7d..8ea3a9a 100644 --- a/src/commands/showBlame.ts +++ b/src/commands/showBlame.ts @@ -1,6 +1,6 @@ 'use strict'; import { TextEditor, TextEditorEdit, Uri, window } from 'vscode'; -import BlameAnnotationController from '../blameAnnotationController'; +import { BlameAnnotationController } from '../blameAnnotationController'; import { Commands, EditorCommand } from './commands'; import { Logger } from '../logger'; diff --git a/src/commands/showBlameHistory.ts b/src/commands/showBlameHistory.ts index 7f5e095..2f5aff9 100644 --- a/src/commands/showBlameHistory.ts +++ b/src/commands/showBlameHistory.ts @@ -2,7 +2,7 @@ import { commands, Position, Range, TextEditor, TextEditorEdit, Uri, window } from 'vscode'; import { Commands, EditorCommand } from './commands'; import { BuiltInCommands } from '../constants'; -import GitProvider, { GitUri } from '../gitProvider'; +import { GitProvider, GitUri } from '../gitProvider'; import { Logger } from '../logger'; export class ShowBlameHistoryCommand extends EditorCommand { diff --git a/src/commands/showFileHistory.ts b/src/commands/showFileHistory.ts index 24fa897..b0857e5 100644 --- a/src/commands/showFileHistory.ts +++ b/src/commands/showFileHistory.ts @@ -2,7 +2,7 @@ import { commands, Position, Range, TextEditor, TextEditorEdit, Uri, window } from 'vscode'; import { Commands, EditorCommand } from './commands'; import { BuiltInCommands } from '../constants'; -import GitProvider, { GitUri } from '../gitProvider'; +import { GitProvider, GitUri } from '../gitProvider'; import { Logger } from '../logger'; export class ShowFileHistoryCommand extends EditorCommand { diff --git a/src/commands/showQuickCommitDetails.ts b/src/commands/showQuickCommitDetails.ts index 75dbad6..d719e7c 100644 --- a/src/commands/showQuickCommitDetails.ts +++ b/src/commands/showQuickCommitDetails.ts @@ -2,7 +2,7 @@ import { Iterables } from '../system'; import { commands, TextEditor, Uri, window } from 'vscode'; import { ActiveEditorCommand, Commands } from './commands'; -import GitProvider, { GitCommit, GitLogCommit, GitUri } from '../gitProvider'; +import { GitCommit, GitLogCommit, GitProvider, GitUri } from '../gitProvider'; import { Logger } from '../logger'; import { CommandQuickPickItem, CommitFileDetailsQuickPick, CommitDetailsQuickPick, CommitWithFileStatusQuickPickItem } from '../quickPicks'; diff --git a/src/commands/showQuickFileHistory.ts b/src/commands/showQuickFileHistory.ts index edff22a..7dedc1a 100644 --- a/src/commands/showQuickFileHistory.ts +++ b/src/commands/showQuickFileHistory.ts @@ -1,7 +1,7 @@ 'use strict'; import { commands, TextEditor, Uri, window } from 'vscode'; import { ActiveEditorCommand, Commands } from './commands'; -import GitProvider, { GitCommit, GitUri } from '../gitProvider'; +import { GitCommit, GitProvider, GitUri } from '../gitProvider'; import { Logger } from '../logger'; import { CommandQuickPickItem, FileHistoryQuickPick } from '../quickPicks'; diff --git a/src/commands/showQuickRepoHistory.ts b/src/commands/showQuickRepoHistory.ts index 1238fde..ea739b1 100644 --- a/src/commands/showQuickRepoHistory.ts +++ b/src/commands/showQuickRepoHistory.ts @@ -1,7 +1,7 @@ 'use strict'; import { commands, TextEditor, Uri, window } from 'vscode'; import { ActiveEditorCommand, Commands } from './commands'; -import GitProvider, { GitCommit, GitUri } from '../gitProvider'; +import { GitCommit, GitProvider, GitUri } from '../gitProvider'; import { Logger } from '../logger'; import { CommandQuickPickItem, RepoHistoryQuickPick } from '../quickPicks'; diff --git a/src/commands/showQuickRepoStatus.ts b/src/commands/showQuickRepoStatus.ts index b135172..5ec3d45 100644 --- a/src/commands/showQuickRepoStatus.ts +++ b/src/commands/showQuickRepoStatus.ts @@ -1,7 +1,7 @@ 'use strict'; import { TextEditor, Uri, window } from 'vscode'; import { ActiveEditorCommand, Commands } from './commands'; -import GitProvider, { GitUri } from '../gitProvider'; +import { GitProvider, GitUri } from '../gitProvider'; import { Logger } from '../logger'; import { CommandQuickPickItem, RepoStatusQuickPick } from '../quickPicks'; diff --git a/src/commands/toggleBlame.ts b/src/commands/toggleBlame.ts index 58a16b7..9b41c0a 100644 --- a/src/commands/toggleBlame.ts +++ b/src/commands/toggleBlame.ts @@ -1,6 +1,6 @@ 'use strict'; import { TextEditor, TextEditorEdit, Uri, window } from 'vscode'; -import BlameAnnotationController from '../blameAnnotationController'; +import { BlameAnnotationController } from '../blameAnnotationController'; import { Commands, EditorCommand } from './commands'; import { Logger } from '../logger'; @@ -11,6 +11,8 @@ export class ToggleBlameCommand extends EditorCommand { } async execute(editor: TextEditor, edit: TextEditorEdit, uri?: Uri, sha?: string): Promise { + if (editor && editor.document && editor.document.isDirty) return undefined; + try { if (sha) { return this.annotationController.toggleBlameAnnotation(editor, sha); diff --git a/src/commands/toggleCodeLens.ts b/src/commands/toggleCodeLens.ts index e3a345e..4026062 100644 --- a/src/commands/toggleCodeLens.ts +++ b/src/commands/toggleCodeLens.ts @@ -1,7 +1,7 @@ 'use strict'; import { TextEditor, TextEditorEdit } from 'vscode'; import { Commands, EditorCommand } from './commands'; -import GitProvider from '../gitProvider'; +import { GitProvider } from '../gitProvider'; export class ToggleCodeLensCommand extends EditorCommand { diff --git a/src/extension.ts b/src/extension.ts index 17fd019..49b928f 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,7 +1,7 @@ 'use strict'; import { commands, ExtensionContext, languages, window, workspace } from 'vscode'; -import BlameActiveLineController from './blameActiveLineController'; -import BlameAnnotationController from './blameAnnotationController'; +import { BlameActiveLineController } from './blameActiveLineController'; +import { BlameAnnotationController } from './blameAnnotationController'; import { configureCssCharacters } from './blameAnnotationFormatter'; import { CopyMessageToClipboardCommand, CopyShaToClipboardCommand } from './commands'; import { DiffLineWithPreviousCommand, DiffLineWithWorkingCommand, DiffWithPreviousCommand, DiffWithWorkingCommand} from './commands'; @@ -12,9 +12,9 @@ import { ToggleCodeLensCommand } from './commands'; import { Keyboard } from './commands'; import { IAdvancedConfig, IBlameConfig } from './configuration'; import { BuiltInCommands, WorkspaceState } from './constants'; -import GitContentProvider from './gitContentProvider'; -import GitProvider, { Git } from './gitProvider'; -import GitRevisionCodeLensProvider from './gitRevisionCodeLensProvider'; +import { GitContentProvider } from './gitContentProvider'; +import { Git, GitProvider } from './gitProvider'; +import { GitRevisionCodeLensProvider } from './gitRevisionCodeLensProvider'; import { Logger } from './logger'; // this method is called when your extension is activated diff --git a/src/git/gitUri.ts b/src/git/gitUri.ts index c37e2e3..7084ac2 100644 --- a/src/git/gitUri.ts +++ b/src/git/gitUri.ts @@ -1,7 +1,7 @@ 'use strict'; import { Uri } from 'vscode'; import { DocumentSchemes } from '../constants'; -import GitProvider, { Git } from '../gitProvider'; +import { Git, GitProvider } from '../gitProvider'; import * as path from 'path'; export class GitUri extends Uri { diff --git a/src/gitCodeLensProvider.ts b/src/gitCodeLensProvider.ts index 49d5584..271be4a 100644 --- a/src/gitCodeLensProvider.ts +++ b/src/gitCodeLensProvider.ts @@ -4,7 +4,7 @@ import { CancellationToken, CodeLens, CodeLensProvider, commands, DocumentSelect import { Commands } from './commands'; import { BuiltInCommands, DocumentSchemes } from './constants'; import { CodeLensCommand, CodeLensLocation, IConfig, ICodeLensLanguageLocation } from './configuration'; -import GitProvider, { GitCommit, GitUri, IGitBlame, IGitBlameLines } from './gitProvider'; +import { GitCommit, GitProvider, GitUri, IGitBlame, IGitBlameLines } from './gitProvider'; import { Logger, OutputLevel } from './logger'; import * as moment from 'moment'; diff --git a/src/gitContentProvider.ts b/src/gitContentProvider.ts index 838b79f..7bf8eba 100644 --- a/src/gitContentProvider.ts +++ b/src/gitContentProvider.ts @@ -1,11 +1,11 @@ 'use strict'; import { ExtensionContext, TextDocumentContentProvider, Uri, window } from 'vscode'; import { DocumentSchemes } from './constants'; -import GitProvider from './gitProvider'; +import { GitProvider } from './gitProvider'; import { Logger } from './logger'; import * as path from 'path'; -export default class GitContentProvider implements TextDocumentContentProvider { +export class GitContentProvider implements TextDocumentContentProvider { static scheme = DocumentSchemes.Git; diff --git a/src/gitProvider.ts b/src/gitProvider.ts index a6552ea..3de4bff 100644 --- a/src/gitProvider.ts +++ b/src/gitProvider.ts @@ -45,7 +45,7 @@ enum RemoveCacheReason { DocumentSaved } -export default class GitProvider extends Disposable { +export class GitProvider extends Disposable { private _onDidChangeGitCacheEmitter = new EventEmitter(); get onDidChangeGitCache(): Event { diff --git a/src/gitRevisionCodeLensProvider.ts b/src/gitRevisionCodeLensProvider.ts index 51264f5..23bcb5e 100644 --- a/src/gitRevisionCodeLensProvider.ts +++ b/src/gitRevisionCodeLensProvider.ts @@ -3,7 +3,7 @@ import { Iterables } from './system'; import { CancellationToken, CodeLens, CodeLensProvider, DocumentSelector, ExtensionContext, Range, TextDocument, Uri } from 'vscode'; import { Commands } from './commands'; import { DocumentSchemes } from './constants'; -import GitProvider, { GitCommit, GitUri } from './gitProvider'; +import { GitCommit, GitProvider, GitUri } from './gitProvider'; export class GitDiffWithWorkingCodeLens extends CodeLens { @@ -19,7 +19,7 @@ export class GitDiffWithPreviousCodeLens extends CodeLens { } } -export default class GitRevisionCodeLensProvider implements CodeLensProvider { +export class GitRevisionCodeLensProvider implements CodeLensProvider { static selector: DocumentSelector = { scheme: DocumentSchemes.Git }; diff --git a/src/quickPicks/commitDetails.ts b/src/quickPicks/commitDetails.ts index 0935c28..86a92dc 100644 --- a/src/quickPicks/commitDetails.ts +++ b/src/quickPicks/commitDetails.ts @@ -2,7 +2,7 @@ import { Iterables } from '../system'; import { QuickPickItem, QuickPickOptions, Uri, window } from 'vscode'; import { Commands, Keyboard } from '../commands'; -import GitProvider, { GitCommit, GitLogCommit, GitUri } from '../gitProvider'; +import { GitCommit, GitLogCommit, GitProvider, GitUri } from '../gitProvider'; import { CommitWithFileStatusQuickPickItem } from './gitQuickPicks'; import { CommandQuickPickItem, getQuickPickIgnoreFocusOut, OpenFileCommandQuickPickItem, OpenFilesCommandQuickPickItem } from './quickPicks'; import * as moment from 'moment'; diff --git a/src/quickPicks/gitQuickPicks.ts b/src/quickPicks/gitQuickPicks.ts index 99d3a4f..2a23d60 100644 --- a/src/quickPicks/gitQuickPicks.ts +++ b/src/quickPicks/gitQuickPicks.ts @@ -1,6 +1,6 @@ 'use strict'; import { QuickPickItem, Uri } from 'vscode'; -import GitProvider, { getGitStatusIcon, GitCommit, GitFileStatus, GitUri } from '../gitProvider'; +import { getGitStatusIcon, GitCommit, GitFileStatus, GitProvider, GitUri } from '../gitProvider'; import { OpenFileCommandQuickPickItem } from './quickPicks'; import * as moment from 'moment'; import * as path from 'path'; diff --git a/src/whitespaceController.ts b/src/whitespaceController.ts index 8750dd7..b172415 100644 --- a/src/whitespaceController.ts +++ b/src/whitespaceController.ts @@ -8,7 +8,7 @@ enum SettingLocation { default } -export default class WhitespaceController extends Disposable { +export class WhitespaceController extends Disposable { private _count: number = 0; private _disposable: Disposable;