ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-02-16 10:58:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #43 - File-level CodeLens must use full file blame

Browse Source
This commit is contained in:
Eric Amodio
2017-03-05 15:45:01 -05:00
parent c05fd0b976
commit 037446f38e
1 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/gitCodeLensProvider.ts
View File

@@ -114,37 +114,66 @@ export default class GitCodeLensProvider implements CodeLensProvider {
return lenses; return lenses;
} }
private _isValidSymbol(kind: SymbolKind, languageLocation: ICodeLensLanguageLocation) { private _validateSymbolAndGetBlameRange(document: TextDocument, symbol: SymbolInformation, languageLocation: ICodeLensLanguageLocation): Range | undefined {
let valid: boolean = false;
let range: Range | undefined;
switch (languageLocation.location) { switch (languageLocation.location) {
case CodeLensLocation.All: case CodeLensLocation.All:
case CodeLensLocation.DocumentAndContainers: case CodeLensLocation.DocumentAndContainers:
switch (kind) { switch (symbol.kind) {
case SymbolKind.File: case SymbolKind.File:
valid = true;
// Adjust the range to be the whole file
range = document.validateRange(new Range(0, 1000000, 1000000, 1000000));
break;
case SymbolKind.Package: case SymbolKind.Package:
case SymbolKind.Module: case SymbolKind.Module:
// Adjust the range to be the whole file
if (symbol.location.range.start.line === 0 && symbol.location.range.end.line === 0) {
range = document.validateRange(new Range(0, 1000000, 1000000, 1000000));
}
valid = true;
break;
case SymbolKind.Namespace: case SymbolKind.Namespace:
case SymbolKind.Class: case SymbolKind.Class:
case SymbolKind.Interface: case SymbolKind.Interface:
return true; valid = true;
break;
case SymbolKind.Constructor: case SymbolKind.Constructor:
case SymbolKind.Method: case SymbolKind.Method:
case SymbolKind.Function: case SymbolKind.Function:
case SymbolKind.Property: case SymbolKind.Property:
case SymbolKind.Enum: case SymbolKind.Enum:
return languageLocation.location === CodeLensLocation.All; valid = languageLocation.location === CodeLensLocation.All;
default: break;
return false;
} }
case CodeLensLocation.Document: break;
return false;
case CodeLensLocation.Custom: case CodeLensLocation.Custom:
return !!(languageLocation.customSymbols || []).find(_ => _.toLowerCase() === SymbolKind[kind].toLowerCase()); valid = !!(languageLocation.customSymbols || []).find(_ => _.toLowerCase() === SymbolKind[symbol.kind].toLowerCase());
if (valid) {
switch (symbol.kind) {
case SymbolKind.File:
// Adjust the range to be the whole file
range = document.validateRange(new Range(0, 1000000, 1000000, 1000000));
break;
case SymbolKind.Package:
case SymbolKind.Module:
// Adjust the range to be the whole file
if (symbol.location.range.start.line === 0 && symbol.location.range.end.line === 0) {
range = document.validateRange(new Range(0, 1000000, 1000000, 1000000));
}
break;
}
}
break;
} }
return false;
return valid ? range || symbol.location.range : undefined;
} }
private _provideCodeLens(gitUri: GitUri, document: TextDocument, symbol: SymbolInformation, languageLocation: ICodeLensLanguageLocation, blame: IGitBlame, lenses: CodeLens[]): void { private _provideCodeLens(gitUri: GitUri, document: TextDocument, symbol: SymbolInformation, languageLocation: ICodeLensLanguageLocation, blame: IGitBlame, lenses: CodeLens[]): void {
if (!this._isValidSymbol(symbol.kind, languageLocation)) return; const blameRange = this._validateSymbolAndGetBlameRange(document, symbol, languageLocation);
if (!blameRange) return;
const line = document.lineAt(symbol.location.range.start); const line = document.lineAt(symbol.location.range.start);
// Make sure there is only 1 lens per line // Make sure there is only 1 lens per line
@@ -164,17 +193,18 @@ export default class GitCodeLensProvider implements CodeLensProvider {
let blameForRangeFn: () => IGitBlameLines; let blameForRangeFn: () => IGitBlameLines;
if (this._documentIsDirty || this._config.codeLens.recentChange.enabled) { if (this._documentIsDirty || this._config.codeLens.recentChange.enabled) {
blameForRangeFn = Functions.once(() => this.git.getBlameForRangeSync(blame, gitUri.fsPath, symbol.location.range, gitUri.sha, gitUri.repoPath)); blameForRangeFn = Functions.once(() => this.git.getBlameForRangeSync(blame, gitUri.fsPath, blameRange, gitUri.sha, gitUri.repoPath));
lenses.push(new GitRecentChangeCodeLens(blameForRangeFn, gitUri, symbol.kind, symbol.location.range, false, line.range.with(new Position(line.range.start.line, startChar)))); lenses.push(new GitRecentChangeCodeLens(blameForRangeFn, gitUri, symbol.kind, blameRange, false, line.range.with(new Position(line.range.start.line, startChar))));
startChar++; startChar++;
} }
if (this._config.codeLens.authors.enabled) { if (this._config.codeLens.authors.enabled) {
let multiline = !symbol.location.range.isSingleLine; let multiline = !blameRange.isSingleLine;
// HACK for Omnisharp, since it doesn't return full ranges // HACK for Omnisharp, since it doesn't return full ranges
if (!multiline && document.languageId === 'csharp') { if (!multiline && document.languageId === 'csharp') {
switch (symbol.kind) { switch (symbol.kind) {
case SymbolKind.File: case SymbolKind.File:
break;
case SymbolKind.Package: case SymbolKind.Package:
case SymbolKind.Module: case SymbolKind.Module:
case SymbolKind.Namespace: case SymbolKind.Namespace:
@@ -191,10 +221,10 @@ export default class GitCodeLensProvider implements CodeLensProvider {
if (multiline) { if (multiline) {
if (!blameForRangeFn) { if (!blameForRangeFn) {
blameForRangeFn = Functions.once(() => this.git.getBlameForRangeSync(blame, gitUri.fsPath, symbol.location.range, gitUri.sha, gitUri.repoPath)); blameForRangeFn = Functions.once(() => this.git.getBlameForRangeSync(blame, gitUri.fsPath, blameRange, gitUri.sha, gitUri.repoPath));
} }
if (!this._documentIsDirty) { if (!this._documentIsDirty) {
lenses.push(new GitAuthorsCodeLens(blameForRangeFn, gitUri, symbol.kind, symbol.location.range, false, line.range.with(new Position(line.range.start.line, startChar)))); lenses.push(new GitAuthorsCodeLens(blameForRangeFn, gitUri, symbol.kind, blameRange, false, line.range.with(new Position(line.range.start.line, startChar))));
} }
} }
} }