Adds whitespace style changes

This commit is contained in:
Eric Amodio
2017-02-05 13:31:05 -05:00
parent 25007f7b69
commit 2b907788dd
27 changed files with 37 additions and 0 deletions

View File

@@ -8,6 +8,7 @@ import GitProvider from './gitProvider';
import { Logger } from './logger'; import { Logger } from './logger';
export default class BlameAnnotationController extends Disposable { export default class BlameAnnotationController extends Disposable {
private _annotationProviders: Map<number, BlameAnnotationProvider> = new Map(); private _annotationProviders: Map<number, BlameAnnotationProvider> = new Map();
private _blameAnnotationsDisposable: Disposable; private _blameAnnotationsDisposable: Disposable;
private _pendingWhitespaceToggleDisposable: Disposable; private _pendingWhitespaceToggleDisposable: Disposable;

View File

@@ -17,6 +17,7 @@ const blameDecoration: TextEditorDecorationType = window.createTextEditorDecorat
let highlightDecoration: TextEditorDecorationType; let highlightDecoration: TextEditorDecorationType;
export class BlameAnnotationProvider extends Disposable { export class BlameAnnotationProvider extends Disposable {
public document: TextDocument; public document: TextDocument;
public requiresRenderWhitespaceToggle: boolean = false; public requiresRenderWhitespaceToggle: boolean = false;

View File

@@ -8,6 +8,7 @@ import { Logger } from './logger';
import * as moment from 'moment'; import * as moment from 'moment';
export default class BlameStatusBarController extends Disposable { export default class BlameStatusBarController extends Disposable {
private _blame: Promise<IGitBlame> | undefined; private _blame: Promise<IGitBlame> | undefined;
private _config: IConfig; private _config: IConfig;
private _disposable: Disposable; private _disposable: Disposable;

View File

@@ -3,6 +3,7 @@ import { commands, Disposable, TextEditor, TextEditorEdit } from 'vscode';
import { Commands } from '../constants'; import { Commands } from '../constants';
export abstract class Command extends Disposable { export abstract class Command extends Disposable {
private _disposable: Disposable; private _disposable: Disposable;
constructor(command: Commands) { constructor(command: Commands) {

View File

@@ -6,6 +6,7 @@ import GitProvider, { GitCommit, GitUri } from '../gitProvider';
import { Logger } from '../logger'; import { Logger } from '../logger';
export default class DiffLineWithPreviousCommand extends EditorCommand { export default class DiffLineWithPreviousCommand extends EditorCommand {
constructor(private git: GitProvider) { constructor(private git: GitProvider) {
super(Commands.DiffLineWithPrevious); super(Commands.DiffLineWithPrevious);
} }

View File

@@ -6,6 +6,7 @@ import GitProvider, { GitCommit, GitUri } from '../gitProvider';
import { Logger } from '../logger'; import { Logger } from '../logger';
export default class DiffLineWithWorkingCommand extends EditorCommand { export default class DiffLineWithWorkingCommand extends EditorCommand {
constructor(private git: GitProvider) { constructor(private git: GitProvider) {
super(Commands.DiffLineWithWorking); super(Commands.DiffLineWithWorking);
} }

View File

@@ -9,6 +9,7 @@ import * as moment from 'moment';
import * as path from 'path'; import * as path from 'path';
export default class DiffWithPreviousCommand extends EditorCommand { export default class DiffWithPreviousCommand extends EditorCommand {
constructor(private git: GitProvider) { constructor(private git: GitProvider) {
super(Commands.DiffWithPrevious); super(Commands.DiffWithPrevious);
} }

View File

@@ -8,6 +8,7 @@ import { Logger } from '../logger';
import * as path from 'path'; import * as path from 'path';
export default class DiffWithWorkingCommand extends EditorCommand { export default class DiffWithWorkingCommand extends EditorCommand {
constructor(private git: GitProvider) { constructor(private git: GitProvider) {
super(Commands.DiffWithWorking); super(Commands.DiffWithWorking);
} }

View File

@@ -6,6 +6,7 @@ import * as moment from 'moment';
import * as path from 'path'; import * as path from 'path';
export class CommitQuickPickItem implements QuickPickItem { export class CommitQuickPickItem implements QuickPickItem {
label: string; label: string;
description: string; description: string;
detail: string; detail: string;
@@ -22,6 +23,7 @@ export interface CompareQuickPickItem extends QuickPickItem {
} }
export class FileQuickPickItem implements QuickPickItem { export class FileQuickPickItem implements QuickPickItem {
label: string; label: string;
description: string; description: string;
detail: string; detail: string;
@@ -34,6 +36,7 @@ export class FileQuickPickItem implements QuickPickItem {
} }
export class ShowAllCommitsQuickPickItem implements QuickPickItem { export class ShowAllCommitsQuickPickItem implements QuickPickItem {
label: string; label: string;
description: string; description: string;
detail: string; detail: string;

View File

@@ -6,6 +6,7 @@ import { Commands } from '../constants';
import { Logger } from '../logger'; import { Logger } from '../logger';
export default class ShowBlameCommand extends EditorCommand { export default class ShowBlameCommand extends EditorCommand {
constructor(private annotationController: BlameAnnotationController) { constructor(private annotationController: BlameAnnotationController) {
super(Commands.ShowBlame); super(Commands.ShowBlame);
} }

View File

@@ -6,6 +6,7 @@ import GitProvider, { GitUri } from '../gitProvider';
import { Logger } from '../logger'; import { Logger } from '../logger';
export default class ShowBlameHistoryCommand extends EditorCommand { export default class ShowBlameHistoryCommand extends EditorCommand {
constructor(private git: GitProvider) { constructor(private git: GitProvider) {
super(Commands.ShowBlameHistory); super(Commands.ShowBlameHistory);
} }

View File

@@ -6,6 +6,7 @@ import GitProvider, { GitUri } from '../gitProvider';
import { Logger } from '../logger'; import { Logger } from '../logger';
export default class ShowFileHistoryCommand extends EditorCommand { export default class ShowFileHistoryCommand extends EditorCommand {
constructor(private git: GitProvider) { constructor(private git: GitProvider) {
super(Commands.ShowFileHistory); super(Commands.ShowFileHistory);
} }

View File

@@ -9,6 +9,7 @@ import { CommitQuickPickItem, CompareQuickPickItem, ShowAllCommitsQuickPickItem
import * as moment from 'moment'; import * as moment from 'moment';
export default class ShowQuickFileHistoryCommand extends EditorCommand { export default class ShowQuickFileHistoryCommand extends EditorCommand {
constructor(private git: GitProvider) { constructor(private git: GitProvider) {
super(Commands.ShowQuickFileHistory); super(Commands.ShowQuickFileHistory);
} }

View File

@@ -9,6 +9,7 @@ import { CommitQuickPickItem, CompareQuickPickItem, FileQuickPickItem, ShowAllCo
import * as moment from 'moment'; import * as moment from 'moment';
export default class ShowQuickRepoHistoryCommand extends Command { export default class ShowQuickRepoHistoryCommand extends Command {
constructor(private git: GitProvider, public repoPath: string) { constructor(private git: GitProvider, public repoPath: string) {
super(Commands.ShowQuickRepoHistory); super(Commands.ShowQuickRepoHistory);
} }

View File

@@ -6,6 +6,7 @@ import { Commands } from '../constants';
import { Logger } from '../logger'; import { Logger } from '../logger';
export default class ToggleBlameCommand extends EditorCommand { export default class ToggleBlameCommand extends EditorCommand {
constructor(private annotationController: BlameAnnotationController) { constructor(private annotationController: BlameAnnotationController) {
super(Commands.ToggleBlame); super(Commands.ToggleBlame);
} }

View File

@@ -5,6 +5,7 @@ import { Commands } from '../constants';
import GitProvider from '../gitProvider'; import GitProvider from '../gitProvider';
export default class ToggleCodeLensCommand extends EditorCommand { export default class ToggleCodeLensCommand extends EditorCommand {
constructor(private git: GitProvider) { constructor(private git: GitProvider) {
super(Commands.ToggleCodeLens); super(Commands.ToggleCodeLens);
} }

View File

@@ -6,6 +6,7 @@ abstract class Comparer<T> {
} }
class UriComparer extends Comparer<Uri> { class UriComparer extends Comparer<Uri> {
equals(lhs: Uri, rhs: Uri) { equals(lhs: Uri, rhs: Uri) {
if (!lhs && !rhs) return true; if (!lhs && !rhs) return true;
if ((lhs && !rhs) || (!lhs && rhs)) return false; if ((lhs && !rhs) || (!lhs && rhs)) return false;
@@ -15,6 +16,7 @@ class UriComparer extends Comparer<Uri> {
} }
class TextDocumentComparer extends Comparer<TextDocument> { class TextDocumentComparer extends Comparer<TextDocument> {
equals(lhs: TextDocument, rhs: TextDocument) { equals(lhs: TextDocument, rhs: TextDocument) {
if (!lhs && !rhs) return true; if (!lhs && !rhs) return true;
if ((lhs && !rhs) || (!lhs && rhs)) return false; if ((lhs && !rhs) || (!lhs && rhs)) return false;
@@ -24,6 +26,7 @@ class TextDocumentComparer extends Comparer<TextDocument> {
} }
class TextEditorComparer extends Comparer<TextEditor> { class TextEditorComparer extends Comparer<TextEditor> {
equals(lhs: TextEditor, rhs: TextEditor) { equals(lhs: TextEditor, rhs: TextEditor) {
if (!lhs && !rhs) return true; if (!lhs && !rhs) return true;
if ((lhs && !rhs) || (!lhs && rhs)) return false; if ((lhs && !rhs) || (!lhs && rhs)) return false;

View File

@@ -28,6 +28,7 @@ interface IBlameEntry {
} }
export class GitBlameParserEnricher implements IGitEnricher<IGitBlame> { export class GitBlameParserEnricher implements IGitEnricher<IGitBlame> {
constructor(public format: GitBlameFormat) { constructor(public format: GitBlameFormat) {
if (format !== GitBlameFormat.incremental) { if (format !== GitBlameFormat.incremental) {
throw new Error(`Invalid blame format=${format}`); throw new Error(`Invalid blame format=${format}`);

View File

@@ -19,6 +19,7 @@ interface ILogEntry {
} }
export class GitLogParserEnricher implements IGitEnricher<IGitLog> { export class GitLogParserEnricher implements IGitEnricher<IGitLog> {
private _parseEntries(data: string, isRepoPath: boolean): ILogEntry[] { private _parseEntries(data: string, isRepoPath: boolean): ILogEntry[] {
if (!data) return undefined; if (!data) return undefined;

View File

@@ -41,6 +41,7 @@ export const GitBlameFormat = {
}; };
export default class Git { export default class Git {
static normalizePath(fileName: string, repoPath?: string) { static normalizePath(fileName: string, repoPath?: string) {
return fileName.replace(/\\/g, '/'); return fileName.replace(/\\/g, '/');
} }

View File

@@ -53,6 +53,7 @@ interface IGitCommit {
} }
export class GitCommit implements IGitCommit { export class GitCommit implements IGitCommit {
lines: IGitCommitLine[]; lines: IGitCommitLine[];
originalFileName?: string; originalFileName?: string;
previousSha?: string; previousSha?: string;

View File

@@ -4,6 +4,7 @@ import { DocumentSchemes } from '../constants';
import GitProvider from '../gitProvider'; import GitProvider from '../gitProvider';
export class GitUri extends Uri { export class GitUri extends Uri {
offset: number; offset: number;
repoPath?: string | undefined; repoPath?: string | undefined;
sha?: string | undefined; sha?: string | undefined;

View File

@@ -8,6 +8,7 @@ import { Logger } from './logger';
import * as moment from 'moment'; import * as moment from 'moment';
export class GitRecentChangeCodeLens extends CodeLens { export class GitRecentChangeCodeLens extends CodeLens {
constructor(private blame: () => IGitBlameLines, public uri: GitUri, public symbolKind: SymbolKind, public blameRange: Range, public isFullRange: boolean, range: Range) { constructor(private blame: () => IGitBlameLines, public uri: GitUri, public symbolKind: SymbolKind, public blameRange: Range, public isFullRange: boolean, range: Range) {
super(range); super(range);
} }
@@ -18,6 +19,7 @@ export class GitRecentChangeCodeLens extends CodeLens {
} }
export class GitAuthorsCodeLens extends CodeLens { export class GitAuthorsCodeLens extends CodeLens {
constructor(private blame: () => IGitBlameLines, public uri: GitUri, public symbolKind: SymbolKind, public blameRange: Range, public isFullRange: boolean, range: Range) { constructor(private blame: () => IGitBlameLines, public uri: GitUri, public symbolKind: SymbolKind, public blameRange: Range, public isFullRange: boolean, range: Range) {
super(range); super(range);
} }
@@ -28,6 +30,7 @@ export class GitAuthorsCodeLens extends CodeLens {
} }
export default class GitCodeLensProvider implements CodeLensProvider { export default class GitCodeLensProvider implements CodeLensProvider {
static selector: DocumentSelector = { scheme: DocumentSchemes.File }; static selector: DocumentSelector = { scheme: DocumentSchemes.File };
private _config: IConfig; private _config: IConfig;

View File

@@ -6,6 +6,7 @@ import { Logger } from './logger';
import * as path from 'path'; import * as path from 'path';
export default class GitContentProvider implements TextDocumentContentProvider { export default class GitContentProvider implements TextDocumentContentProvider {
static scheme = DocumentSchemes.Git; static scheme = DocumentSchemes.Git;
constructor(context: ExtensionContext, private git: GitProvider) { } constructor(context: ExtensionContext, private git: GitProvider) { }

View File

@@ -16,10 +16,12 @@ export { Git, GitUri };
export * from './git/git'; export * from './git/git';
class UriCacheEntry { class UriCacheEntry {
constructor(public uri: GitUri) { } constructor(public uri: GitUri) { }
} }
class GitCacheEntry { class GitCacheEntry {
blame?: ICachedBlame; blame?: ICachedBlame;
log?: ICachedLog; log?: ICachedLog;
@@ -44,6 +46,7 @@ enum RemoveCacheReason {
} }
export default class GitProvider extends Disposable { export default class GitProvider extends Disposable {
private _gitCache: Map<string, GitCacheEntry> | undefined; private _gitCache: Map<string, GitCacheEntry> | undefined;
private _cacheDisposable: Disposable | undefined; private _cacheDisposable: Disposable | undefined;
private _repoPath: string; private _repoPath: string;

View File

@@ -5,18 +5,21 @@ import { Commands, DocumentSchemes } from './constants';
import GitProvider, { GitCommit, GitUri } from './gitProvider'; import GitProvider, { GitCommit, GitUri } from './gitProvider';
export class GitDiffWithWorkingCodeLens extends CodeLens { export class GitDiffWithWorkingCodeLens extends CodeLens {
constructor(git: GitProvider, public fileName: string, public commit: GitCommit, range: Range) { constructor(git: GitProvider, public fileName: string, public commit: GitCommit, range: Range) {
super(range); super(range);
} }
} }
export class GitDiffWithPreviousCodeLens extends CodeLens { export class GitDiffWithPreviousCodeLens extends CodeLens {
constructor(git: GitProvider, public fileName: string, public commit: GitCommit, range: Range) { constructor(git: GitProvider, public fileName: string, public commit: GitCommit, range: Range) {
super(range); super(range);
} }
} }
export default class GitRevisionCodeLensProvider implements CodeLensProvider { export default class GitRevisionCodeLensProvider implements CodeLensProvider {
static selector: DocumentSelector = { scheme: DocumentSchemes.Git }; static selector: DocumentSelector = { scheme: DocumentSchemes.Git };
constructor(context: ExtensionContext, private git: GitProvider) { } constructor(context: ExtensionContext, private git: GitProvider) { }

View File

@@ -25,6 +25,7 @@ function onConfigurationChange() {
} }
export class Logger { export class Logger {
static log(message?: any, ...params: any[]): void { static log(message?: any, ...params: any[]): void {
if (config.debug) { if (config.debug) {
console.log('[GitLens]', message, ...params); console.log('[GitLens]', message, ...params);