From ca58c21bfc2f8e1a1f6f09667402d58d3dafe7d0 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Thu, 22 Feb 2018 10:22:10 +0100 Subject: [PATCH] fixes #44188 --- extensions/git/src/api.ts | 2 +- extensions/git/src/commands.ts | 13 +++---------- extensions/git/src/decorationProvider.ts | 4 ++-- extensions/git/src/decorators.ts | 2 +- extensions/git/src/git.ts | 2 -- extensions/git/src/main.ts | 2 +- extensions/git/src/model.ts | 4 ++-- extensions/git/src/repository.ts | 10 ++++------ extensions/git/tsconfig.json | 3 ++- 9 files changed, 16 insertions(+), 26 deletions(-) diff --git a/extensions/git/src/api.ts b/extensions/git/src/api.ts index 4e569a8e884..8d94502e041 100644 --- a/extensions/git/src/api.ts +++ b/extensions/git/src/api.ts @@ -6,7 +6,7 @@ 'use strict'; import { Model } from './model'; -import { SourceControlInputBox, Uri } from 'vscode'; +import { Uri } from 'vscode'; export interface InputBox { value: string; diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts index 776e6c8ac1b..8ce710d56b4 100644 --- a/extensions/git/src/commands.ts +++ b/extensions/git/src/commands.ts @@ -7,10 +7,10 @@ import { Uri, commands, Disposable, window, workspace, QuickPickItem, OutputChannel, Range, WorkspaceEdit, Position, LineChange, SourceControlResourceState, TextDocumentShowOptions, ViewColumn, ProgressLocation, TextEditor, CancellationTokenSource, StatusBarAlignment } from 'vscode'; import { Ref, RefType, Git, GitErrorCodes, Branch } from './git'; -import { Repository, Resource, Status, CommitOptions, ResourceGroupType, RepositoryState } from './repository'; +import { Repository, Resource, Status, CommitOptions, ResourceGroupType } from './repository'; import { Model } from './model'; import { toGitUri, fromGitUri } from './uri'; -import { grep, eventToPromise, isDescendant } from './util'; +import { grep, isDescendant } from './util'; import { applyLineChanges, intersectDiffWithRange, toLineRanges, invertLineChange, getModifiedRange } from './staging'; import * as path from 'path'; import { lstat, Stats } from 'fs'; @@ -237,7 +237,7 @@ export class CommandCenter { } const { size, object } = await repository.lstree(gitRef, uri.fsPath); - const { mimetype, encoding } = await repository.detectObjectType(object); + const { mimetype } = await repository.detectObjectType(object); if (mimetype === 'text/plain') { return toGitUri(uri, ref); @@ -1051,13 +1051,6 @@ export class CommandCenter { value = (await repository.getCommit(repository.HEAD.commit)).message; } - const getPreviousCommitMessage = async () => { - //Only return the previous commit message if it's an amend commit and the repo already has a commit - if (opts && opts.amend && repository.HEAD && repository.HEAD.commit) { - return (await repository.getCommit('HEAD')).message; - } - }; - return await window.showInputBox({ value, placeHolder: localize('commit message', "Commit message"), diff --git a/extensions/git/src/decorationProvider.ts b/extensions/git/src/decorationProvider.ts index a25f6052d69..48594918f5d 100644 --- a/extensions/git/src/decorationProvider.ts +++ b/extensions/git/src/decorationProvider.ts @@ -10,8 +10,8 @@ import * as path from 'path'; import { Repository, GitResourceGroup, Status } from './repository'; import { Model } from './model'; import { debounce } from './decorators'; -import { filterEvent, dispose, anyEvent, mapEvent, fireEvent } from './util'; -import { Submodule, GitErrorCodes } from './git'; +import { filterEvent, dispose, anyEvent, fireEvent } from './util'; +import { GitErrorCodes } from './git'; type Callback = { resolve: (status: boolean) => void, reject: (err: any) => void }; diff --git a/extensions/git/src/decorators.ts b/extensions/git/src/decorators.ts index 83ee04b17ad..abd0265ef9b 100644 --- a/extensions/git/src/decorators.ts +++ b/extensions/git/src/decorators.ts @@ -78,7 +78,7 @@ function _throttle(fn: Function, key: string): Function { export const throttle = decorate(_throttle); -function _sequentialize(fn: Function, key: string): Function { +function _sequentialize(fn: Function, key: string): Function { const currentKey = `__$sequence$${key}`; return function (this: any, ...args: any[]) { diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts index 7074ab22b90..d2f0ee6f914 100644 --- a/extensions/git/src/git.ts +++ b/extensions/git/src/git.ts @@ -362,7 +362,6 @@ function getGitErrorCode(stderr: string): string | undefined { export class Git { private gitPath: string; - private version: string; private env: any; private _onOutput = new EventEmitter(); @@ -370,7 +369,6 @@ export class Git { constructor(options: IGitOptions) { this.gitPath = options.gitPath; - this.version = options.version; this.env = options.env || {}; } diff --git a/extensions/git/src/main.ts b/extensions/git/src/main.ts index a003fe9bcfb..e7e0c7e8768 100644 --- a/extensions/git/src/main.ts +++ b/extensions/git/src/main.ts @@ -14,7 +14,7 @@ import { CommandCenter } from './commands'; import { GitContentProvider } from './contentProvider'; import { GitDecorations } from './decorationProvider'; import { Askpass } from './askpass'; -import { toDisposable, filterEvent, mapEvent, eventToPromise } from './util'; +import { toDisposable, filterEvent, eventToPromise } from './util'; import TelemetryReporter from 'vscode-extension-telemetry'; import { API, createApi } from './api'; diff --git a/extensions/git/src/model.ts b/extensions/git/src/model.ts index 235b07787ba..3c0e8d6b59d 100644 --- a/extensions/git/src/model.ts +++ b/extensions/git/src/model.ts @@ -5,10 +5,10 @@ 'use strict'; -import { workspace, WorkspaceFoldersChangeEvent, Uri, window, Event, EventEmitter, QuickPickItem, Disposable, SourceControl, SourceControlResourceGroup, TextEditor, Memento, ConfigurationChangeEvent } from 'vscode'; +import { workspace, WorkspaceFoldersChangeEvent, Uri, window, Event, EventEmitter, QuickPickItem, Disposable, SourceControl, SourceControlResourceGroup, TextEditor, Memento } from 'vscode'; import { Repository, RepositoryState } from './repository'; import { memoize, sequentialize, debounce } from './decorators'; -import { dispose, anyEvent, filterEvent, IDisposable, isDescendant, find, firstIndex } from './util'; +import { dispose, anyEvent, filterEvent, isDescendant, firstIndex } from './util'; import { Git, GitErrorCodes } from './git'; import * as path from 'path'; import * as fs from 'fs'; diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts index 3824f010265..38c57678e43 100644 --- a/extensions/git/src/repository.ts +++ b/extensions/git/src/repository.ts @@ -398,7 +398,7 @@ class ProgressManager { private disposable: IDisposable = EmptyDisposable; - constructor(private repository: Repository) { + constructor(repository: Repository) { const start = onceEvent(filterEvent(repository.onDidChangeOperations, () => repository.operations.shouldShowProgress())); const end = onceEvent(filterEvent(debounceEvent(repository.onDidChangeOperations, 300), () => !repository.operations.shouldShowProgress())); @@ -790,8 +790,8 @@ export class Repository implements Disposable { async buffer(ref: string, filePath: string): Promise { return await this.run(Operation.Show, async () => { const relativePath = path.relative(this.repository.root, filePath).replace(/\\/g, '/'); - const configFiles = workspace.getConfiguration('files', Uri.file(filePath)); - const encoding = configFiles.get('encoding'); + // const configFiles = workspace.getConfiguration('files', Uri.file(filePath)); + // const encoding = configFiles.get('encoding'); // TODO@joao: REsource config api return await this.repository.buffer(`${ref}:${relativePath}`); @@ -1009,10 +1009,8 @@ export class Repository implements Disposable { case 'UU': return merge.push(new Resource(ResourceGroupType.Merge, uri, Status.BOTH_MODIFIED, useIcons)); } - let isModifiedInIndex = false; - switch (raw.x) { - case 'M': index.push(new Resource(ResourceGroupType.Index, uri, Status.INDEX_MODIFIED, useIcons)); isModifiedInIndex = true; break; + case 'M': index.push(new Resource(ResourceGroupType.Index, uri, Status.INDEX_MODIFIED, useIcons)); break; case 'A': index.push(new Resource(ResourceGroupType.Index, uri, Status.INDEX_ADDED, useIcons)); break; case 'D': index.push(new Resource(ResourceGroupType.Index, uri, Status.INDEX_DELETED, useIcons)); break; case 'R': index.push(new Resource(ResourceGroupType.Index, uri, Status.INDEX_RENAMED, useIcons, renameUri)); break; diff --git a/extensions/git/tsconfig.json b/extensions/git/tsconfig.json index ea7679c9ac0..a7eca805f97 100644 --- a/extensions/git/tsconfig.json +++ b/extensions/git/tsconfig.json @@ -10,7 +10,8 @@ "./node_modules/@types" ], "strict": true, - "experimentalDecorators": true + "experimentalDecorators": true, + "noUnusedLocals": true }, "include": [ "src/**/*" -- GitLab