Fixes missing hovers in revisions

eamodio · eamodio · commit e8c47c425ad5 · 2017-10-05T13:01:32.000-04:00
diff --git a/src/annotations/blameAnnotationProvider.ts b/src/annotations/blameAnnotationProvider.ts
@@ -75,7 +75,7 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase
     }
 
     registerHoverProvider() {
-        this._hoverProviderDisposable = languages.registerHoverProvider({ pattern: this.uri.fsPath }, this);
+        this._hoverProviderDisposable = languages.registerHoverProvider({ pattern: this.document.uri.fsPath }, this);
     }
 
     async provideHover(document: TextDocument, position: Position, token: CancellationToken): Promise<Hover | undefined> {
diff --git a/src/gitService.ts b/src/gitService.ts
@@ -1121,8 +1121,8 @@ export class GitService extends Disposable {
             shortSha = shaOrcommitOrUri.shortSha;
         }
 
-        const extension = path.extname(fileName!);
-        return Uri.parse(`${DocumentSchemes.GitLensGit}:${path.basename(fileName!, extension)}:${shortSha}${extension}?${JSON.stringify(data)}`);
+        const parsed = path.parse(fileName!);
+        return Uri.parse(`${DocumentSchemes.GitLensGit}:${parsed.dir}${parsed.name}:${shortSha}${parsed.ext}?${JSON.stringify(data)}`);
     }
 
     private static _toGitUriData<T extends IGitUriData>(commit: IGitUriData, originalFileName?: string): T {

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`registerHoverProvider() {`
`78`		`- this._hoverProviderDisposable = languages.registerHoverProvider({ pattern: this.uri.fsPath }, this);`
	`78`	`+ this._hoverProviderDisposable = languages.registerHoverProvider({ pattern: this.document.uri.fsPath }, this);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`async provideHover(document: TextDocument, position: Position, token: CancellationToken): Promise<Hover \| undefined> {`
Original file line number	Diff line number	Diff line change
`@@ -1121,8 +1121,8 @@ export class GitService extends Disposable {`
`1121`	`1121`	`shortSha = shaOrcommitOrUri.shortSha;`
`1122`	`1122`	`}`
`1123`	`1123`
`1124`		`- const extension = path.extname(fileName!);`
`1125`		- return Uri.parse(`${DocumentSchemes.GitLensGit}:${path.basename(fileName!, extension)}:${shortSha}${extension}?${JSON.stringify(data)}`);
	`1124`	`+ const parsed = path.parse(fileName!);`
	`1125`	+ return Uri.parse(`${DocumentSchemes.GitLensGit}:${parsed.dir}${parsed.name}:${shortSha}${parsed.ext}?${JSON.stringify(data)}`);
`1126`	`1126`	`}`
`1127`	`1127`
`1128`	`1128`	`private static _toGitUriData<T extends IGitUriData>(commit: IGitUriData, originalFileName?: string): T {`