Skip to content

Commit 312bae6

Browse files
committed
Splits authority functions out
- Avoids the need to import the whole GitUri
1 parent 5de3214 commit 312bae6

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

src/env/node/git/localGitProvider.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ import type {
5656
RevisionUriData,
5757
ScmRepository,
5858
} from '../../../git/gitProvider';
59-
import { encodeGitLensRevisionUriAuthority, GitUri, isGitUri } from '../../../git/gitUri';
59+
import { GitUri, isGitUri } from '../../../git/gitUri';
60+
import { encodeGitLensRevisionUriAuthority } from '../../../git/gitUri.authority';
6061
import type { GitBlame, GitBlameAuthor, GitBlameLine, GitBlameLines } from '../../../git/models/blame';
6162
import type { BranchSortOptions } from '../../../git/models/branch';
6263
import {

src/git/gitUri.authority.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { decodeUtf8Hex, encodeUtf8Hex } from '@env/hex';
2+
3+
export function decodeGitLensRevisionUriAuthority<T>(authority: string): T {
4+
return JSON.parse(decodeUtf8Hex(authority)) as T;
5+
}
6+
7+
export function encodeGitLensRevisionUriAuthority<T>(metadata: T): string {
8+
return encodeUtf8Hex(JSON.stringify(metadata));
9+
}

src/git/gitUri.ts

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { decodeUtf8Hex, encodeUtf8Hex } from '@env/hex';
1+
import { decodeUtf8Hex } from '@env/hex';
22
import { Uri } from 'vscode';
33
import { getQueryDataFromScmGitUri } from '../@types/vscode.git.uri';
44
import { Schemes } from '../constants';
@@ -10,14 +10,14 @@ import { memoize } from '../system/decorators/memoize';
1010
import { basename, normalizePath } from '../system/path';
1111
import { formatPath } from '../system/vscode/formatPath';
1212
import { getBestPath, relativeDir, splitPath } from '../system/vscode/path';
13-
// import { CharCode } from '../system/string';
1413
import { isVirtualUri } from '../system/vscode/utils';
1514
import type { RevisionUriData } from './gitProvider';
15+
import { decodeGitLensRevisionUriAuthority } from './gitUri.authority';
1616
import { uncommittedStaged } from './models/constants';
1717
import type { GitFile } from './models/file';
1818
import { isUncommitted, isUncommittedStaged, shortenRevision } from './models/reference';
1919

20-
const slash = 47; //CharCode.Slash;
20+
const slash = 47; //slash;
2121

2222
export interface GitCommitish {
2323
fileName?: string;
@@ -337,14 +337,6 @@ export function isGitUri(uri: any): uri is GitUri {
337337
return uri instanceof GitUri;
338338
}
339339

340-
export function decodeGitLensRevisionUriAuthority<T>(authority: string): T {
341-
return JSON.parse(decodeUtf8Hex(authority)) as T;
342-
}
343-
344-
export function encodeGitLensRevisionUriAuthority<T>(metadata: T): string {
345-
return encodeUtf8Hex(JSON.stringify(metadata));
346-
}
347-
348340
function decodeRemoteHubAuthority<T>(uri: Uri): { scheme: string; metadata: T | undefined } {
349341
const [scheme, encoded] = uri.authority.split('+');
350342

src/repositories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { isLinux } from '@env/platform';
22
import type { Uri } from 'vscode';
33
import { Schemes } from './constants';
44
import type { RevisionUriData } from './git/gitProvider';
5-
import { decodeGitLensRevisionUriAuthority } from './git/gitUri';
5+
import { decodeGitLensRevisionUriAuthority } from './git/gitUri.authority';
66
import type { Repository } from './git/models/repository';
77
import { normalizePath } from './system/path';
88
import { UriTrie } from './system/trie';

0 commit comments

Comments
 (0)