From 54b2b16426f560f51858ceb3b8c78e247cf6cd38 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sun, 1 Oct 2023 00:35:52 -0400 Subject: [PATCH 0001/1012] Fixes & improves rebase handling --- package.json | 30 ++- src/commands/quickCommand.steps.ts | 3 +- src/constants.ts | 2 + src/env/node/git/git.ts | 42 ++-- src/env/node/git/localGitProvider.ts | 198 ++++++++++----- src/env/node/git/shell.ts | 6 +- src/git/gitProvider.ts | 19 +- src/git/gitProviderService.ts | 17 +- src/git/models/rebase.ts | 6 +- src/plus/github/github.ts | 76 ++++++ src/plus/github/githubGitProvider.ts | 38 ++- src/system/promise.ts | 40 +-- src/views/branchesView.ts | 1 + src/views/commitsView.ts | 3 +- src/views/nodes/branchNode.ts | 3 +- src/views/nodes/branchesNode.ts | 3 +- src/views/nodes/commitNode.ts | 15 +- src/views/nodes/fileRevisionAsCommitNode.ts | 92 ++++--- .../nodes/mergeConflictCurrentChangesNode.ts | 70 ++++-- src/views/nodes/mergeConflictFilesNode.ts | 55 +++++ .../nodes/mergeConflictIncomingChangesNode.ts | 99 +++++--- src/views/nodes/mergeStatusNode.ts | 65 ++--- src/views/nodes/rebaseCommitNode.ts | 26 ++ src/views/nodes/rebaseStatusNode.ts | 233 +++++------------- src/views/nodes/statusFilesNode.ts | 8 +- src/views/nodes/viewNode.ts | 8 +- src/views/remotesView.ts | 1 + src/views/repositoriesView.ts | 2 + src/views/viewDecorationProvider.ts | 46 +++- 29 files changed, 729 insertions(+), 478 deletions(-) create mode 100644 src/views/nodes/mergeConflictFilesNode.ts create mode 100644 src/views/nodes/rebaseCommitNode.ts diff --git a/package.json b/package.json index f7c04066899a4..753946fb995bf 100644 --- a/package.json +++ b/package.json @@ -4304,6 +4304,24 @@ "highContrast": "#c74e39" } }, + { + "id": "gitlens.decorations.statusMergingOrRebasingConflictForegroundColor", + "description": "Specifies the decoration foreground color of the status during a rebase operation with conflicts", + "defaults": { + "light": "#ad0707", + "dark": "#c74e39", + "highContrast": "#c74e39" + } + }, + { + "id": "gitlens.decorations.statusMergingOrRebasingForegroundColor", + "description": "Specifies the decoration foreground color of the status during a rebase operation", + "defaults": { + "dark": "#D8AF1B", + "light": "#D8AF1B", + "highContrast": "#D8AF1B" + } + }, { "id": "gitlens.decorations.workspaceRepoMissingForegroundColor", "description": "Specifies the decoration foreground color of workspace repos which are missing a local path", @@ -11673,7 +11691,7 @@ }, { "command": "gitlens.views.cherryPick", - "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:commit\\b(?!.*?\\b\\+current\\b)/", + "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:commit\\b(?!.*?\\b\\+(current|rebase)\\b)/", "group": "1_gitlens_actions@1" }, { @@ -11698,27 +11716,27 @@ }, { "command": "gitlens.views.resetToCommit", - "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:commit\\b/", + "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:commit\\b(?!.*?\\b\\+rebase\\b)/", "group": "1_gitlens_actions@4" }, { "command": "gitlens.views.resetToTip", - "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:branch\\b/", + "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+rebase\\b)/", "group": "1_gitlens_actions@4" }, { "command": "gitlens.views.resetCommit", - "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:commit\\b/", + "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:commit\\b(?!.*?\\b\\+rebase\\b)/", "group": "1_gitlens_actions@5" }, { "command": "gitlens.views.rebaseOntoCommit", - "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:commit\\b/", + "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:commit\\b(?!.*?\\b\\+rebase\\b)/", "group": "1_gitlens_actions@6" }, { "command": "gitlens.views.switchToCommit", - "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:commit\\b/", + "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:commit\\b(?!.*?\\b\\+rebase\\b)/", "group": "1_gitlens_actions@7" }, { diff --git a/src/commands/quickCommand.steps.ts b/src/commands/quickCommand.steps.ts index eda59355b6aa8..4d7e1f4027c70 100644 --- a/src/commands/quickCommand.steps.ts +++ b/src/commands/quickCommand.steps.ts @@ -1891,8 +1891,7 @@ async function getShowCommitOrStashStepItems< const branch = await Container.instance.git.getBranch(state.repo.path); const [branches, published] = await Promise.all([ branch != null - ? Container.instance.git.getCommitBranches(state.repo.path, state.reference.ref, { - branch: branch.name, + ? Container.instance.git.getCommitBranches(state.repo.path, state.reference.ref, branch.name, { commitDate: isCommit(state.reference) ? state.reference.committer.date : undefined, }) : undefined, diff --git a/src/constants.ts b/src/constants.ts index 6bb7a1ea12677..cd64b2c6e7429 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -72,6 +72,8 @@ export type Colors = | `${typeof extensionPrefix}.decorations.deletedForegroundColor` | `${typeof extensionPrefix}.decorations.ignoredForegroundColor` | `${typeof extensionPrefix}.decorations.modifiedForegroundColor` + | `${typeof extensionPrefix}.decorations.statusMergingOrRebasingConflictForegroundColor` + | `${typeof extensionPrefix}.decorations.statusMergingOrRebasingForegroundColor` | `${typeof extensionPrefix}.decorations.renamedForegroundColor` | `${typeof extensionPrefix}.decorations.untrackedForegroundColor` | `${typeof extensionPrefix}.decorations.workspaceCurrentForegroundColor` diff --git a/src/env/node/git/git.ts b/src/env/node/git/git.ts index 55216e294e90e..f279c26bd9e40 100644 --- a/src/env/node/git/git.ts +++ b/src/env/node/git/git.ts @@ -20,6 +20,7 @@ import { StashPushErrorReason, WorkspaceUntrustedError, } from '../../../git/errors'; +import type { GitDir } from '../../../git/gitProvider'; import type { GitDiffFilter } from '../../../git/models/diff'; import { isUncommitted, isUncommittedStaged, shortenRevision } from '../../../git/models/reference'; import type { GitUser } from '../../../git/models/user'; @@ -503,22 +504,29 @@ export class Git { ); } - branch__containsOrPointsAt( + branchOrTag__containsOrPointsAt( repoPath: string, ref: string, - { - mode = 'contains', - name = undefined, - remotes = false, - }: { mode?: 'contains' | 'pointsAt'; name?: string; remotes?: boolean } = {}, + options?: { + type?: 'branch' | 'tag'; + all?: boolean; + mode?: 'contains' | 'pointsAt'; + name?: string; + remotes?: boolean; + }, ) { - const params = ['branch']; - if (remotes) { + const params: string[] = [options?.type ?? 'branch']; + if (options?.all) { + params.push('-a'); + } else if (options?.remotes) { params.push('-r'); } - params.push(mode === 'pointsAt' ? `--points-at=${ref}` : `--contains=${ref}`, '--format=%(refname:short)'); - if (name != null) { - params.push(name); + params.push( + options?.mode === 'pointsAt' ? `--points-at=${ref}` : `--contains=${ref}`, + '--format=%(refname:short)', + ); + if (options?.name != null) { + params.push(options.name); } return this.git( @@ -2177,22 +2185,22 @@ export class Git { } async readDotGitFile( - repoPath: string, - paths: string[], + gitDir: GitDir, + pathParts: string[], options?: { numeric?: false; throw?: boolean; trim?: boolean }, ): Promise; async readDotGitFile( - repoPath: string, - path: string[], + gitDir: GitDir, + pathParts: string[], options?: { numeric: true; throw?: boolean; trim?: boolean }, ): Promise; async readDotGitFile( - repoPath: string, + gitDir: GitDir, pathParts: string[], options?: { numeric?: boolean; throw?: boolean; trim?: boolean }, ): Promise { try { - const bytes = await workspace.fs.readFile(Uri.file(joinPaths(repoPath, '.git', ...pathParts))); + const bytes = await workspace.fs.readFile(Uri.joinPath(gitDir.uri, ...pathParts)); let contents = textDecoder.decode(bytes); contents = options?.trim ?? true ? contents.trim() : contents; diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts index 4b6224b2d7f84..87903b377d007 100644 --- a/src/env/node/git/localGitProvider.ts +++ b/src/env/node/git/localGitProvider.ts @@ -80,7 +80,7 @@ import type { import type { GitLog } from '../../../git/models/log'; import type { GitMergeStatus } from '../../../git/models/merge'; import type { GitRebaseStatus } from '../../../git/models/rebase'; -import type { GitBranchReference } from '../../../git/models/reference'; +import type { GitBranchReference, GitTagReference } from '../../../git/models/reference'; import { createReference, getBranchTrackingWithoutRemote, @@ -240,8 +240,8 @@ export class LocalGitProvider implements GitProvider, Disposable { private readonly _branchesCache = new Map>>(); private readonly _contributorsCache = new Map>(); - private readonly _mergeStatusCache = new Map(); - private readonly _rebaseStatusCache = new Map(); + private readonly _mergeStatusCache = new Map>(); + private readonly _rebaseStatusCache = new Map>(); private readonly _remotesCache = new Map>(); private readonly _repoInfoCache = new Map(); private readonly _stashesCache = new Map(); @@ -1727,6 +1727,7 @@ export class LocalGitProvider implements GitProvider, Disposable { }; } + @gate() @log() async getBranch(repoPath: string): Promise { let { @@ -1741,16 +1742,17 @@ export class LocalGitProvider implements GitProvider, Disposable { const [name, upstream] = data[0].split('\n'); if (isDetachedHead(name)) { - const [rebaseStatus, committerDate] = await Promise.all([ + const [rebaseStatusResult, committerDateResult] = await Promise.allSettled([ this.getRebaseStatus(repoPath), - this.git.log__recent_committerdate(repoPath, commitOrdering), ]); + const committerDate = getSettledValue(committerDateResult); + branch = new GitBranch( this.container, repoPath, - rebaseStatus?.incoming.name ?? name, + getSettledValue(rebaseStatusResult)?.incoming.name ?? name, false, true, committerDate != null ? new Date(Number(committerDate) * 1000) : undefined, @@ -1759,7 +1761,7 @@ export class LocalGitProvider implements GitProvider, Disposable { undefined, undefined, undefined, - rebaseStatus != null, + rebaseStatusResult != null, ); } @@ -1867,19 +1869,21 @@ export class LocalGitProvider implements GitProvider, Disposable { async getCommitBranches( repoPath: string, ref: string, - options?: { branch?: string; commitDate?: Date; mode?: 'contains' | 'pointsAt'; remotes?: boolean }, + branch?: string | undefined, + options?: + | { all?: boolean; commitDate?: Date; mode?: 'contains' | 'pointsAt' } + | { commitDate?: Date; mode?: 'contains' | 'pointsAt'; remotes?: boolean }, ): Promise { - if (options?.branch) { - const data = await this.git.branch__containsOrPointsAt(repoPath, ref, { + if (branch != null) { + const data = await this.git.branchOrTag__containsOrPointsAt(repoPath, ref, { + type: 'branch', mode: 'contains', - name: options.branch, + name: branch, }); - if (!data) return []; - - return [data?.trim()]; + return data ? [data?.trim()] : []; } - const data = await this.git.branch__containsOrPointsAt(repoPath, ref, options); + const data = await this.git.branchOrTag__containsOrPointsAt(repoPath, ref, { type: 'branch', ...options }); if (!data) return []; return filterMap(data.split('\n'), b => b.trim() || undefined); @@ -2451,6 +2455,18 @@ export class LocalGitProvider implements GitProvider, Disposable { return getCommitsForGraphCore.call(this, defaultLimit, selectSha); } + @log() + async getCommitTags( + repoPath: string, + ref: string, + options?: { commitDate?: Date; mode?: 'contains' | 'pointsAt' }, + ): Promise { + const data = await this.git.branchOrTag__containsOrPointsAt(repoPath, ref, { type: 'tag', ...options }); + if (!data) return []; + + return filterMap(data.split('\n'), b => b.trim() || undefined); + } + getConfig(repoPath: string, key: string): Promise { return this.git.config__get(key, repoPath); } @@ -2898,6 +2914,7 @@ export class LocalGitProvider implements GitProvider, Disposable { return files[0]; } + @gate() @debug() async getGitDir(repoPath: string): Promise { const repo = this._repoInfoCache.get(repoPath); @@ -3545,20 +3562,25 @@ export class LocalGitProvider implements GitProvider, Disposable { } } - @gate() @log() async getMergeStatus(repoPath: string): Promise { let status = this.useCaching ? this._mergeStatusCache.get(repoPath) : undefined; - if (status === undefined) { - const merge = await this.git.rev_parse__verify(repoPath, 'MERGE_HEAD'); - if (merge != null) { - const [branch, mergeBase, possibleSourceBranches] = await Promise.all([ + if (status == null) { + async function getCore(this: LocalGitProvider): Promise { + const merge = await this.git.rev_parse__verify(repoPath, 'MERGE_HEAD'); + if (merge == null) return undefined; + + const [branchResult, mergeBaseResult, possibleSourceBranchesResult] = await Promise.allSettled([ this.getBranch(repoPath), this.getMergeBase(repoPath, 'MERGE_HEAD', 'HEAD'), - this.getCommitBranches(repoPath, 'MERGE_HEAD', { mode: 'pointsAt' }), + this.getCommitBranches(repoPath, 'MERGE_HEAD', undefined, { all: true, mode: 'pointsAt' }), ]); - status = { + const branch = getSettledValue(branchResult); + const mergeBase = getSettledValue(mergeBaseResult); + const possibleSourceBranches = getSettledValue(possibleSourceBranchesResult); + + return { type: 'merge', repoPath: repoPath, mergeBase: mergeBase, @@ -3572,66 +3594,110 @@ export class LocalGitProvider implements GitProvider, Disposable { remote: false, }) : undefined, - }; + } satisfies GitMergeStatus; } + status = getCore.call(this); if (this.useCaching) { - this._mergeStatusCache.set(repoPath, status ?? null); + this._mergeStatusCache.set(repoPath, status); } } - return status ?? undefined; + return status; } - @gate() @log() async getRebaseStatus(repoPath: string): Promise { let status = this.useCaching ? this._rebaseStatusCache.get(repoPath) : undefined; - if (status === undefined) { - const rebase = await this.git.rev_parse__verify(repoPath, 'REBASE_HEAD'); - if (rebase != null) { - let [mergeBase, branch, onto, stepsNumber, stepsMessage, stepsTotal] = await Promise.all([ - this.getMergeBase(repoPath, 'REBASE_HEAD', 'HEAD'), - this.git.readDotGitFile(repoPath, ['rebase-merge', 'head-name']), - this.git.readDotGitFile(repoPath, ['rebase-merge', 'onto']), - this.git.readDotGitFile(repoPath, ['rebase-merge', 'msgnum'], { numeric: true }), + if (status == null) { + async function getCore(this: LocalGitProvider): Promise { + const gitDir = await this.getGitDir(repoPath); + const [rebaseMergeHeadResult, rebaseApplyHeadResult] = await Promise.allSettled([ + this.git.readDotGitFile(gitDir, ['rebase-merge', 'head-name']), + this.git.readDotGitFile(gitDir, ['rebase-apply', 'head-name']), + ]); + const rebaseMergeHead = getSettledValue(rebaseMergeHeadResult); + const rebaseApplyHead = getSettledValue(rebaseApplyHeadResult); + + let branch = rebaseApplyHead ?? rebaseMergeHead; + if (branch == null) return undefined; + + const path = rebaseApplyHead != null ? 'rebase-apply' : 'rebase-merge'; + + const [ + rebaseHeadResult, + origHeadResult, + ontoResult, + stepsNumberResult, + stepsTotalResult, + stepsMessageResult, + ] = await Promise.allSettled([ + this.git.rev_parse__verify(repoPath, 'REBASE_HEAD'), + this.git.readDotGitFile(gitDir, [path, 'orig-head']), + this.git.readDotGitFile(gitDir, [path, 'onto']), + this.git.readDotGitFile(gitDir, [path, 'msgnum'], { numeric: true }), + this.git.readDotGitFile(gitDir, [path, 'end'], { numeric: true }), this.git - .readDotGitFile(repoPath, ['rebase-merge', 'message'], { throw: true }) - .catch(() => this.git.readDotGitFile(repoPath, ['rebase-merge', 'message-squashed'])), - this.git.readDotGitFile(repoPath, ['rebase-merge', 'end'], { numeric: true }), + .readDotGitFile(gitDir, [path, 'message'], { throw: true }) + .catch(() => this.git.readDotGitFile(gitDir, [path, 'message-squashed'])), ]); - if (branch == null || onto == null) return undefined; + const origHead = getSettledValue(origHeadResult); + const onto = getSettledValue(ontoResult); + if (origHead == null || onto == null) return undefined; + + let mergeBase; + const rebaseHead = getSettledValue(rebaseHeadResult); + if (rebaseHead != null) { + mergeBase = await this.getMergeBase(repoPath, rebaseHead, 'HEAD'); + } else { + mergeBase = await this.getMergeBase(repoPath, onto, origHead); + } if (branch.startsWith('refs/heads/')) { branch = branch.substr(11).trim(); } - const possibleSourceBranches = await this.getCommitBranches(repoPath, onto, { mode: 'pointsAt' }); + const [branchTipsResult, tagTipsResult] = await Promise.allSettled([ + this.getCommitBranches(repoPath, onto, undefined, { all: true, mode: 'pointsAt' }), + this.getCommitTags(repoPath, onto, { mode: 'pointsAt' }), + ]); + + const branchTips = getSettledValue(branchTipsResult); + const tagTips = getSettledValue(tagTipsResult); - let possibleSourceBranch: string | undefined; - for (const b of possibleSourceBranches) { - if (b.startsWith('(no branch, rebasing')) continue; + let ontoRef: GitBranchReference | GitTagReference | undefined; + if (branchTips != null) { + for (const ref of branchTips) { + if (ref.startsWith('(no branch, rebasing')) continue; - possibleSourceBranch = b; - break; + ontoRef = createReference(ref, repoPath, { + refType: 'branch', + name: ref, + remote: false, + }); + break; + } + } + if (ontoRef == null && tagTips != null) { + for (const ref of tagTips) { + if (ref.startsWith('(no branch, rebasing')) continue; + + ontoRef = createReference(ref, repoPath, { + refType: 'tag', + name: ref, + }); + break; + } } - status = { + return { type: 'rebase', repoPath: repoPath, mergeBase: mergeBase, - HEAD: createReference(rebase, repoPath, { refType: 'revision' }), + HEAD: createReference(rebaseHead ?? origHead, repoPath, { refType: 'revision' }), onto: createReference(onto, repoPath, { refType: 'revision' }), - current: - possibleSourceBranch != null - ? createReference(possibleSourceBranch, repoPath, { - refType: 'branch', - name: possibleSourceBranch, - remote: false, - }) - : undefined, - + current: ontoRef, incoming: createReference(branch, repoPath, { refType: 'branch', name: branch, @@ -3639,23 +3705,27 @@ export class LocalGitProvider implements GitProvider, Disposable { }), steps: { current: { - number: stepsNumber ?? 0, - commit: createReference(rebase, repoPath, { - refType: 'revision', - message: stepsMessage, - }), + number: getSettledValue(stepsNumberResult) ?? 0, + commit: + rebaseHead != null + ? createReference(rebaseHead, repoPath, { + refType: 'revision', + message: getSettledValue(stepsMessageResult), + }) + : undefined, }, - total: stepsTotal ?? 0, + total: getSettledValue(stepsTotalResult) ?? 0, }, - }; + } satisfies GitRebaseStatus; } + status = getCore.call(this); if (this.useCaching) { - this._rebaseStatusCache.set(repoPath, status ?? null); + this._rebaseStatusCache.set(repoPath, status); } } - return status ?? undefined; + return status; } @log() diff --git a/src/env/node/git/shell.ts b/src/env/node/git/shell.ts index 48ef756748172..d289ef8613cf5 100644 --- a/src/env/node/git/shell.ts +++ b/src/env/node/git/shell.ts @@ -1,7 +1,7 @@ import type { ExecException } from 'child_process'; import { exec, execFile } from 'child_process'; import type { Stats } from 'fs'; -import { exists, existsSync, statSync } from 'fs'; +import { access, constants, existsSync, statSync } from 'fs'; import { join as joinPaths } from 'path'; import * as process from 'process'; import type { CancellationToken } from 'vscode'; @@ -290,6 +290,6 @@ export function run( }); } -export function fsExists(path: string) { - return new Promise(resolve => exists(path, exists => resolve(exists))); +export async function fsExists(path: string) { + return new Promise(resolve => access(path, constants.F_OK, err => resolve(err == null))); } diff --git a/src/git/gitProvider.ts b/src/git/gitProvider.ts index cdd28df8c3a61..79ac1f0a3b26c 100644 --- a/src/git/gitProvider.ts +++ b/src/git/gitProvider.ts @@ -227,13 +227,10 @@ export interface GitProvider extends Disposable { getCommitBranches( repoPath: string, ref: string, - options?: { - branch?: string | undefined; - commitDate?: Date | undefined; - mode?: 'contains' | 'pointsAt' | undefined; - name?: string | undefined; - remotes?: boolean | undefined; - }, + branch?: string | undefined, + options?: + | { all?: boolean; commitDate?: Date; mode?: 'contains' | 'pointsAt' } + | { commitDate?: Date; mode?: 'contains' | 'pointsAt'; remotes?: boolean }, ): Promise; getCommitCount(repoPath: string, ref: string): Promise; getCommitForFile( @@ -255,6 +252,14 @@ export interface GitProvider extends Disposable { ref?: string; }, ): Promise; + getCommitTags( + repoPath: string, + ref: string, + options?: { + commitDate?: Date | undefined; + mode?: 'contains' | 'pointsAt' | undefined; + }, + ): Promise; getConfig?(repoPath: string, key: string): Promise; setConfig?(repoPath: string, key: string, value: string | undefined): Promise; getContributors( diff --git a/src/git/gitProviderService.ts b/src/git/gitProviderService.ts index 30b6a2ca16269..89524da10d917 100644 --- a/src/git/gitProviderService.ts +++ b/src/git/gitProviderService.ts @@ -1631,10 +1631,13 @@ export class GitProviderService implements Disposable { getCommitBranches( repoPath: string | Uri, ref: string, - options?: { branch?: string; commitDate?: Date; mode?: 'contains' | 'pointsAt'; remotes?: boolean }, + branch?: string | undefined, + options?: + | { all?: boolean; commitDate?: Date; mode?: 'contains' | 'pointsAt' } + | { commitDate?: Date; mode?: 'contains' | 'pointsAt'; remotes?: boolean }, ): Promise { const { provider, path } = this.getProvider(repoPath); - return provider.getCommitBranches(path, ref, options); + return provider.getCommitBranches(path, ref, branch, options); } @log() @@ -1670,6 +1673,16 @@ export class GitProviderService implements Disposable { return provider.getCommitsForGraph(path, asWebviewUri, options); } + @log() + getCommitTags( + repoPath: string | Uri, + ref: string, + options?: { commitDate?: Date; mode?: 'contains' | 'pointsAt' }, + ): Promise { + const { provider, path } = this.getProvider(repoPath); + return provider.getCommitTags(path, ref, options); + } + @log() async getConfig(repoPath: string | Uri, key: string): Promise { const { provider, path } = this.getProvider(repoPath); diff --git a/src/git/models/rebase.ts b/src/git/models/rebase.ts index 81bf4d3b8a035..ccb8e59bb0d01 100644 --- a/src/git/models/rebase.ts +++ b/src/git/models/rebase.ts @@ -1,4 +1,4 @@ -import type { GitBranchReference, GitRevisionReference } from './reference'; +import type { GitBranchReference, GitRevisionReference, GitTagReference } from './reference'; export interface GitRebaseStatus { type: 'rebase'; @@ -6,11 +6,11 @@ export interface GitRebaseStatus { HEAD: GitRevisionReference; onto: GitRevisionReference; mergeBase: string | undefined; - current: GitBranchReference | undefined; + current: GitBranchReference | GitTagReference | undefined; incoming: GitBranchReference; steps: { - current: { number: number; commit: GitRevisionReference }; + current: { number: number; commit: GitRevisionReference | undefined }; total: number; }; } diff --git a/src/plus/github/github.ts b/src/plus/github/github.ts index 3184c35511513..834194a1246ae 100644 --- a/src/plus/github/github.ts +++ b/src/plus/github/github.ts @@ -1591,6 +1591,82 @@ export class GitHubApi implements Disposable { } } + @debug({ args: { 0: '' } }) + async getCommitTags(token: string, owner: string, repo: string, ref: string, date: Date): Promise { + const scope = getLogScope(); + + interface QueryResult { + repository: { + refs: { + nodes: { + name: string; + target: { + history: { + nodes: { oid: string }[]; + }; + }; + }[]; + }; + }; + } + + try { + const query = `query getCommitTags( + $owner: String! + $repo: String! + $since: GitTimestamp! + $until: GitTimestamp! +) { + repository(owner: $owner, name: $repo) { + refs(first: 20, refPrefix: "refs/tags/") { + nodes { + name + target { + ... on Commit { + history(first: 3, since: $since until: $until) { + nodes { oid } + } + } + } + } + } + } +}`; + const rsp = await this.graphql( + undefined, + token, + query, + { + owner: owner, + repo: repo, + since: date.toISOString(), + until: date.toISOString(), + }, + scope, + ); + + const nodes = rsp?.repository?.refs?.nodes; + if (nodes == null) return []; + + const tags = []; + + for (const tag of nodes) { + for (const commit of tag.target.history.nodes) { + if (commit.oid === ref) { + tags.push(tag.name); + break; + } + } + } + + return tags; + } catch (ex) { + if (ex instanceof ProviderRequestNotFoundError) return []; + + throw this.handleException(ex, undefined, scope); + } + } + @debug({ args: { 0: '' } }) async getNextCommitRefs( token: string, diff --git a/src/plus/github/githubGitProvider.ts b/src/plus/github/githubGitProvider.ts index 940c8192c36fb..03cfcea72b3a1 100644 --- a/src/plus/github/githubGitProvider.ts +++ b/src/plus/github/githubGitProvider.ts @@ -1048,7 +1048,10 @@ export class GitHubGitProvider implements GitProvider, Disposable { async getCommitBranches( repoPath: string, ref: string, - options?: { branch?: string; commitDate?: Date; mode?: 'contains' | 'pointsAt'; remotes?: boolean }, + branch?: string | undefined, + options?: + | { all?: boolean; commitDate?: Date; mode?: 'contains' | 'pointsAt' } + | { commitDate?: Date; mode?: 'contains' | 'pointsAt'; remotes?: boolean }, ): Promise { if (repoPath == null || options?.commitDate == null) return []; @@ -1059,12 +1062,12 @@ export class GitHubGitProvider implements GitProvider, Disposable { let branches; - if (options?.branch) { + if (branch) { branches = await github.getCommitOnBranch( session.accessToken, metadata.repo.owner, metadata.repo.name, - options?.branch, + branch, ref, options?.commitDate, ); @@ -1591,6 +1594,35 @@ export class GitHubGitProvider implements GitProvider, Disposable { }; } + @log() + async getCommitTags( + repoPath: string, + ref: string, + options?: { commitDate?: Date; mode?: 'contains' | 'pointsAt' }, + ): Promise { + if (repoPath == null || options?.commitDate == null) return []; + + const scope = getLogScope(); + + try { + const { metadata, github, session } = await this.ensureRepositoryContext(repoPath); + + const tags = await github.getCommitTags( + session.accessToken, + metadata.repo.owner, + metadata.repo.name, + ref, + options?.commitDate, + ); + + return tags; + } catch (ex) { + Logger.error(ex, scope); + debugger; + return []; + } + } + @log() async getContributors( repoPath: string, diff --git a/src/system/promise.ts b/src/system/promise.ts index 09d1ac779f7ca..39e76edd5ae98 100644 --- a/src/system/promise.ts +++ b/src/system/promise.ts @@ -4,29 +4,29 @@ export type PromiseOrValue = Promise | T; export function any(...promises: Promise[]): Promise { return new Promise((resolve, reject) => { - const errors: Error[] = []; let settled = false; + const onFullfilled = (r: T) => { + settled = true; + resolve(r); + }; + + let errors: Error[]; + const onRejected = (ex: Error) => { + if (settled) return; + + if (errors == null) { + errors = [ex]; + } else { + errors.push(ex); + } + + if (promises.length - errors.length < 1) { + reject(new AggregateError(errors)); + } + }; for (const promise of promises) { - // eslint-disable-next-line no-loop-func - void (async () => { - try { - const result = await promise; - if (settled) return; - - resolve(result); - settled = true; - } catch (ex) { - errors.push(ex); - } finally { - if (!settled) { - if (promises.length - errors.length < 1) { - reject(new AggregateError(errors)); - settled = true; - } - } - } - })(); + promise.then(onFullfilled, onRejected); } }); } diff --git a/src/views/branchesView.ts b/src/views/branchesView.ts index fa1170f0b099f..a0de753d9a4c3 100644 --- a/src/views/branchesView.ts +++ b/src/views/branchesView.ts @@ -213,6 +213,7 @@ export class BranchesView extends ViewBase<'branches', BranchesViewNode, Branche const branches = await this.container.git.getCommitBranches( commit.repoPath, commit.ref, + undefined, isCommit(commit) ? { commitDate: commit.committer.date } : undefined, ); if (branches.length === 0) return undefined; diff --git a/src/views/commitsView.ts b/src/views/commitsView.ts index 95a10f683513e..5b9a87f4ca8bf 100644 --- a/src/views/commitsView.ts +++ b/src/views/commitsView.ts @@ -355,8 +355,7 @@ export class CommitsView extends ViewBase<'commits', CommitsViewNode, CommitsVie if (branch == null) return undefined; // Check if the commit exists on the current branch - const branches = await this.container.git.getCommitBranches(commit.repoPath, commit.ref, { - branch: branch.name, + const branches = await this.container.git.getCommitBranches(commit.repoPath, commit.ref, branch.name, { commitDate: isCommit(commit) ? commit.committer.date : undefined, }); if (!branches.length) return undefined; diff --git a/src/views/nodes/branchNode.ts b/src/views/nodes/branchNode.ts index c28d8d14b3ce6..11bfec5eccb96 100644 --- a/src/views/nodes/branchNode.ts +++ b/src/views/nodes/branchNode.ts @@ -17,7 +17,6 @@ import { map } from '../../system/iterable'; import type { Deferred } from '../../system/promise'; import { defer, getSettledValue } from '../../system/promise'; import { pad } from '../../system/string'; -import { RemotesView } from '../remotesView'; import type { ViewsWithBranches } from '../viewBase'; import { BranchTrackingStatusNode } from './branchTrackingStatusNode'; import { CommitNode } from './commitNode'; @@ -216,7 +215,7 @@ export class BranchNode extends ViewRefNode { false, { showComparison: - this.view instanceof RepositoriesView + this.view.type === 'repositories' ? this.view.config.branches.showBranchComparison : this.view.config.showBranchComparison, }, diff --git a/src/views/nodes/commitNode.ts b/src/views/nodes/commitNode.ts index 30dc2f0af3af1..43c2113bf4b88 100644 --- a/src/views/nodes/commitNode.ts +++ b/src/views/nodes/commitNode.ts @@ -20,7 +20,6 @@ import type { Deferred } from '../../system/promise'; import { defer, getSettledValue } from '../../system/promise'; import { sortCompare } from '../../system/string'; import type { FileHistoryView } from '../fileHistoryView'; -import { TagsView } from '../tagsView'; import type { ViewsWithCommits } from '../viewBase'; import { CommitFileNode } from './commitFileNode'; import type { FileNode } from './folderNode'; @@ -39,10 +38,10 @@ export class CommitNode extends ViewRefNode string | undefined, - private readonly _options: { expand?: boolean } = {}, + protected readonly getBranchAndTagTips?: (sha: string, options?: { compact?: boolean }) => string | undefined, + protected readonly _options: { expand?: boolean } = {}, ) { super(commit.getGitUri(), view, parent); @@ -77,7 +76,7 @@ export class CommitNode extends ViewRefNode string | undefined; + unpublished?: boolean; + }, +) { + const [remotesResult, _] = await Promise.allSettled([ + container.git.getBestRemotesWithProviders(commit.repoPath), + commit.message == null ? commit.ensureFullDetails() : undefined, + ]); + + const remotes = getSettledValue(remotesResult, []); + const [remote] = remotes; + + let enrichedAutolinks; + let pr; + + if (remote?.hasRichIntegration()) { + const [enrichedAutolinksResult, prResult] = await Promise.allSettled([ + pauseOnCancelOrTimeoutMapTuplePromise(commit.getEnrichedAutolinks(remote)), + commit.getAssociatedPullRequest(remote), + ]); + + enrichedAutolinks = getSettledValue(enrichedAutolinksResult)?.value; + pr = getSettledValue(prResult); + } + + const status = StatusFileFormatter.fromTemplate( + `\${status}\${ (originalPath)}\${'  •  'changesDetail}`, + file, + ); + return CommitFormatter.fromTemplateAsync(tooltipWithStatusFormat.replace('{{slot-status}}', status), commit, { + enrichedAutolinks: enrichedAutolinks, + dateFormat: configuration.get('defaultDateFormat'), + getBranchAndTagTips: options?.getBranchAndTagTips, + messageAutolinks: true, + messageIndent: 4, + pullRequest: pr, + outputFormat: 'markdown', + remotes: remotes, + unpublished: options?.unpublished, + }); +} diff --git a/src/views/nodes/mergeConflictCurrentChangesNode.ts b/src/views/nodes/mergeConflictCurrentChangesNode.ts index 1fa5db2bb3dc7..796ea794684f4 100644 --- a/src/views/nodes/mergeConflictCurrentChangesNode.ts +++ b/src/views/nodes/mergeConflictCurrentChangesNode.ts @@ -2,8 +2,8 @@ import type { Command } from 'vscode'; import { MarkdownString, ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; import type { DiffWithCommandArgs } from '../../commands'; import { Commands, GlyphChars } from '../../constants'; -import { CommitFormatter } from '../../git/formatters/commitFormatter'; import { GitUri } from '../../git/gitUri'; +import type { GitCommit } from '../../git/models/commit'; import type { GitFile } from '../../git/models/file'; import type { GitMergeStatus } from '../../git/models/merge'; import type { GitRebaseStatus } from '../../git/models/rebase'; @@ -13,6 +13,7 @@ import { configuration } from '../../system/configuration'; import type { FileHistoryView } from '../fileHistoryView'; import type { LineHistoryView } from '../lineHistoryView'; import type { ViewsWithCommits } from '../viewBase'; +import { getFileRevisionAsCommitTooltip } from './fileRevisionAsCommitNode'; import { ContextValues, ViewNode } from './viewNode'; export class MergeConflictCurrentChangesNode extends ViewNode { @@ -25,12 +26,20 @@ export class MergeConflictCurrentChangesNode extends ViewNode | undefined; + private async getCommit(): Promise { + if (this._commit == null) { + this._commit = this.view.container.git.getCommit(this.status.repoPath, 'HEAD'); + } + return this._commit; + } + getChildren(): ViewNode[] { return []; } async getTreeItem(): Promise { - const commit = await this.view.container.git.getCommit(this.status.repoPath, 'HEAD'); + const commit = await this.getCommit(); const item = new TreeItem('Current changes', TreeItemCollapsibleState.None); item.contextValue = ContextValues.MergeConflictCurrentChanges; @@ -41,31 +50,6 @@ export class MergeConflictCurrentChangesNode extends ViewNode { + if (item.tooltip == null) { + item.tooltip = await this.getTooltip(); + } + return item; + } + + private async getTooltip() { + const commit = await this.getCommit(); + + const markdown = new MarkdownString( + `Current changes on ${getReferenceLabel(this.status.current, { label: false })}\\\n$(file)${ + GlyphChars.Space + }${this.file.path}`, + true, + ); + + if (commit == null) return markdown; + + const tooltip = await getFileRevisionAsCommitTooltip( + this.view.container, + commit, + this.file, + this.view.config.formats.commits.tooltipWithStatus, + ); + + markdown.appendMarkdown(`\n\n${tooltip}`); + markdown.isTrusted = true; + + return markdown; + } } diff --git a/src/views/nodes/mergeConflictFilesNode.ts b/src/views/nodes/mergeConflictFilesNode.ts new file mode 100644 index 0000000000000..96505b8b79cc8 --- /dev/null +++ b/src/views/nodes/mergeConflictFilesNode.ts @@ -0,0 +1,55 @@ +import { TreeItem, TreeItemCollapsibleState } from 'vscode'; +import { GitUri } from '../../git/gitUri'; +import type { GitMergeStatus } from '../../git/models/merge'; +import type { GitRebaseStatus } from '../../git/models/rebase'; +import type { GitStatusFile } from '../../git/models/status'; +import { makeHierarchical } from '../../system/array'; +import { joinPaths, normalizePath } from '../../system/path'; +import { pluralize, sortCompare } from '../../system/string'; +import type { ViewsWithCommits } from '../viewBase'; +import type { FileNode } from './folderNode'; +import { FolderNode } from './folderNode'; +import { MergeConflictFileNode } from './mergeConflictFileNode'; +import { ViewNode } from './viewNode'; + +export class MergeConflictFilesNode extends ViewNode { + constructor( + view: ViewsWithCommits, + protected override readonly parent: ViewNode, + private readonly status: GitMergeStatus | GitRebaseStatus, + private readonly conflicts: GitStatusFile[], + ) { + super(GitUri.fromRepoPath(status.repoPath), view, parent); + } + + get repoPath(): string { + return this.uri.repoPath!; + } + + getChildren(): ViewNode[] { + let children: (FileNode | FolderNode)[] = this.conflicts.map( + f => new MergeConflictFileNode(this.view, this, f, this.status), + ); + + if (this.view.config.files.layout !== 'list') { + const hierarchy = makeHierarchical( + children as FileNode[], + n => n.uri.relativePath.split('/'), + (...parts: string[]) => normalizePath(joinPaths(...parts)), + this.view.config.files.compact, + ); + + const root = new FolderNode(this.view, this, hierarchy, this.repoPath, '', undefined); + children = root.getChildren(); + } else { + children.sort((a, b) => sortCompare(a.label!, b.label!)); + } + + return children; + } + + getTreeItem(): TreeItem { + const item = new TreeItem(pluralize('conflict', this.conflicts.length), TreeItemCollapsibleState.Expanded); + return item; + } +} diff --git a/src/views/nodes/mergeConflictIncomingChangesNode.ts b/src/views/nodes/mergeConflictIncomingChangesNode.ts index 78aebb0444041..28406b248fa46 100644 --- a/src/views/nodes/mergeConflictIncomingChangesNode.ts +++ b/src/views/nodes/mergeConflictIncomingChangesNode.ts @@ -2,8 +2,8 @@ import type { Command } from 'vscode'; import { MarkdownString, ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; import type { DiffWithCommandArgs } from '../../commands'; import { Commands, GlyphChars } from '../../constants'; -import { CommitFormatter } from '../../git/formatters/commitFormatter'; import { GitUri } from '../../git/gitUri'; +import type { GitCommit } from '../../git/models/commit'; import type { GitFile } from '../../git/models/file'; import type { GitMergeStatus } from '../../git/models/merge'; import type { GitRebaseStatus } from '../../git/models/rebase'; @@ -13,6 +13,7 @@ import { configuration } from '../../system/configuration'; import type { FileHistoryView } from '../fileHistoryView'; import type { LineHistoryView } from '../lineHistoryView'; import type { ViewsWithCommits } from '../viewBase'; +import { getFileRevisionAsCommitTooltip } from './fileRevisionAsCommitNode'; import { ContextValues, ViewNode } from './viewNode'; export class MergeConflictIncomingChangesNode extends ViewNode { @@ -25,15 +26,23 @@ export class MergeConflictIncomingChangesNode extends ViewNode | undefined; + private async getCommit(): Promise { + if (this._commit == null) { + const ref = this.status.type === 'rebase' ? this.status.steps.current.commit?.ref : this.status.HEAD.ref; + if (ref == null) return undefined; + + this._commit = this.view.container.git.getCommit(this.status.repoPath, ref); + } + return this._commit; + } + getChildren(): ViewNode[] { return []; } async getTreeItem(): Promise { - const commit = await this.view.container.git.getCommit( - this.status.repoPath, - this.status.type === 'rebase' ? this.status.steps.current.commit.ref : this.status.HEAD.ref, - ); + const commit = await this.getCommit(); const item = new TreeItem('Incoming changes', TreeItemCollapsibleState.None); item.contextValue = ContextValues.MergeConflictIncomingChanges; @@ -49,41 +58,6 @@ export class MergeConflictIncomingChangesNode extends ViewNode { + if (item.tooltip == null) { + item.tooltip = await this.getTooltip(); + } + return item; + } + + private async getTooltip() { + const commit = await this.getCommit(); + + const markdown = new MarkdownString( + `Incoming changes from ${getReferenceLabel(this.status.incoming, { label: false })}\\\n$(file)${ + GlyphChars.Space + }${this.file.path}`, + true, + ); + + if (commit == null) { + markdown.appendMarkdown( + this.status.type === 'rebase' + ? `\n\n${getReferenceLabel(this.status.steps.current.commit, { + capitalize: true, + label: false, + })}` + : `\n\n${getReferenceLabel(this.status.HEAD, { + capitalize: true, + label: false, + })}`, + ); + return markdown; + } + + const tooltip = await getFileRevisionAsCommitTooltip( + this.view.container, + commit, + this.file, + this.view.config.formats.commits.tooltipWithStatus, + ); + + markdown.appendMarkdown(`\n\n${tooltip}`); + markdown.isTrusted = true; + + return markdown; + } } diff --git a/src/views/nodes/mergeStatusNode.ts b/src/views/nodes/mergeStatusNode.ts index fb3404452dff1..9d99486f78209 100644 --- a/src/views/nodes/mergeStatusNode.ts +++ b/src/views/nodes/mergeStatusNode.ts @@ -1,17 +1,13 @@ import { MarkdownString, ThemeColor, ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; -import type { CoreColors } from '../../constants'; +import type { Colors } from '../../constants'; import { GitUri } from '../../git/gitUri'; import type { GitBranch } from '../../git/models/branch'; import type { GitMergeStatus } from '../../git/models/merge'; import { getReferenceLabel } from '../../git/models/reference'; import type { GitStatus } from '../../git/models/status'; -import { makeHierarchical } from '../../system/array'; -import { joinPaths, normalizePath } from '../../system/path'; -import { pluralize, sortCompare } from '../../system/string'; +import { pluralize } from '../../system/string'; import type { ViewsWithCommits } from '../viewBase'; -import type { FileNode } from './folderNode'; -import { FolderNode } from './folderNode'; -import { MergeConflictFileNode } from './mergeConflictFileNode'; +import { MergeConflictFilesNode } from './mergeConflictFilesNode'; import { ContextValues, getViewNodeId, ViewNode } from './viewNode'; export class MergeStatusNode extends ViewNode { @@ -26,7 +22,7 @@ export class MergeStatusNode extends ViewNode { ) { super(GitUri.fromRepoPath(mergeStatus.repoPath), view, parent); - this.updateContext({ branch: branch, root: root }); + this.updateContext({ branch: branch, root: root, status: 'merging' }); this._uniqueId = getViewNodeId('merge-status', this.context); } @@ -35,50 +31,43 @@ export class MergeStatusNode extends ViewNode { } getChildren(): ViewNode[] { - if (this.status?.hasConflicts !== true) return []; - - let children: FileNode[] = this.status.conflicts.map( - f => new MergeConflictFileNode(this.view, this, f, this.mergeStatus), - ); - - if (this.view.config.files.layout !== 'list') { - const hierarchy = makeHierarchical( - children, - n => n.uri.relativePath.split('/'), - (...parts: string[]) => normalizePath(joinPaths(...parts)), - this.view.config.files.compact, - ); - - const root = new FolderNode(this.view, this, hierarchy, this.repoPath, '', undefined); - children = root.getChildren() as FileNode[]; - } else { - children.sort((a, b) => sortCompare(a.label!, b.label!)); - } - - return children; + return this.status?.hasConflicts + ? [new MergeConflictFilesNode(this.view, this, this.mergeStatus, this.status.conflicts)] + : []; } getTreeItem(): TreeItem { + const hasConflicts = this.status?.hasConflicts === true; const item = new TreeItem( - `${this.status?.hasConflicts ? 'Resolve conflicts before merging' : 'Merging'} ${ + `${hasConflicts ? 'Resolve conflicts before merging' : 'Merging'} ${ this.mergeStatus.incoming != null ? `${getReferenceLabel(this.mergeStatus.incoming, { expand: false, icon: false })} ` : '' }into ${getReferenceLabel(this.mergeStatus.current, { expand: false, icon: false })}`, - TreeItemCollapsibleState.Expanded, + hasConflicts ? TreeItemCollapsibleState.Expanded : TreeItemCollapsibleState.None, ); item.id = this.id; item.contextValue = ContextValues.Merge; - item.description = this.status?.hasConflicts ? pluralize('conflict', this.status.conflicts.length) : undefined; - item.iconPath = this.status?.hasConflicts - ? new ThemeIcon('warning', new ThemeColor('list.warningForeground' satisfies CoreColors)) - : new ThemeIcon('debug-pause', new ThemeColor('list.foreground' satisfies CoreColors)); + item.description = hasConflicts ? pluralize('conflict', this.status.conflicts.length) : undefined; + item.iconPath = hasConflicts + ? new ThemeIcon( + 'warning', + new ThemeColor( + 'gitlens.decorations.statusMergingOrRebasingConflictForegroundColor' satisfies Colors, + ), + ) + : new ThemeIcon( + 'warning', + new ThemeColor('gitlens.decorations.statusMergingOrRebasingForegroundColor' satisfies Colors), + ); const markdown = new MarkdownString( `${`Merging ${ - this.mergeStatus.incoming != null ? getReferenceLabel(this.mergeStatus.incoming) : '' - }into ${getReferenceLabel(this.mergeStatus.current)}`}${ - this.status?.hasConflicts ? `\n\n${pluralize('conflicted file', this.status.conflicts.length)}` : '' + this.mergeStatus.incoming != null ? getReferenceLabel(this.mergeStatus.incoming, { label: false }) : '' + }into ${getReferenceLabel(this.mergeStatus.current, { label: false })}`}${ + hasConflicts + ? `\n\nResolve ${pluralize('conflict', this.status.conflicts.length)} before continuing` + : '' }`, true, ); diff --git a/src/views/nodes/rebaseCommitNode.ts b/src/views/nodes/rebaseCommitNode.ts new file mode 100644 index 0000000000000..b4eff4c6c6125 --- /dev/null +++ b/src/views/nodes/rebaseCommitNode.ts @@ -0,0 +1,26 @@ +import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; +import { CommitFormatter } from '../../git/formatters/commitFormatter'; +import { CommitNode } from './commitNode'; +import { ContextValues } from './viewNode'; + +export class RebaseCommitNode extends CommitNode { + // eslint-disable-next-line @typescript-eslint/require-await + override async getTreeItem(): Promise { + const item = new TreeItem( + `Paused at commit ${this.commit.shortSha}`, + this._options.expand ? TreeItemCollapsibleState.Expanded : TreeItemCollapsibleState.Collapsed, + ); + item.id = this.id; + item.contextValue = `${ContextValues.Commit}+rebase`; + item.description = CommitFormatter.fromTemplate(`\${message}`, this.commit, { + messageTruncateAtNewLine: true, + }); + item.iconPath = new ThemeIcon('debug-pause'); + + return item; + } + + protected override getTooltipTemplate(): string { + return `Rebase paused at ${super.getTooltipTemplate()}`; + } +} diff --git a/src/views/nodes/rebaseStatusNode.ts b/src/views/nodes/rebaseStatusNode.ts index dae9dfaad1241..ee2d39c974550 100644 --- a/src/views/nodes/rebaseStatusNode.ts +++ b/src/views/nodes/rebaseStatusNode.ts @@ -1,29 +1,16 @@ -import type { Command } from 'vscode'; import { MarkdownString, ThemeColor, ThemeIcon, TreeItem, TreeItemCollapsibleState, Uri } from 'vscode'; -import type { DiffWithPreviousCommandArgs } from '../../commands'; -import type { CoreColors } from '../../constants'; -import { Commands } from '../../constants'; -import { CommitFormatter } from '../../git/formatters/commitFormatter'; +import type { Colors } from '../../constants'; import { GitUri } from '../../git/gitUri'; import type { GitBranch } from '../../git/models/branch'; -import type { GitCommit } from '../../git/models/commit'; import type { GitRebaseStatus } from '../../git/models/rebase'; -import type { GitRevisionReference } from '../../git/models/reference'; import { getReferenceLabel } from '../../git/models/reference'; import type { GitStatus } from '../../git/models/status'; -import { makeHierarchical } from '../../system/array'; -import { pauseOnCancelOrTimeoutMapTuplePromise } from '../../system/cancellation'; import { executeCoreCommand } from '../../system/command'; -import { configuration } from '../../system/configuration'; -import { joinPaths, normalizePath } from '../../system/path'; -import { getSettledValue } from '../../system/promise'; -import { pluralize, sortCompare } from '../../system/string'; +import { pluralize } from '../../system/string'; import type { ViewsWithCommits } from '../viewBase'; -import { CommitFileNode } from './commitFileNode'; -import type { FileNode } from './folderNode'; -import { FolderNode } from './folderNode'; -import { MergeConflictFileNode } from './mergeConflictFileNode'; -import { ContextValues, getViewNodeId, ViewNode, ViewRefNode } from './viewNode'; +import { MergeConflictFilesNode } from './mergeConflictFilesNode'; +import { RebaseCommitNode } from './rebaseCommitNode'; +import { ContextValues, getViewNodeId, ViewNode } from './viewNode'; export class RebaseStatusNode extends ViewNode { constructor( @@ -37,7 +24,7 @@ export class RebaseStatusNode extends ViewNode { ) { super(GitUri.fromRepoPath(rebaseStatus.repoPath), view, parent); - this.updateContext({ branch: branch, root: root }); + this.updateContext({ branch: branch, root: root, status: 'rebasing' }); this._uniqueId = getViewNodeId('merge-status', this.context); } @@ -46,65 +33,80 @@ export class RebaseStatusNode extends ViewNode { } async getChildren(): Promise { - let children: FileNode[] = - this.status?.conflicts.map(f => new MergeConflictFileNode(this.view, this, f, this.rebaseStatus)) ?? []; - - if (this.view.config.files.layout !== 'list') { - const hierarchy = makeHierarchical( - children, - n => n.uri.relativePath.split('/'), - (...parts: string[]) => normalizePath(joinPaths(...parts)), - this.view.config.files.compact, - ); - - const root = new FolderNode(this.view, this, hierarchy, this.repoPath, '', undefined); - children = root.getChildren() as FileNode[]; - } else { - children.sort((a, b) => sortCompare(a.label!, b.label!)); + const children: (MergeConflictFilesNode | RebaseCommitNode)[] = []; + + const revision = this.rebaseStatus.steps.current.commit; + if (revision != null) { + const commit = + revision != null + ? await this.view.container.git.getCommit(this.rebaseStatus.repoPath, revision.ref) + : undefined; + if (commit != null) { + children.push(new RebaseCommitNode(this.view, this, commit)); + } } - const commit = await this.view.container.git.getCommit( - this.rebaseStatus.repoPath, - this.rebaseStatus.steps.current.commit.ref, - ); - if (commit != null) { - children.unshift(new RebaseCommitNode(this.view, this, commit) as any); + if (this.status?.hasConflicts) { + children.push(new MergeConflictFilesNode(this.view, this, this.rebaseStatus, this.status.conflicts)); } return children; } getTreeItem(): TreeItem { + const started = this.rebaseStatus.steps.total > 0; + const pausedAtCommit = started && this.rebaseStatus.steps.current.commit != null; + const hasConflicts = this.status?.hasConflicts === true; + const item = new TreeItem( - `${this.status?.hasConflicts ? 'Resolve conflicts to continue rebasing' : 'Rebasing'} ${ + `${hasConflicts ? 'Resolve conflicts to continue rebasing' : started ? 'Rebasing' : 'Pending rebase of'} ${ this.rebaseStatus.incoming != null ? `${getReferenceLabel(this.rebaseStatus.incoming, { expand: false, icon: false })}` : '' - } (${this.rebaseStatus.steps.current.number}/${this.rebaseStatus.steps.total})`, - TreeItemCollapsibleState.Expanded, + } onto ${getReferenceLabel(this.rebaseStatus.current ?? this.rebaseStatus.onto, { + expand: false, + icon: false, + })}${started ? ` (${this.rebaseStatus.steps.current.number}/${this.rebaseStatus.steps.total})` : ''}`, + pausedAtCommit ? TreeItemCollapsibleState.Expanded : TreeItemCollapsibleState.None, ); item.id = this.id; item.contextValue = ContextValues.Rebase; - item.description = this.status?.hasConflicts ? pluralize('conflict', this.status.conflicts.length) : undefined; - item.iconPath = this.status?.hasConflicts - ? new ThemeIcon('warning', new ThemeColor('list.warningForeground' satisfies CoreColors)) - : new ThemeIcon('debug-pause', new ThemeColor('list.foreground' satisfies CoreColors)); + item.description = hasConflicts ? pluralize('conflict', this.status.conflicts.length) : undefined; + item.iconPath = hasConflicts + ? new ThemeIcon( + 'warning', + new ThemeColor( + 'gitlens.decorations.statusMergingOrRebasingConflictForegroundColor' satisfies Colors, + ), + ) + : new ThemeIcon( + 'warning', + new ThemeColor('gitlens.decorations.statusMergingOrRebasingForegroundColor' satisfies Colors), + ); const markdown = new MarkdownString( - `${`Rebasing ${ - this.rebaseStatus.incoming != null ? getReferenceLabel(this.rebaseStatus.incoming) : '' - }onto ${getReferenceLabel(this.rebaseStatus.current)}`}\n\nStep ${ - this.rebaseStatus.steps.current.number - } of ${this.rebaseStatus.steps.total}\\\nPaused at ${getReferenceLabel( - this.rebaseStatus.steps.current.commit, - { icon: true }, - )}${this.status?.hasConflicts ? `\n\n${pluralize('conflicted file', this.status.conflicts.length)}` : ''}`, + `${`${started ? 'Rebasing' : 'Pending rebase of'} ${ + this.rebaseStatus.incoming != null + ? getReferenceLabel(this.rebaseStatus.incoming, { label: false }) + : '' + } onto ${getReferenceLabel(this.rebaseStatus.current ?? this.rebaseStatus.onto, { label: false })}`}${ + started + ? `\n\nPaused at step ${this.rebaseStatus.steps.current.number} of ${ + this.rebaseStatus.steps.total + }${ + hasConflicts + ? `\\\nResolve ${pluralize('conflict', this.status.conflicts.length)} before continuing` + : '' + }` + : '' + }`, true, ); markdown.supportHtml = true; markdown.isTrusted = true; item.tooltip = markdown; + item.resourceUri = Uri.parse(`gitlens-view://status/rebasing${hasConflicts ? '/conflicts' : ''}`); return item; } @@ -116,124 +118,3 @@ export class RebaseStatusNode extends ViewNode { }); } } - -export class RebaseCommitNode extends ViewRefNode { - constructor( - view: ViewsWithCommits, - parent: ViewNode, - public readonly commit: GitCommit, - ) { - super(commit.getGitUri(), view, parent); - } - - override toClipboard(): string { - return `${this.commit.shortSha}: ${this.commit.summary}`; - } - - get ref(): GitRevisionReference { - return this.commit; - } - - async getChildren(): Promise { - const commit = this.commit; - - const commits = await commit.getCommitsForFiles(); - let children: FileNode[] = commits.map(c => new CommitFileNode(this.view, this, c.file!, c)); - - if (this.view.config.files.layout !== 'list') { - const hierarchy = makeHierarchical( - children, - n => n.uri.relativePath.split('/'), - (...parts: string[]) => normalizePath(joinPaths(...parts)), - this.view.config.files.compact, - ); - - const root = new FolderNode(this.view, this, hierarchy, this.repoPath, '', undefined); - children = root.getChildren() as FileNode[]; - } else { - children.sort((a, b) => sortCompare(a.label!, b.label!)); - } - - return children; - } - - getTreeItem(): TreeItem { - const item = new TreeItem(`Paused at commit ${this.commit.shortSha}`, TreeItemCollapsibleState.Collapsed); - - // item.contextValue = ContextValues.RebaseCommit; - - item.description = CommitFormatter.fromTemplate(`\${message}`, this.commit, { - messageTruncateAtNewLine: true, - }); - item.iconPath = new ThemeIcon('git-commit'); - - return item; - } - - override getCommand(): Command | undefined { - const commandArgs: DiffWithPreviousCommandArgs = { - commit: this.commit, - uri: this.uri, - line: 0, - showOptions: { - preserveFocus: true, - preview: true, - }, - }; - return { - title: 'Open Changes with Previous Revision', - command: Commands.DiffWithPrevious, - arguments: [undefined, commandArgs], - }; - } - - override async resolveTreeItem(item: TreeItem): Promise { - if (item.tooltip == null) { - item.tooltip = await this.getTooltip(); - } - return item; - } - - private async getTooltip() { - const [remotesResult, _] = await Promise.allSettled([ - this.view.container.git.getBestRemotesWithProviders(this.commit.repoPath), - this.commit.message == null ? this.commit.ensureFullDetails() : undefined, - ]); - - const remotes = getSettledValue(remotesResult, []); - const [remote] = remotes; - - let enrichedAutolinks; - let pr; - - if (remote?.hasRichIntegration()) { - const [enrichedAutolinksResult, prResult] = await Promise.allSettled([ - pauseOnCancelOrTimeoutMapTuplePromise(this.commit.getEnrichedAutolinks(remote)), - this.commit.getAssociatedPullRequest(remote), - ]); - - enrichedAutolinks = getSettledValue(enrichedAutolinksResult)?.value; - pr = getSettledValue(prResult); - } - - const tooltip = await CommitFormatter.fromTemplateAsync( - `Rebase paused at ${this.view.config.formats.commits.tooltip}`, - this.commit, - { - enrichedAutolinks: enrichedAutolinks, - dateFormat: configuration.get('defaultDateFormat'), - messageAutolinks: true, - messageIndent: 4, - pullRequest: pr, - outputFormat: 'markdown', - remotes: remotes, - }, - ); - - const markdown = new MarkdownString(tooltip, true); - markdown.supportHtml = true; - markdown.isTrusted = true; - - return markdown; - } -} diff --git a/src/views/nodes/statusFilesNode.ts b/src/views/nodes/statusFilesNode.ts index 5fd5a165f4ed2..156ac0d5c3ac4 100644 --- a/src/views/nodes/statusFilesNode.ts +++ b/src/views/nodes/statusFilesNode.ts @@ -10,7 +10,6 @@ import { filter, flatMap, map } from '../../system/iterable'; import { joinPaths, normalizePath } from '../../system/path'; import { pluralize, sortCompare } from '../../system/string'; import type { ViewsWithWorkingTree } from '../viewBase'; -import { WorktreesView } from '../worktreesView'; import type { FileNode } from './folderNode'; import { FolderNode } from './folderNode'; import { StatusFileNode } from './statusFileNode'; @@ -68,10 +67,7 @@ export class StatusFilesNode extends ViewNode { } } - if ( - (this.view instanceof WorktreesView || this.view.config.includeWorkingTree) && - this.status.files.length !== 0 - ) { + if ((this.view.type === 'worktrees' || this.view.config.includeWorkingTree) && this.status.files.length !== 0) { files.unshift( ...flatMap(this.status.files, f => map(f.getPseudoCommits(this.view.container, undefined), c => this.getFileWithPseudoCommit(f, c)), @@ -113,7 +109,7 @@ export class StatusFilesNode extends ViewNode { async getTreeItem(): Promise { let files = - this.view instanceof WorktreesView || this.view.config.includeWorkingTree ? this.status.files.length : 0; + this.view.type === 'worktrees' || this.view.config.includeWorkingTree ? this.status.files.length : 0; if (this.range != null) { if (this.status.upstream != null && this.status.state.ahead > 0) { diff --git a/src/views/nodes/viewNode.ts b/src/views/nodes/viewNode.ts index 834c322a63837..ddd8d49440d0a 100644 --- a/src/views/nodes/viewNode.ts +++ b/src/views/nodes/viewNode.ts @@ -111,6 +111,7 @@ export interface AmbientContext { readonly repository?: Repository; readonly root?: boolean; readonly searchId?: string; + readonly status?: 'merging' | 'rebasing'; readonly storedComparisonId?: string; readonly tag?: GitTag; readonly workspace?: CloudWorkspace | LocalWorkspace; @@ -145,10 +146,13 @@ export function getViewNodeId(type: string, context: AmbientContext): string { uniqueness += `/branch/${context.branch.id}`; } if (context.branchStatus != null) { - uniqueness += `/status/${context.branchStatus.upstream ?? '-'}`; + uniqueness += `/branch-status/${context.branchStatus.upstream ?? '-'}`; } if (context.branchStatusUpstreamType != null) { - uniqueness += `/status-direction/${context.branchStatusUpstreamType}`; + uniqueness += `/branch-status-direction/${context.branchStatusUpstreamType}`; + } + if (context.status != null) { + uniqueness += `/status/${context.status}`; } if (context.reflog != null) { uniqueness += `/reflog/${context.reflog.sha}+${context.reflog.selector}+${context.reflog.command}+${ diff --git a/src/views/remotesView.ts b/src/views/remotesView.ts index 0ef31cf9a5bd4..82472bcf65f83 100644 --- a/src/views/remotesView.ts +++ b/src/views/remotesView.ts @@ -209,6 +209,7 @@ export class RemotesView extends ViewBase<'remotes', RemotesViewNode, RemotesVie const branches = await this.container.git.getCommitBranches( commit.repoPath, commit.ref, + undefined, isCommit(commit) ? { commitDate: commit.committer.date, remotes: true } : { remotes: true }, ); if (branches.length === 0) return undefined; diff --git a/src/views/repositoriesView.ts b/src/views/repositoriesView.ts index 9ede04c21ba09..20f9c26ffa7bc 100644 --- a/src/views/repositoriesView.ts +++ b/src/views/repositoriesView.ts @@ -329,6 +329,7 @@ export class RepositoriesView extends ViewBase<'repositories', RepositoriesNode, let branches = await this.container.git.getCommitBranches( commit.repoPath, commit.ref, + undefined, isCommit(commit) ? { commitDate: commit.committer.date } : undefined, ); if (branches.length !== 0) { @@ -362,6 +363,7 @@ export class RepositoriesView extends ViewBase<'repositories', RepositoriesNode, branches = await this.container.git.getCommitBranches( commit.repoPath, commit.ref, + undefined, isCommit(commit) ? { commitDate: commit.committer.date, remotes: true } : { remotes: true }, ); if (branches.length === 0) return undefined; diff --git a/src/views/viewDecorationProvider.ts b/src/views/viewDecorationProvider.ts index cfdd93232770d..e2ecfc62b9895 100644 --- a/src/views/viewDecorationProvider.ts +++ b/src/views/viewDecorationProvider.ts @@ -19,19 +19,18 @@ export class ViewFileDecorationProvider implements FileDecorationProvider, Dispo provideFileDecoration: (uri, token) => { if (uri.scheme !== 'gitlens-view') return undefined; - if (uri.authority === 'branch') { - return this.provideBranchCurrentDecoration(uri, token); + switch (uri.authority) { + case 'branch': + return this.provideBranchCurrentDecoration(uri, token); + case 'remote': + return this.provideRemoteDefaultDecoration(uri, token); + case 'status': + return this.provideStatusDecoration(uri, token); + case 'workspaces': + return this.provideWorkspaceDecoration(uri, token); + default: + return undefined; } - - if (uri.authority === 'remote') { - return this.provideRemoteDefaultDecoration(uri, token); - } - - if (uri.authority === 'workspaces') { - return this.provideWorkspaceDecoration(uri, token); - } - - return undefined; }, }), window.registerFileDecorationProvider(this), @@ -233,4 +232,27 @@ export class ViewFileDecorationProvider implements FileDecorationProvider, Dispo tooltip: 'Default Remote', }; } + + provideStatusDecoration(uri: Uri, _token: CancellationToken): FileDecoration | undefined { + const [, status, conflicts] = uri.path.split('/'); + + switch (status) { + case 'rebasing': + if (conflicts) { + return { + badge: '!', + color: new ThemeColor( + 'gitlens.decorations.statusMergingOrRebasingConflictForegroundColor' satisfies Colors, + ), + }; + } + return { + color: new ThemeColor( + 'gitlens.decorations.statusMergingOrRebasingForegroundColor' satisfies Colors, + ), + }; + default: + return undefined; + } + } } From 365e07f7e952591f087f3a70495f7e22789d39f8 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sun, 1 Oct 2023 00:46:44 -0400 Subject: [PATCH 0002/1012] Updates dependencies --- package.json | 6 +- yarn.lock | 428 +++++++++++++++++++++++++-------------------------- 2 files changed, 211 insertions(+), 223 deletions(-) diff --git a/package.json b/package.json index 753946fb995bf..05c7e50664b6c 100644 --- a/package.json +++ b/package.json @@ -14833,8 +14833,8 @@ "@typescript-eslint/eslint-plugin": "6.7.3", "@typescript-eslint/parser": "6.7.3", "@vscode/test-electron": "2.3.4", - "@vscode/test-web": "0.0.45", - "@vscode/vsce": "2.21.0", + "@vscode/test-web": "0.0.46", + "@vscode/vsce": "2.21.1", "circular-dependency-plugin": "5.2.2", "clean-webpack-plugin": "4.0.0", "concurrently": "8.2.1", @@ -14843,7 +14843,7 @@ "css-loader": "6.8.1", "css-minimizer-webpack-plugin": "5.0.1", "cssnano-preset-advanced": "6.0.1", - "esbuild": "0.19.3", + "esbuild": "0.19.4", "esbuild-loader": "4.0.2", "esbuild-sass-plugin": "2.15.0", "eslint": "8.50.0", diff --git a/yarn.lock b/yarn.lock index 731c7b3e69a31..a865f3d2c1b57 100644 --- a/yarn.lock +++ b/yarn.lock @@ -61,115 +61,115 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== -"@esbuild/android-arm64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.3.tgz#91a3b1b4a68c01ffdd5d8ffffb0a83178a366ae0" - integrity sha512-w+Akc0vv5leog550kjJV9Ru+MXMR2VuMrui3C61mnysim0gkFCPOUTAfzTP0qX+HpN9Syu3YA3p1hf3EPqObRw== - -"@esbuild/android-arm@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.3.tgz#08bd09f2ebc312422f4e94ae954821f9cf37b39e" - integrity sha512-Lemgw4io4VZl9GHJmjiBGzQ7ONXRfRPHcUEerndjwiSkbxzrpq0Uggku5MxxrXdwJ+pTj1qyw4jwTu7hkPsgIA== - -"@esbuild/android-x64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.3.tgz#b1dffec99ed5505fc57561e8758b449dba4924fe" - integrity sha512-FKQJKkK5MXcBHoNZMDNUAg1+WcZlV/cuXrWCoGF/TvdRiYS4znA0m5Il5idUwfxrE20bG/vU1Cr5e1AD6IEIjQ== - -"@esbuild/darwin-arm64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.3.tgz#2e0db5ad26313c7f420f2cd76d9d263fc49cb549" - integrity sha512-kw7e3FXU+VsJSSSl2nMKvACYlwtvZB8RUIeVShIEY6PVnuZ3c9+L9lWB2nWeeKWNNYDdtL19foCQ0ZyUL7nqGw== - -"@esbuild/darwin-x64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.3.tgz#ebe99f35049180023bb37999bddbe306b076a484" - integrity sha512-tPfZiwF9rO0jW6Jh9ipi58N5ZLoSjdxXeSrAYypy4psA2Yl1dAMhM71KxVfmjZhJmxRjSnb29YlRXXhh3GqzYw== - -"@esbuild/freebsd-arm64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.3.tgz#cf8b58ba5173440ea6124a3d0278bfe4ce181c20" - integrity sha512-ERDyjOgYeKe0Vrlr1iLrqTByB026YLPzTytDTz1DRCYM+JI92Dw2dbpRHYmdqn6VBnQ9Bor6J8ZlNwdZdxjlSg== - -"@esbuild/freebsd-x64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.3.tgz#3f283099810ef1b8468cd1a9400c042e3f12e2a7" - integrity sha512-nXesBZ2Ad1qL+Rm3crN7NmEVJ5uvfLFPLJev3x1j3feCQXfAhoYrojC681RhpdOph8NsvKBBwpYZHR7W0ifTTA== - -"@esbuild/linux-arm64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.3.tgz#a8b3aa69653ac504a51aa73739fb06de3a04d1ff" - integrity sha512-qXvYKmXj8GcJgWq3aGvxL/JG1ZM3UR272SdPU4QSTzD0eymrM7leiZH77pvY3UetCy0k1xuXZ+VPvoJNdtrsWQ== - -"@esbuild/linux-arm@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.3.tgz#ff6a2f68d4fc3ab46f614bca667a1a81ed6eea26" - integrity sha512-zr48Cg/8zkzZCzDHNxXO/89bf9e+r4HtzNUPoz4GmgAkF1gFAFmfgOdCbR8zMbzFDGb1FqBBhdXUpcTQRYS1cQ== - -"@esbuild/linux-ia32@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.3.tgz#5813baf70e406304e8931b200e39d0293b488073" - integrity sha512-7XlCKCA0nWcbvYpusARWkFjRQNWNGlt45S+Q18UeS///K6Aw8bB2FKYe9mhVWy/XLShvCweOLZPrnMswIaDXQA== - -"@esbuild/linux-loong64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.3.tgz#21110f29b5e31dc865c7253fde8a2003f7e8b6fd" - integrity sha512-qGTgjweER5xqweiWtUIDl9OKz338EQqCwbS9c2Bh5jgEH19xQ1yhgGPNesugmDFq+UUSDtWgZ264st26b3de8A== - -"@esbuild/linux-mips64el@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.3.tgz#4530fc416651eadeb1acc27003c00eac769eb8fd" - integrity sha512-gy1bFskwEyxVMFRNYSvBauDIWNggD6pyxUksc0MV9UOBD138dKTzr8XnM2R4mBsHwVzeuIH8X5JhmNs2Pzrx+A== - -"@esbuild/linux-ppc64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.3.tgz#facf910b0d397e391b37b01a1b4f6e363b04e56b" - integrity sha512-UrYLFu62x1MmmIe85rpR3qou92wB9lEXluwMB/STDzPF9k8mi/9UvNsG07Tt9AqwPQXluMQ6bZbTzYt01+Ue5g== - -"@esbuild/linux-riscv64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.3.tgz#4a67abe97a495430d5867340982f5424a64f2aac" - integrity sha512-9E73TfyMCbE+1AwFOg3glnzZ5fBAFK4aawssvuMgCRqCYzE0ylVxxzjEfut8xjmKkR320BEoMui4o/t9KA96gA== - -"@esbuild/linux-s390x@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.3.tgz#c5fb47474b9f816d81876c119dbccadf671cc5f6" - integrity sha512-LlmsbuBdm1/D66TJ3HW6URY8wO6IlYHf+ChOUz8SUAjVTuaisfuwCOAgcxo3Zsu3BZGxmI7yt//yGOxV+lHcEA== - -"@esbuild/linux-x64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.3.tgz#f22d659969ab78dc422f1df8d9a79bc1e7b12ee3" - integrity sha512-ogV0+GwEmvwg/8ZbsyfkYGaLACBQWDvO0Kkh8LKBGKj9Ru8VM39zssrnu9Sxn1wbapA2qNS6BiLdwJZGouyCwQ== - -"@esbuild/netbsd-x64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.3.tgz#e9b046934996991f46b8c1cadac815aa45f84fd4" - integrity sha512-o1jLNe4uzQv2DKXMlmEzf66Wd8MoIhLNO2nlQBHLtWyh2MitDG7sMpfCO3NTcoTMuqHjfufgUQDFRI5C+xsXQw== - -"@esbuild/openbsd-x64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.3.tgz#b287ef4841fc1067bbbd9a60549e8f9cf1b7ee3a" - integrity sha512-AZJCnr5CZgZOdhouLcfRdnk9Zv6HbaBxjcyhq0StNcvAdVZJSKIdOiPB9az2zc06ywl0ePYJz60CjdKsQacp5Q== - -"@esbuild/sunos-x64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.3.tgz#b2b8ba7d27907c7245f6e57dc62f3b88693f84b0" - integrity sha512-Acsujgeqg9InR4glTRvLKGZ+1HMtDm94ehTIHKhJjFpgVzZG9/pIcWW/HA/DoMfEyXmANLDuDZ2sNrWcjq1lxw== - -"@esbuild/win32-arm64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.3.tgz#1974c8c180c9add4962235662c569fcc4c8f43dd" - integrity sha512-FSrAfjVVy7TifFgYgliiJOyYynhQmqgPj15pzLyJk8BUsnlWNwP/IAy6GAiB1LqtoivowRgidZsfpoYLZH586A== - -"@esbuild/win32-ia32@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.3.tgz#b02cc2dd8b6aed042069680f01f45fdfd3de5bc4" - integrity sha512-xTScXYi12xLOWZ/sc5RBmMN99BcXp/eEf7scUC0oeiRoiT5Vvo9AycuqCp+xdpDyAU+LkrCqEpUS9fCSZF8J3Q== - -"@esbuild/win32-x64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.3.tgz#e5036be529f757e58d9a7771f2f1b14782986a74" - integrity sha512-FbUN+0ZRXsypPyWE2IwIkVjDkDnJoMJARWOcFZn4KPPli+QnKqF0z1anvfaYe3ev5HFCpRDLLBDHyOALLppWHw== +"@esbuild/android-arm64@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.4.tgz#74752a09301b8c6b9a415fbda9fb71406a62a7b7" + integrity sha512-mRsi2vJsk4Bx/AFsNBqOH2fqedxn5L/moT58xgg51DjX1la64Z3Npicut2VbhvDFO26qjWtPMsVxCd80YTFVeg== + +"@esbuild/android-arm@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.4.tgz#c27363e1e280e577d9b5c8fa7c7a3be2a8d79bf5" + integrity sha512-uBIbiYMeSsy2U0XQoOGVVcpIktjLMEKa7ryz2RLr7L/vTnANNEsPVAh4xOv7ondGz6ac1zVb0F8Jx20rQikffQ== + +"@esbuild/android-x64@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.4.tgz#6c9ee03d1488973d928618100048b75b147e0426" + integrity sha512-4iPufZ1TMOD3oBlGFqHXBpa3KFT46aLl6Vy7gwed0ZSYgHaZ/mihbYb4t7Z9etjkC9Al3ZYIoOaHrU60gcMy7g== + +"@esbuild/darwin-arm64@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.4.tgz#64e2ee945e5932cd49812caa80e8896e937e2f8b" + integrity sha512-Lviw8EzxsVQKpbS+rSt6/6zjn9ashUZ7Tbuvc2YENgRl0yZTktGlachZ9KMJUsVjZEGFVu336kl5lBgDN6PmpA== + +"@esbuild/darwin-x64@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.4.tgz#d8e26e1b965df284692e4d1263ba69a49b39ac7a" + integrity sha512-YHbSFlLgDwglFn0lAO3Zsdrife9jcQXQhgRp77YiTDja23FrC2uwnhXMNkAucthsf+Psr7sTwYEryxz6FPAVqw== + +"@esbuild/freebsd-arm64@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.4.tgz#29751a41b242e0a456d89713b228f1da4f45582f" + integrity sha512-vz59ijyrTG22Hshaj620e5yhs2dU1WJy723ofc+KUgxVCM6zxQESmWdMuVmUzxtGqtj5heHyB44PjV/HKsEmuQ== + +"@esbuild/freebsd-x64@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.4.tgz#873edc0f73e83a82432460ea59bf568c1e90b268" + integrity sha512-3sRbQ6W5kAiVQRBWREGJNd1YE7OgzS0AmOGjDmX/qZZecq8NFlQsQH0IfXjjmD0XtUYqr64e0EKNFjMUlPL3Cw== + +"@esbuild/linux-arm64@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.4.tgz#659f2fa988d448dbf5010b5cc583be757cc1b914" + integrity sha512-ZWmWORaPbsPwmyu7eIEATFlaqm0QGt+joRE9sKcnVUG3oBbr/KYdNE2TnkzdQwX6EDRdg/x8Q4EZQTXoClUqqA== + +"@esbuild/linux-arm@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.4.tgz#d5b13a7ec1f1c655ce05c8d319b3950797baee55" + integrity sha512-z/4ArqOo9EImzTi4b6Vq+pthLnepFzJ92BnofU1jgNlcVb+UqynVFdoXMCFreTK7FdhqAzH0vmdwW5373Hm9pg== + +"@esbuild/linux-ia32@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.4.tgz#878cd8bf24c9847c77acdb5dd1b2ef6e4fa27a82" + integrity sha512-EGc4vYM7i1GRUIMqRZNCTzJh25MHePYsnQfKDexD8uPTCm9mK56NIL04LUfX2aaJ+C9vyEp2fJ7jbqFEYgO9lQ== + +"@esbuild/linux-loong64@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.4.tgz#df890499f6e566b7de3aa2361be6df2b8d5fa015" + integrity sha512-WVhIKO26kmm8lPmNrUikxSpXcgd6HDog0cx12BUfA2PkmURHSgx9G6vA19lrlQOMw+UjMZ+l3PpbtzffCxFDRg== + +"@esbuild/linux-mips64el@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.4.tgz#76eae4e88d2ce9f4f1b457e93892e802851b6807" + integrity sha512-keYY+Hlj5w86hNp5JJPuZNbvW4jql7c1eXdBUHIJGTeN/+0QFutU3GrS+c27L+NTmzi73yhtojHk+lr2+502Mw== + +"@esbuild/linux-ppc64@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.4.tgz#c49032f4abbcfa3f747b543a106931fe3dce41ff" + integrity sha512-tQ92n0WMXyEsCH4m32S21fND8VxNiVazUbU4IUGVXQpWiaAxOBvtOtbEt3cXIV3GEBydYsY8pyeRMJx9kn3rvw== + +"@esbuild/linux-riscv64@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.4.tgz#0f815a090772138503ee0465a747e16865bf94b1" + integrity sha512-tRRBey6fG9tqGH6V75xH3lFPpj9E8BH+N+zjSUCnFOX93kEzqS0WdyJHkta/mmJHn7MBaa++9P4ARiU4ykjhig== + +"@esbuild/linux-s390x@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.4.tgz#8d2cca20cd4e7c311fde8701d9f1042664f8b92b" + integrity sha512-152aLpQqKZYhThiJ+uAM4PcuLCAOxDsCekIbnGzPKVBRUDlgaaAfaUl5NYkB1hgY6WN4sPkejxKlANgVcGl9Qg== + +"@esbuild/linux-x64@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.4.tgz#f618bec2655de49bff91c588777e37b5e3169d4a" + integrity sha512-Mi4aNA3rz1BNFtB7aGadMD0MavmzuuXNTaYL6/uiYIs08U7YMPETpgNn5oue3ICr+inKwItOwSsJDYkrE9ekVg== + +"@esbuild/netbsd-x64@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.4.tgz#7889744ca4d60f1538d62382b95e90a49687cef2" + integrity sha512-9+Wxx1i5N/CYo505CTT7T+ix4lVzEdz0uCoYGxM5JDVlP2YdDC1Bdz+Khv6IbqmisT0Si928eAxbmGkcbiuM/A== + +"@esbuild/openbsd-x64@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.4.tgz#c3e436eb9271a423d2e8436fcb120e3fd90e2b01" + integrity sha512-MFsHleM5/rWRW9EivFssop+OulYVUoVcqkyOkjiynKBCGBj9Lihl7kh9IzrreDyXa4sNkquei5/DTP4uCk25xw== + +"@esbuild/sunos-x64@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.4.tgz#f63f5841ba8c8c1a1c840d073afc99b53e8ce740" + integrity sha512-6Xq8SpK46yLvrGxjp6HftkDwPP49puU4OF0hEL4dTxqCbfx09LyrbUj/D7tmIRMj5D5FCUPksBbxyQhp8tmHzw== + +"@esbuild/win32-arm64@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.4.tgz#80be69cec92da4da7781cf7a8351b95cc5a236b0" + integrity sha512-PkIl7Jq4mP6ke7QKwyg4fD4Xvn8PXisagV/+HntWoDEdmerB2LTukRZg728Yd1Fj+LuEX75t/hKXE2Ppk8Hh1w== + +"@esbuild/win32-ia32@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.4.tgz#15dc0ed83d2794872b05d8edc4a358fecf97eb54" + integrity sha512-ga676Hnvw7/ycdKB53qPusvsKdwrWzEyJ+AtItHGoARszIqvjffTwaaW3b2L6l90i7MO9i+dlAW415INuRhSGg== + +"@esbuild/win32-x64@0.19.4": + version "0.19.4" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.4.tgz#d46a6e220a717f31f39ae80f49477cc3220be0f0" + integrity sha512-HP0GDNla1T3ZL8Ko/SHAS2GgtjOg+VmWnnYLhuTksr++EnduYB0f3Y2LzHsUwb2iQ13JGoY6G3R8h6Du/WG6uA== "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" @@ -179,9 +179,9 @@ eslint-visitor-keys "^3.3.0" "@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1": - version "4.8.1" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.8.1.tgz#8c4bb756cc2aa7eaf13cfa5e69c83afb3260c20c" - integrity sha512-PWiOzLIUAjN/w5K17PoF4n6sKBw0gqLHPhywmYHP4t1VFQQVYeb1yWsJwnMVEMl3tUHME7X/SJPZLmtG7XBDxQ== + version "4.9.0" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.9.0.tgz#7ccb5f58703fa61ffdcbf39e2c604a109e781162" + integrity sha512-zJmuCWj2VLBt4c25CfBIbMZLGLyhkvs7LznyVX5HfpzeocThgIj5XQK4L+g3U36mMcx8bPMhGyPpwCATamC4jQ== "@eslint/eslintrc@^2.1.2": version "2.1.2" @@ -238,9 +238,9 @@ react-onclickoutside "^6.13.0" "@gitkraken/shared-web-components@^0.1.1-rc.6": - version "0.1.1-rc.9" - resolved "https://registry.yarnpkg.com/@gitkraken/shared-web-components/-/shared-web-components-0.1.1-rc.9.tgz#a05991017d8d7d2586350ba6ef4c2aba8c6da669" - integrity sha512-oY1LGtPHyllD32dbVf1FdoKesFDNGpTgS64b7a9fRb4q0MRgzvhAAQg7uyx3SA1epwYPUwJqyyrzEaKzolwCHQ== + version "0.1.1-rc.10" + resolved "https://registry.yarnpkg.com/@gitkraken/shared-web-components/-/shared-web-components-0.1.1-rc.10.tgz#bed7021a0e6912ae3196e06078169950f0616bed" + integrity sha512-2GoM9Gg473zbtTL5u5YTiDeU8mzACj2hMQBk+7iruiiVoJLGxvi1bT95MyXHakhv4zk4lI5OVWP6TU4ZAaoDLQ== dependencies: "@floating-ui/dom" "^1.4.2" typescript "^4.9.5" @@ -573,6 +573,13 @@ resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== +"@playwright/browser-chromium@^1.38.1": + version "1.38.1" + resolved "https://registry.yarnpkg.com/@playwright/browser-chromium/-/browser-chromium-1.38.1.tgz#daf0ed3f7a8f9ad6ca731c73be3682b7cce8d5ff" + integrity sha512-HRhcBGtk1XaGAQjOben/04PNHxWAY3DBHT97egraR5lx5SQSLOREIiYu/j7WlvQBz4QJP+XL2JsvoxFBJfXmAw== + dependencies: + playwright-core "1.38.1" + "@polka/url@^1.0.0-next.20": version "1.0.0-next.23" resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.23.tgz#498e41218ab3b6a1419c735e5c6ae2c5ed609b6c" @@ -650,16 +657,16 @@ integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g== "@types/istanbul-lib-report@*": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" - integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== + version "3.0.1" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#412e0725ef41cde73bfa03e0e833eaff41e0fd63" + integrity sha512-gPQuzaPR5h/djlAv2apEG1HVOyj1IUs7GpfMZixU0/0KXT3pm64ylHuMUI1/Akh+sq/iikxg6Z2j+fcMDXaaTQ== dependencies: "@types/istanbul-lib-coverage" "*" "@types/istanbul-reports@^3.0.0": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" - integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw== + version "3.0.2" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.2.tgz#edc8e421991a3b4df875036d381fc0a5a982f549" + integrity sha512-kv43F9eb3Lhj+lr/Hn6OcLCs/sSM8bt+fIaP11rCYngfV6NVjzWXJ17owQtDQTL9tQ8WSLUrGsSJ6rJz0F1w1A== dependencies: "@types/istanbul-lib-report" "*" @@ -679,9 +686,9 @@ integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== "@types/minimist@^1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" - integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== + version "1.2.3" + resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.3.tgz#dd249cef80c6fff2ba6a0d4e5beca913e04e25f8" + integrity sha512-ZYFzrvyWUNhaPomn80dsMNgMeXxNWZBdkuG/hWlUvXvbdUH8ZERNBGXnU87McuGcWDsyzX2aChCv/SVN348k3A== "@types/mocha@10.0.1": version "10.0.1" @@ -689,9 +696,9 @@ integrity sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q== "@types/node@*": - version "20.6.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.6.5.tgz#4c6a79adf59a8e8193ac87a0e522605b16587258" - integrity sha512-2qGq5LAOTh9izcc0+F+dToFigBWiK1phKPt7rNhOqJSr35y8rlIBjDwGtFSgAI6MGIhjwOVNSQZVdJsZJ2uR1w== + version "20.8.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.0.tgz#10ddf0119cf20028781c06d7115562934e53f745" + integrity sha512-LzcWltT83s1bthcvjBmiBvGJiiUe84NWRHkw+ZV6Fr41z2FbIzvc815dk2nQ3RAKMuN2fkenM/z3Xv2QzEpYxQ== "@types/node@16.11.47": version "16.11.47" @@ -730,9 +737,9 @@ csstype "^3.0.2" "@types/react@^17": - version "17.0.65" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.65.tgz#95f6a2ab61145ffb69129d07982d047f9e0870cd" - integrity sha512-oxur785xZYHvnI7TRS61dXbkIhDPnGfsXKv0cNXR/0ml4SipRIFpSMzA7HMEfOywFwJ5AOnPrXYTEiTRUQeGlQ== + version "17.0.66" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.66.tgz#4b3bfd6dd5ee37835f60d4a9325cff974b064126" + integrity sha512-azQzO1tuioq9M4vVKzzdBgG5KfLhyocYkRlJMBDcrJ7bUzyjR7QIGbZk2zH7sB5KpXRWoZJQ3CznVyhDS/swxA== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -769,9 +776,9 @@ integrity sha512-axdPBuLuEJt0c4yI5OZssC19K2Mq1uKdrfZBzuxLvaztgqUtFYZUNw7lETExPYJR9jdEoIg4mb7RQKRQzOkeGQ== "@types/yargs@^17.0.8": - version "17.0.25" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.25.tgz#3edd102803c97356fb4c805b2bbaf7dfc9ab6abc" - integrity sha512-gy7iPgwnzNvxgAEi2bXOHWCVOG6f7xsprVJH4MjlAWeBmJ7vh/Y1kwMtUrs64ztf24zVIRCpr3n/z6gm9QIkgg== + version "17.0.26" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.26.tgz#388e5002a8b284ad7b4599ba89920a6d74d8d79a" + integrity sha512-Y3vDy2X6zw/ZCumcwLpdhM5L7jmyGpmBCTYMHDLqT2IKVMYRRLdv6ZakA+wxhra6Z/3bwhNbNl9bDGXaFU+6rw== dependencies: "@types/yargs-parser" "*" @@ -875,29 +882,30 @@ jszip "^3.10.1" semver "^7.5.2" -"@vscode/test-web@0.0.45": - version "0.0.45" - resolved "https://registry.yarnpkg.com/@vscode/test-web/-/test-web-0.0.45.tgz#e0b23a67ec0081f69173565db93847ab3aec0a8e" - integrity sha512-yPJgxEbbxDlKGGpLzNQ8PDPOOUKUVo7Epg/3o+y7mKtjbg3nktIReJ/pPtOHrZxsNC8FkzTNBoTh5DMBHX/LGg== +"@vscode/test-web@0.0.46": + version "0.0.46" + resolved "https://registry.yarnpkg.com/@vscode/test-web/-/test-web-0.0.46.tgz#ad42bcaa5fbbf7929dcc629db6285fd7580753ad" + integrity sha512-s5rKDtCvIWN6kJpjXzBoWpLvftjH3m2r2MQNGUGsdY1+mOJ06lbbHeJn+g30+p0ec4Vh7PpBZGECflrRW+oH4Q== dependencies: "@koa/cors" "^4.0.0" "@koa/router" "^12.0.0" + "@playwright/browser-chromium" "^1.38.1" gunzip-maybe "^1.4.2" http-proxy-agent "^7.0.0" - https-proxy-agent "^7.0.1" + https-proxy-agent "^7.0.2" koa "^2.14.2" koa-morgan "^1.0.1" koa-mount "^4.0.0" koa-static "^5.0.0" minimist "^1.2.8" - playwright "^1.37.1" + playwright "^1.38.1" tar-fs "^3.0.4" vscode-uri "^3.0.7" -"@vscode/vsce@2.21.0": - version "2.21.0" - resolved "https://registry.yarnpkg.com/@vscode/vsce/-/vsce-2.21.0.tgz#572e66db79cff383b9ac39f71710aa62e6392330" - integrity sha512-KuxYqScqUY/duJbkj9eE2tN2X/WJoGAy54hHtxT3ZBkM6IzrOg7H7CXGUPBxNlmqku2w/cAjOUSrgIHlzz0mbA== +"@vscode/vsce@2.21.1": + version "2.21.1" + resolved "https://registry.yarnpkg.com/@vscode/vsce/-/vsce-2.21.1.tgz#793c78d992483b428611a3927211a9640041be14" + integrity sha512-f45/aT+HTubfCU2oC7IaWnH9NjOWp668ML002QiFObFRVUCoLtcwepp9mmql/ArFUy+HCHp54Xrq4koTcOD6TA== dependencies: azure-devops-node-api "^11.0.1" chalk "^2.4.2" @@ -1497,12 +1505,12 @@ browserify-zlib@^0.1.4: pako "~0.2.0" browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.21.10, browserslist@^4.21.4: - version "4.21.11" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.11.tgz#35f74a3e51adc4d193dcd76ea13858de7b8fecb8" - integrity sha512-xn1UXOKUz7DjdGlg9RrUr0GGiWzI97UQJnugHtH0OLDfJB7jMgoIkYvRIEO1l9EeEERVqeqLYOcFBW9ldjypbQ== + version "4.22.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.1.tgz#ba91958d1a59b87dab6fed8dfbcb3da5e2e9c619" + integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ== dependencies: - caniuse-lite "^1.0.30001538" - electron-to-chromium "^1.4.526" + caniuse-lite "^1.0.30001541" + electron-to-chromium "^1.4.535" node-releases "^2.0.13" update-browserslist-db "^1.0.13" @@ -1603,10 +1611,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001538: - version "1.0.30001539" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001539.tgz#325a387ab1ed236df2c12dc6cd43a4fff9903a44" - integrity sha512-hfS5tE8bnNiNvEOEkm8HElUHroYwlqMMENEzELymy77+tJ6m+gA2krtHl5hxJaj71OlpC2cHZbdSMX1/YEqEkA== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001541: + version "1.0.30001541" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001541.tgz#b1aef0fadd87fb72db4dcb55d220eae17b81cdb1" + integrity sha512-bLOsqxDgTqUBkzxbNlSBt8annkDpQB9NdzdTbO2ooJ+eC/IQcvDspDc058g84ejCelF7vHUx57KIOjEecOHXaw== capital-case@^1.0.4: version "1.0.4" @@ -2586,10 +2594,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.4.526: - version "1.4.528" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.528.tgz#7c900fd73d9d2e8bb0dab0e301f25f0f4776ef2c" - integrity sha512-UdREXMXzLkREF4jA8t89FQjA8WHI6ssP38PMY4/4KhXFQbtImnghh4GkCgrtiZwLKUKVD2iTVXvDVQjfomEQuA== +electron-to-chromium@^1.4.535: + version "1.4.537" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.537.tgz#aac4101db53066be1e49baedd000a26bc754adc9" + integrity sha512-W1+g9qs9hviII0HAwOdehGYkr+zt7KKdmCcJcjH0mYg6oL8+ioT3Skjmt7BLoAQqXhjf40AXd+HlR4oAWMlXjA== emoji-regex@^8.0.0: version "8.0.0" @@ -2799,33 +2807,33 @@ esbuild-sass-plugin@2.15.0: resolve "^1.22.2" sass "^1.65.1" -esbuild@0.19.3, esbuild@^0.19.0: - version "0.19.3" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.3.tgz#d9268cd23358eef9d76146f184e0c55ff8da7bb6" - integrity sha512-UlJ1qUUA2jL2nNib1JTSkifQTcYTroFqRjwCFW4QYEKEsixXD5Tik9xML7zh2gTxkYTBKGHNH9y7txMwVyPbjw== +esbuild@0.19.4, esbuild@^0.19.0: + version "0.19.4" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.4.tgz#cdf5c4c684956d550bc3c6d0c01dac7fef6c75b1" + integrity sha512-x7jL0tbRRpv4QUyuDMjONtWFciygUxWaUM1kMX2zWxI0X2YWOt7MSA0g4UdeSiHM8fcYVzpQhKYOycZwxTdZkA== optionalDependencies: - "@esbuild/android-arm" "0.19.3" - "@esbuild/android-arm64" "0.19.3" - "@esbuild/android-x64" "0.19.3" - "@esbuild/darwin-arm64" "0.19.3" - "@esbuild/darwin-x64" "0.19.3" - "@esbuild/freebsd-arm64" "0.19.3" - "@esbuild/freebsd-x64" "0.19.3" - "@esbuild/linux-arm" "0.19.3" - "@esbuild/linux-arm64" "0.19.3" - "@esbuild/linux-ia32" "0.19.3" - "@esbuild/linux-loong64" "0.19.3" - "@esbuild/linux-mips64el" "0.19.3" - "@esbuild/linux-ppc64" "0.19.3" - "@esbuild/linux-riscv64" "0.19.3" - "@esbuild/linux-s390x" "0.19.3" - "@esbuild/linux-x64" "0.19.3" - "@esbuild/netbsd-x64" "0.19.3" - "@esbuild/openbsd-x64" "0.19.3" - "@esbuild/sunos-x64" "0.19.3" - "@esbuild/win32-arm64" "0.19.3" - "@esbuild/win32-ia32" "0.19.3" - "@esbuild/win32-x64" "0.19.3" + "@esbuild/android-arm" "0.19.4" + "@esbuild/android-arm64" "0.19.4" + "@esbuild/android-x64" "0.19.4" + "@esbuild/darwin-arm64" "0.19.4" + "@esbuild/darwin-x64" "0.19.4" + "@esbuild/freebsd-arm64" "0.19.4" + "@esbuild/freebsd-x64" "0.19.4" + "@esbuild/linux-arm" "0.19.4" + "@esbuild/linux-arm64" "0.19.4" + "@esbuild/linux-ia32" "0.19.4" + "@esbuild/linux-loong64" "0.19.4" + "@esbuild/linux-mips64el" "0.19.4" + "@esbuild/linux-ppc64" "0.19.4" + "@esbuild/linux-riscv64" "0.19.4" + "@esbuild/linux-s390x" "0.19.4" + "@esbuild/linux-x64" "0.19.4" + "@esbuild/netbsd-x64" "0.19.4" + "@esbuild/openbsd-x64" "0.19.4" + "@esbuild/sunos-x64" "0.19.4" + "@esbuild/win32-arm64" "0.19.4" + "@esbuild/win32-ia32" "0.19.4" + "@esbuild/win32-x64" "0.19.4" escalade@^3.1.1: version "3.1.1" @@ -3274,9 +3282,9 @@ fs-minipass@^3.0.0: minipass "^7.0.3" fs-monkey@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.4.tgz#ee8c1b53d3fe8bb7e5d2c5c5dfc0168afdd2f747" - integrity sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ== + version "1.0.5" + resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.5.tgz#fe450175f0db0d7ea758102e1d84096acb925788" + integrity sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew== fs.realpath@^1.0.0: version "1.0.0" @@ -3386,7 +3394,7 @@ glob-to-regexp@^0.4.1: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -glob@10.3.10: +glob@10.3.10, glob@^10.2.2: version "10.3.10" resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b" integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g== @@ -3409,17 +3417,6 @@ glob@7.2.0: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^10.2.2: - version "10.3.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.7.tgz#d5bd30a529c8c9b262fb4b217941f64ad90e25ac" - integrity sha512-wCMbE1m9Nx5yD9LYtgsVWq5VhHlk5WzJirw594qZR6AIvQYuHrdDtIktUVjQItalD53y7dqoedu9xP0u0WaxIQ== - dependencies: - foreground-child "^3.1.0" - jackspeak "^2.0.3" - minimatch "^9.0.1" - minipass "^5.0.0 || ^6.0.2 || ^7.0.0" - path-scurry "^1.10.1" - glob@^7.0.3, glob@^7.0.6, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" @@ -3767,7 +3764,7 @@ https-proxy-agent@5.0.1, https-proxy-agent@^5.0.0: agent-base "6" debug "4" -https-proxy-agent@^7.0.1: +https-proxy-agent@^7.0.2: version "7.0.2" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz#e2645b846b90e96c6e6f347fb5b2e41f1590b09b" integrity sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA== @@ -4159,19 +4156,10 @@ isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== -jackspeak@^2.0.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.3.tgz#95e4cbcc03b3eb357bf6bcce14a903fb3d1151e1" - integrity sha512-R2bUw+kVZFS/h1AZqBKrSgDmdmjApzgY0AlCPumopFiAlbUxE2gf+SCuBzQ0cP5hHmUmFYF5yw55T97Th5Kstg== - dependencies: - "@isaacs/cliui" "^8.0.2" - optionalDependencies: - "@pkgjs/parseargs" "^0.11.0" - jackspeak@^2.3.5: - version "2.3.5" - resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.5.tgz#443f237f9eeeb0d7c6ec34835ef5289bb4acb068" - integrity sha512-Ratx+B8WeXLAtRJn26hrhY8S1+Jz6pxPMrkrdkgb/NstTNiqMhX0/oFVu5wX+g5n6JlEu2LPsDJmY8nRP4+alw== + version "2.3.6" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8" + integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== dependencies: "@isaacs/cliui" "^8.0.2" optionalDependencies: @@ -4860,9 +4848,9 @@ minipass@^5.0.0: integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== "minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.3.tgz#05ea638da44e475037ed94d1c7efcc76a25e1974" - integrity sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg== + version "7.0.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" + integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== minizlib@^2.1.1, minizlib@^2.1.2: version "2.1.2" @@ -5464,7 +5452,7 @@ playwright-core@1.38.1: resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.38.1.tgz#75a3c470aa9576b7d7c4e274de3d79977448ba08" integrity sha512-tQqNFUKa3OfMf4b2jQ7aGLB8o9bS3bOY0yMEtldtC2+spf8QXG9zvXLTXUeRsoNuxEYMgLYR+NXfAa1rjKRcrg== -playwright@^1.37.1: +playwright@^1.38.1: version "1.38.1" resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.38.1.tgz#82ecd9bc4f4f64dbeee8a11c31793748e2528130" integrity sha512-oRMSJmZrOu1FP5iu3UrCx8JEFRIMxLDM0c/3o4bpzU5Tz97BypefWf7TuTNPWeCe279TPal5RtPPZ+9lW/Qkow== @@ -5745,9 +5733,9 @@ postcss-zindex@^6.0.0: integrity sha512-lNim6f01ClwALn0J50yyoR+qOu10GXub+xucEB7+x8VwXl+iNJSj/QgXg45XpSoLsWD5HIofVrG/pPrMFcdbig== postcss@^8.4.21, postcss@^8.4.24: - version "8.4.30" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.30.tgz#0e0648d551a606ef2192a26da4cabafcc09c1aa7" - integrity sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g== + version "8.4.31" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d" + integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== dependencies: nanoid "^3.3.6" picocolors "^1.0.0" @@ -6271,9 +6259,9 @@ sass@1.68.0, sass@^1.65.1: source-map-js ">=0.6.2 <2.0.0" sax@>=0.6.0, sax@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + version "1.3.0" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.3.0.tgz#a5dbe77db3be05c9d1ee7785dbd3ea9de51593d0" + integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA== scheduler@^0.13.4: version "0.13.6" From 0f83de4acf2d51ed4d694855cc28f78b947610c8 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon <67011668+axosoft-ramint@users.noreply.github.com> Date: Mon, 2 Oct 2023 09:10:37 -0700 Subject: [PATCH 0003/1012] Adds workspace deep link support (#2942) --- package.json | 17 +++- src/commands/base.ts | 9 ++ src/commands/copyDeepLink.ts | 15 +++ src/constants.ts | 1 + src/uris/deepLinks/deepLink.ts | 44 +++++++-- src/uris/deepLinks/deepLinkService.ts | 137 ++++++++++++++++---------- src/views/viewBase.ts | 28 +++++- src/views/workspacesView.ts | 40 +++++++- 8 files changed, 224 insertions(+), 67 deletions(-) diff --git a/package.json b/package.json index 05c7e50664b6c..330baea348e6c 100644 --- a/package.json +++ b/package.json @@ -5411,6 +5411,12 @@ "category": "GitLens", "icon": "$(copy)" }, + { + "command": "gitlens.copyDeepLinkToWorkspace", + "title": "Copy Link to Workspace", + "category": "GitLens", + "icon": "$(copy)" + }, { "command": "gitlens.copyDeepLinkToTag", "title": "Copy Link to Tag", @@ -8555,6 +8561,10 @@ "command": "gitlens.copyDeepLinkToTag", "when": "false" }, + { + "command": "gitlens.copyDeepLinkToWorkspace", + "when": "false" + }, { "command": "gitlens.copyRemoteBranchUrl", "when": "false" @@ -11777,7 +11787,7 @@ }, { "submenu": "gitlens/share", - "when": "viewItem =~ /gitlens:(branch|commit|compare:results(?!:)|remote|repo-folder|repository|stash|tag|file\\b(?=.*?\\b\\+committed\\b))\\b/", + "when": "viewItem =~ /gitlens:(branch|commit|compare:results(?!:)|remote|repo-folder|repository|stash|tag|workspace|file\\b(?=.*?\\b\\+committed\\b))\\b/", "group": "7_gitlens_a_share@1" }, { @@ -13203,6 +13213,11 @@ "when": "viewItem =~ /gitlens:compare:results(?!:)\\b/", "group": "1_gitlens@25" }, + { + "command": "gitlens.copyDeepLinkToWorkspace", + "when": "viewItem =~ /gitlens:workspace\\b/", + "group": "1_gitlens@25" + }, { "command": "gitlens.copyRemoteFileUrlWithoutRange", "when": "gitlens:hasRemotes && viewItem =~ /gitlens:(file\\b(?=.*?\\b\\+committed\\b)|history:(file|line)|status:file)\\b/", diff --git a/src/commands/base.ts b/src/commands/base.ts index 6d29bda2cda98..de0f1e7e5e421 100644 --- a/src/commands/base.ts +++ b/src/commands/base.ts @@ -21,6 +21,7 @@ import { GitRemote } from '../git/models/remote'; import { Repository } from '../git/models/repository'; import type { GitTag } from '../git/models/tag'; import { isTag } from '../git/models/tag'; +import { CloudWorkspace, LocalWorkspace } from '../plus/workspaces/models'; import { registerCommand } from '../system/command'; import { sequentialize } from '../system/function'; import { ViewNode, ViewRefFileNode, ViewRefNode } from '../views/nodes/viewNode'; @@ -212,6 +213,14 @@ export function isCommandContextViewNodeHasTag( return isTag((context.node as ViewNode & { tag: GitTag }).tag); } +export function isCommandContextViewNodeHasWorkspace( + context: CommandContext, +): context is CommandViewNodeContext & { node: ViewNode & { workspace: CloudWorkspace | LocalWorkspace } } { + if (context.type !== 'viewItem') return false; + const workspace = (context.node as ViewNode & { workspace?: CloudWorkspace | LocalWorkspace }).workspace; + return workspace instanceof CloudWorkspace || workspace instanceof LocalWorkspace; +} + export type CommandContext = | CommandEditorLineContext | CommandGitTimelineItemContext diff --git a/src/commands/copyDeepLink.ts b/src/commands/copyDeepLink.ts index fbf548caa9832..93cc1be74571f 100644 --- a/src/commands/copyDeepLink.ts +++ b/src/commands/copyDeepLink.ts @@ -20,6 +20,7 @@ import { isCommandContextViewNodeHasComparison, isCommandContextViewNodeHasRemote, isCommandContextViewNodeHasTag, + isCommandContextViewNodeHasWorkspace, } from './base'; export interface CopyDeepLinkCommandArgs { @@ -28,6 +29,7 @@ export interface CopyDeepLinkCommandArgs { compareWithRef?: StoredNamedRef; remote?: string; prePickRemote?: boolean; + workspaceId?: string; } @command() @@ -39,6 +41,7 @@ export class CopyDeepLinkCommand extends ActiveEditorCommand { Commands.CopyDeepLinkToRepo, Commands.CopyDeepLinkToTag, Commands.CopyDeepLinkToComparison, + Commands.CopyDeepLinkToWorkspace, ]); } @@ -58,6 +61,8 @@ export class CopyDeepLinkCommand extends ActiveEditorCommand { compareRef: context.node.compareRef, compareWithRef: context.node.compareWithRef, }; + } else if (isCommandContextViewNodeHasWorkspace(context)) { + args = { workspaceId: context.node.workspace.id }; } } @@ -67,6 +72,16 @@ export class CopyDeepLinkCommand extends ActiveEditorCommand { async execute(editor?: TextEditor, uri?: Uri, args?: CopyDeepLinkCommandArgs) { args = { ...args }; + if (args.workspaceId != null) { + try { + await this.container.deepLinks.copyDeepLinkUrl(args.workspaceId); + } catch (ex) { + Logger.error(ex, 'CopyDeepLinkCommand'); + void showGenericErrorMessage('Unable to copy link'); + } + return; + } + let type; let repoPath; if (args?.refOrRepoPath == null) { diff --git a/src/constants.ts b/src/constants.ts index cd64b2c6e7429..818be5ef60522 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -126,6 +126,7 @@ export const enum Commands { CopyDeepLinkToComparison = 'gitlens.copyDeepLinkToComparison', CopyDeepLinkToRepo = 'gitlens.copyDeepLinkToRepo', CopyDeepLinkToTag = 'gitlens.copyDeepLinkToTag', + CopyDeepLinkToWorkspace = 'gitlens.copyDeepLinkToWorkspace', CopyMessageToClipboard = 'gitlens.copyMessageToClipboard', CopyRemoteBranchesUrl = 'gitlens.copyRemoteBranchesUrl', CopyRemoteBranchUrl = 'gitlens.copyRemoteBranchUrl', diff --git a/src/uris/deepLinks/deepLink.ts b/src/uris/deepLinks/deepLink.ts index eac1e8ee3ae20..4b7910dbfe541 100644 --- a/src/uris/deepLinks/deepLink.ts +++ b/src/uris/deepLinks/deepLink.ts @@ -11,6 +11,7 @@ export enum DeepLinkType { Comparison = 'compare', Repository = 'r', Tag = 't', + Workspace = 'workspace', } export function deepLinkTypeToString(type: DeepLinkType): string { @@ -25,6 +26,8 @@ export function deepLinkTypeToString(type: DeepLinkType): string { return 'Repository'; case DeepLinkType.Tag: return 'Tag'; + case DeepLinkType.Workspace: + return 'Workspace'; default: debugger; return 'Unknown'; @@ -46,7 +49,7 @@ export function refTypeToDeepLinkType(refType: GitReference['refType']): DeepLin export interface DeepLink { type: DeepLinkType; - repoId: string; + mainId: string; remoteUrl?: string; repoPath?: string; targetId?: string; @@ -58,8 +61,10 @@ export function parseDeepLinkUri(uri: Uri): DeepLink | undefined { // The link target id is everything after the link target. // For example, if the uri is /link/r/{repoId}/b/{branchName}?url={remoteUrl}, // the link target id is {branchName} - const [, type, prefix, repoId, target, ...rest] = uri.path.split('/'); - if (type !== 'link' || prefix !== DeepLinkType.Repository) return undefined; + const [, type, prefix, mainId, target, ...rest] = uri.path.split('/'); + if (type !== 'link' || (prefix !== DeepLinkType.Repository && prefix !== DeepLinkType.Workspace)) { + return undefined; + } const urlParams = new URLSearchParams(uri.query); let remoteUrl = urlParams.get('url') ?? undefined; @@ -70,12 +75,18 @@ export function parseDeepLinkUri(uri: Uri): DeepLink | undefined { if (repoPath != null) { repoPath = decodeURIComponent(repoPath); } - if (!remoteUrl && !repoPath) return undefined; + if (!remoteUrl && !repoPath && prefix !== DeepLinkType.Workspace) return undefined; + if (prefix === DeepLinkType.Workspace) { + return { + type: DeepLinkType.Workspace, + mainId: mainId, + }; + } if (target == null) { return { type: DeepLinkType.Repository, - repoId: repoId, + mainId: mainId, remoteUrl: remoteUrl, repoPath: repoPath, }; @@ -103,7 +114,7 @@ export function parseDeepLinkUri(uri: Uri): DeepLink | undefined { return { type: target as DeepLinkType, - repoId: repoId, + mainId: mainId, remoteUrl: remoteUrl, repoPath: repoPath, targetId: targetId, @@ -114,6 +125,7 @@ export function parseDeepLinkUri(uri: Uri): DeepLink | undefined { export const enum DeepLinkServiceState { Idle, + TypeMatch, RepoMatch, CloneOrAddRepo, OpeningRepo, @@ -125,6 +137,7 @@ export const enum DeepLinkServiceState { FetchedTargetMatch, OpenGraph, OpenComparison, + OpenWorkspace, } export const enum DeepLinkServiceAction { @@ -133,6 +146,8 @@ export const enum DeepLinkServiceAction { DeepLinkResolved, DeepLinkStored, DeepLinkErrored, + LinkIsRepoType, + LinkIsWorkspaceType, OpenRepo, RepoMatched, RepoMatchedInLocalMapping, @@ -154,7 +169,7 @@ export type DeepLinkRepoOpenType = 'clone' | 'folder' | 'workspace' | 'current'; export interface DeepLinkServiceContext { state: DeepLinkServiceState; url?: string | undefined; - repoId?: string | undefined; + mainId?: string | undefined; repo?: Repository | undefined; remoteUrl?: string | undefined; remote?: GitRemote | undefined; @@ -170,7 +185,14 @@ export interface DeepLinkServiceContext { export const deepLinkStateTransitionTable: Record> = { [DeepLinkServiceState.Idle]: { - [DeepLinkServiceAction.DeepLinkEventFired]: DeepLinkServiceState.RepoMatch, + [DeepLinkServiceAction.DeepLinkEventFired]: DeepLinkServiceState.TypeMatch, + [DeepLinkServiceAction.DeepLinkCancelled]: DeepLinkServiceState.Idle, + }, + [DeepLinkServiceState.TypeMatch]: { + [DeepLinkServiceAction.DeepLinkErrored]: DeepLinkServiceState.Idle, + [DeepLinkServiceAction.DeepLinkCancelled]: DeepLinkServiceState.Idle, + [DeepLinkServiceAction.LinkIsRepoType]: DeepLinkServiceState.RepoMatch, + [DeepLinkServiceAction.LinkIsWorkspaceType]: DeepLinkServiceState.OpenWorkspace, }, [DeepLinkServiceState.RepoMatch]: { [DeepLinkServiceAction.DeepLinkErrored]: DeepLinkServiceState.Idle, @@ -229,6 +251,10 @@ export const deepLinkStateTransitionTable: Record = { [DeepLinkServiceState.Idle]: { message: 'Done.', increment: 100 }, + [DeepLinkServiceState.TypeMatch]: { message: 'Matching link type...', increment: 5 }, [DeepLinkServiceState.RepoMatch]: { message: 'Finding a matching repository...', increment: 10 }, [DeepLinkServiceState.CloneOrAddRepo]: { message: 'Adding repository...', increment: 20 }, [DeepLinkServiceState.OpeningRepo]: { message: 'Opening repository...', increment: 30 }, @@ -249,4 +276,5 @@ export const deepLinkStateToProgress: Record = { [DeepLinkServiceState.FetchedTargetMatch]: { message: 'Finding a matching target...', increment: 90 }, [DeepLinkServiceState.OpenGraph]: { message: 'Opening graph...', increment: 95 }, [DeepLinkServiceState.OpenComparison]: { message: 'Opening comparison...', increment: 95 }, + [DeepLinkServiceState.OpenWorkspace]: { message: 'Opening workspace...', increment: 95 }, }; diff --git a/src/uris/deepLinks/deepLinkService.ts b/src/uris/deepLinks/deepLinkService.ts index 22b4481780d45..3a9cfd27155bb 100644 --- a/src/uris/deepLinks/deepLinkService.ts +++ b/src/uris/deepLinks/deepLinkService.ts @@ -21,6 +21,7 @@ import { deepLinkStateToProgress, deepLinkStateTransitionTable, DeepLinkType, + deepLinkTypeToString, parseDeepLinkUri, } from './deepLink'; @@ -46,7 +47,7 @@ export class DeepLinkService implements Disposable { await this.container.git.isDiscoveringRepositories; } - if (!link.type || (!link.repoId && !link.remoteUrl && !link.repoPath)) { + if (!link.type || (!link.mainId && !link.remoteUrl && !link.repoPath)) { void window.showErrorMessage('Unable to resolve link'); Logger.warn(`Unable to resolve link - missing basic properties: ${uri.toString()}`); return; @@ -58,9 +59,9 @@ export class DeepLinkService implements Disposable { return; } - if (link.type !== DeepLinkType.Repository && link.targetId == null) { + if (link.type !== DeepLinkType.Repository && link.targetId == null && link.mainId == null) { void window.showErrorMessage('Unable to resolve link'); - Logger.warn(`Unable to resolve link - no target id provided: ${uri.toString()}`); + Logger.warn(`Unable to resolve link - no main/target id provided: ${uri.toString()}`); return; } @@ -92,7 +93,7 @@ export class DeepLinkService implements Disposable { this._context = { state: DeepLinkServiceState.Idle, url: undefined, - repoId: undefined, + mainId: undefined, repo: undefined, remoteUrl: undefined, remote: undefined, @@ -109,7 +110,7 @@ export class DeepLinkService implements Disposable { private setContextFromDeepLink(link: DeepLink, url: string) { this._context = { ...this._context, - repoId: link.repoId, + mainId: link.mainId, targetType: link.type, url: url, remoteUrl: link.remoteUrl, @@ -359,9 +360,13 @@ export class DeepLinkService implements Disposable { ): Promise { let message = ''; let action = initialAction; + if (action === DeepLinkServiceAction.DeepLinkCancelled && this._context.state === DeepLinkServiceState.Idle) { + return; + } //Repo match let matchingLocalRepoPaths: string[] = []; + const { targetType } = this._context; queueMicrotask( () => @@ -369,7 +374,7 @@ export class DeepLinkService implements Disposable { { cancellable: true, location: ProgressLocation.Notification, - title: `Opening repository for link: ${this._context.url}}`, + title: `Opening ${deepLinkTypeToString(targetType ?? DeepLinkType.Repository)} link...`, }, (progress, token) => { progress.report({ increment: 0 }); @@ -379,14 +384,12 @@ export class DeepLinkService implements Disposable { resolve(); }); - this._disposables.push( - this._onDeepLinkProgressUpdated.event(({ message, increment }) => { - progress.report({ message: message, increment: increment }); - if (increment === 100) { - resolve(); - } - }), - ); + this._onDeepLinkProgressUpdated.event(({ message, increment }) => { + progress.report({ message: message, increment: increment }); + if (increment === 100) { + resolve(); + } + }); }); }, ), @@ -396,7 +399,7 @@ export class DeepLinkService implements Disposable { this._context.state = deepLinkStateTransitionTable[this._context.state][action]; const { state, - repoId, + mainId, repo, url, remoteUrl, @@ -422,9 +425,18 @@ export class DeepLinkService implements Disposable { this.resetContext(); return; } + case DeepLinkServiceState.TypeMatch: { + if (targetType === DeepLinkType.Workspace) { + action = DeepLinkServiceAction.LinkIsWorkspaceType; + } else { + action = DeepLinkServiceAction.LinkIsRepoType; + } + + break; + } case DeepLinkServiceState.RepoMatch: case DeepLinkServiceState.AddedRepoMatch: { - if (!repoId && !remoteUrl && !repoPath) { + if (!mainId && !remoteUrl && !repoPath) { action = DeepLinkServiceAction.DeepLinkErrored; message = 'No repository id, remote url or path was provided.'; break; @@ -459,10 +471,10 @@ export class DeepLinkService implements Disposable { } } - if (repoId != null && repoId !== '-') { + if (mainId != null && mainId !== '-') { // Repo ID can be any valid SHA in the repo, though standard practice is to use the // first commit SHA. - if (await this.container.git.validateReference(repo.path, repoId)) { + if (await this.container.git.validateReference(repo.path, mainId)) { this._context.repo = repo; action = DeepLinkServiceAction.RepoMatched; break; @@ -506,7 +518,7 @@ export class DeepLinkService implements Disposable { break; } case DeepLinkServiceState.CloneOrAddRepo: { - if (!repoId && !remoteUrl && !repoPath) { + if (!mainId && !remoteUrl && !repoPath) { action = DeepLinkServiceAction.DeepLinkErrored; message = 'Missing repository id, remote url and path.'; break; @@ -872,6 +884,22 @@ export class DeepLinkService implements Disposable { action = DeepLinkServiceAction.DeepLinkResolved; break; } + case DeepLinkServiceState.OpenWorkspace: { + if (!mainId) { + action = DeepLinkServiceAction.DeepLinkErrored; + message = 'Missing workspace id.'; + break; + } + + await this.container.workspacesView.revealWorkspaceNode(mainId, { + select: true, + focus: true, + expand: true, + }); + + action = DeepLinkServiceAction.DeepLinkResolved; + break; + } default: { action = DeepLinkServiceAction.DeepLinkErrored; message = 'Unknown state.'; @@ -881,6 +909,7 @@ export class DeepLinkService implements Disposable { } } + async copyDeepLinkUrl(workspaceId: string): Promise; async copyDeepLinkUrl(ref: GitReference, remoteUrl: string): Promise; async copyDeepLinkUrl( repoPath: string, @@ -889,17 +918,20 @@ export class DeepLinkService implements Disposable { compareWithRef?: StoredNamedRef, ): Promise; async copyDeepLinkUrl( - refOrRepoPath: string | GitReference, - remoteUrl: string, + refOrIdOrRepoPath: string | GitReference, + remoteUrl?: string, compareRef?: StoredNamedRef, compareWithRef?: StoredNamedRef, ): Promise { - const url = await (typeof refOrRepoPath === 'string' - ? this.generateDeepLinkUrl(refOrRepoPath, remoteUrl, compareRef, compareWithRef) - : this.generateDeepLinkUrl(refOrRepoPath, remoteUrl)); + const url = await (typeof refOrIdOrRepoPath === 'string' + ? remoteUrl != null + ? this.generateDeepLinkUrl(refOrIdOrRepoPath, remoteUrl, compareRef, compareWithRef) + : this.generateDeepLinkUrl(refOrIdOrRepoPath) + : this.generateDeepLinkUrl(refOrIdOrRepoPath, remoteUrl!)); await env.clipboard.writeText(url.toString()); } + async generateDeepLinkUrl(workspaceId: string): Promise; async generateDeepLinkUrl(ref: GitReference, remoteUrl: string): Promise; async generateDeepLinkUrl( repoPath: string, @@ -908,37 +940,50 @@ export class DeepLinkService implements Disposable { compareWithRef?: StoredNamedRef, ): Promise; async generateDeepLinkUrl( - refOrRepoPath: string | GitReference, - remoteUrl: string, + refOrIdOrRepoPath: string | GitReference, + remoteUrl?: string, compareRef?: StoredNamedRef, compareWithRef?: StoredNamedRef, ): Promise { - const repoPath = typeof refOrRepoPath !== 'string' ? refOrRepoPath.repoPath : refOrRepoPath; - let repoId; + let repoId: string | undefined; + let targetType: DeepLinkType | undefined; + let targetId: string | undefined; + let compareWithTargetId: string | undefined; + const schemeOverride = configuration.get('deepLinks.schemeOverride'); + const scheme = !schemeOverride ? 'vscode' : schemeOverride === true ? env.uriScheme : schemeOverride; + let modePrefixString = ''; + if (this.container.env === 'dev') { + modePrefixString = 'dev.'; + } else if (this.container.env === 'staging') { + modePrefixString = 'staging.'; + } + + if (remoteUrl == null && typeof refOrIdOrRepoPath === 'string') { + return new URL(`https://${modePrefixString}gitkraken.dev/link/workspaces/${refOrIdOrRepoPath}`); + } + + const repoPath = typeof refOrIdOrRepoPath !== 'string' ? refOrIdOrRepoPath.repoPath : refOrIdOrRepoPath; try { repoId = await this.container.git.getUniqueRepositoryId(repoPath); } catch { repoId = '-'; } - let targetType: DeepLinkType | undefined; - let targetId: string | undefined; - let compareWithTargetId: string | undefined; - if (typeof refOrRepoPath !== 'string') { - switch (refOrRepoPath.refType) { + if (typeof refOrIdOrRepoPath !== 'string') { + switch (refOrIdOrRepoPath.refType) { case 'branch': targetType = DeepLinkType.Branch; - targetId = refOrRepoPath.remote - ? getBranchNameWithoutRemote(refOrRepoPath.name) - : refOrRepoPath.name; + targetId = refOrIdOrRepoPath.remote + ? getBranchNameWithoutRemote(refOrIdOrRepoPath.name) + : refOrIdOrRepoPath.name; break; case 'revision': targetType = DeepLinkType.Commit; - targetId = refOrRepoPath.ref; + targetId = refOrIdOrRepoPath.ref; break; case 'tag': targetType = DeepLinkType.Tag; - targetId = refOrRepoPath.name; + targetId = refOrIdOrRepoPath.name; break; } } @@ -949,9 +994,6 @@ export class DeepLinkService implements Disposable { compareWithTargetId = compareWithRef.label ?? compareWithRef.ref; } - const schemeOverride = configuration.get('deepLinks.schemeOverride'); - - const scheme = !schemeOverride ? 'vscode' : schemeOverride === true ? env.uriScheme : schemeOverride; let target; if (targetType === DeepLinkType.Comparison) { target = `/${targetType}/${compareWithTargetId}...${targetId}`; @@ -968,16 +1010,9 @@ export class DeepLinkService implements Disposable { }/${repoId}${target}`, ); - // Add the remote URL as a query parameter - deepLink.searchParams.set('url', remoteUrl); - const params = new URLSearchParams(); - params.set('url', remoteUrl); - - let modePrefixString = ''; - if (this.container.env === 'dev') { - modePrefixString = 'dev.'; - } else if (this.container.env === 'staging') { - modePrefixString = 'staging.'; + if (remoteUrl != null) { + // Add the remote URL as a query parameter + deepLink.searchParams.set('url', remoteUrl); } const deepLinkRedirectUrl = new URL( diff --git a/src/views/viewBase.ts b/src/views/viewBase.ts index 696c94d1f24ce..68bf794a497b1 100644 --- a/src/views/viewBase.ts +++ b/src/views/viewBase.ts @@ -115,6 +115,9 @@ export abstract class ViewBase< return `gitlens.views.${this.type}`; } + protected _onDidInitialize = new EventEmitter(); + private initialized = false; + protected _onDidChangeTreeData = new EventEmitter(); get onDidChangeTreeData(): Event { return this._onDidChangeTreeData.event; @@ -348,7 +351,22 @@ export abstract class ViewBase< if (node != null) return node.getChildren(); const root = this.ensureRoot(); - return root.getChildren(); + const children = root.getChildren(); + if (!this.initialized) { + if (isPromise(children)) { + void children.then(() => { + if (!this.initialized) { + this.initialized = true; + setTimeout(() => this._onDidInitialize.fire(), 1); + } + }); + } else { + this.initialized = true; + setTimeout(() => this._onDidInitialize.fire(), 1); + } + } + + return children; } getParent(node: ViewNode): ViewNode | undefined { @@ -455,12 +473,14 @@ export abstract class ViewBase< } } - if (this.root != null) return find.call(this); + if (this.initialized) return find.call(this); // If we have no root (e.g. never been initialized) force it so the tree will load properly - await this.show({ preserveFocus: true }); + void this.show({ preserveFocus: true }); // Since we have to show the view, give the view time to load and let the callstack unwind before we try to find the node - return new Promise(resolve => setTimeout(() => resolve(find.call(this)), 100)); + return new Promise(resolve => + once(this._onDidInitialize.event)(() => resolve(find.call(this)), this), + ); } private async findNodeCoreBFS( diff --git a/src/views/workspacesView.ts b/src/views/workspacesView.ts index 634736a5ed710..1cbe086fcab2e 100644 --- a/src/views/workspacesView.ts +++ b/src/views/workspacesView.ts @@ -1,4 +1,4 @@ -import type { Disposable } from 'vscode'; +import type { CancellationToken, Disposable } from 'vscode'; import { env, ProgressLocation, Uri, window } from 'vscode'; import type { RepositoriesViewConfig } from '../config'; import { Commands } from '../constants'; @@ -45,8 +45,42 @@ export class WorkspacesView extends ViewBase<'workspaces', WorkspacesViewNode, R return super.show(options); } - override get canReveal(): boolean { - return false; + async findWorkspaceNode(workspaceId: string, token?: CancellationToken) { + return this.findNode((n: any) => n.workspace?.id === workspaceId, { + allowPaging: false, + maxDepth: 2, + canTraverse: n => { + if (n instanceof WorkspacesViewNode) return true; + + return false; + }, + token: token, + }); + } + + async revealWorkspaceNode( + workspaceId: string, + options?: { + select?: boolean; + focus?: boolean; + expand?: boolean | number; + }, + ) { + return window.withProgress( + { + location: ProgressLocation.Notification, + title: `Revealing workspace ${workspaceId} in the side bar...`, + cancellable: true, + }, + async (progress, token) => { + const node = await this.findWorkspaceNode(workspaceId, token); + if (node == null) return undefined; + + await this.ensureRevealNode(node, options); + + return node; + }, + ); } protected registerCommands(): Disposable[] { From 6181285a97346a1430a91649b09631d613dcda46 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 5 Sep 2023 14:53:57 -0400 Subject: [PATCH 0004/1012] Adds a focus service (wip) --- src/container.ts | 10 ++++ src/plus/focus/focusService.ts | 90 ++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 src/plus/focus/focusService.ts diff --git a/src/container.ts b/src/container.ts index 58dda4ab72ae2..ff8014a711d2f 100644 --- a/src/container.ts +++ b/src/container.ts @@ -21,6 +21,7 @@ import { GitLabAuthenticationProvider } from './git/remotes/gitlab'; import { RichRemoteProviderService } from './git/remotes/remoteProviderService'; import { LineHoverController } from './hovers/lineHoverController'; import type { RepositoryPathMappingProvider } from './pathMapping/repositoryPathMappingProvider'; +import { FocusService } from './plus/focus/focusService'; import { AccountAuthenticationProvider } from './plus/gk/authenticationProvider'; import { ServerConnection } from './plus/gk/serverConnection'; import { IntegrationAuthenticationService } from './plus/integrationAuthentication'; @@ -436,6 +437,15 @@ export class Container { return this._deepLinks; } + private _focus: FocusService | undefined; + get focus() { + if (this._focus == null) { + this._disposables.push((this._focus = new FocusService(this, new ServerConnection(this)))); + } + + return this._focus; + } + private _github: Promise | undefined; get github() { if (this._github == null) { diff --git a/src/plus/focus/focusService.ts b/src/plus/focus/focusService.ts new file mode 100644 index 0000000000000..454199a064767 --- /dev/null +++ b/src/plus/focus/focusService.ts @@ -0,0 +1,90 @@ +import type { Disposable } from 'vscode'; +import { Uri } from 'vscode'; +import type { Container } from '../../container'; +import type { ServerConnection } from '../gk/serverConnection'; + +export interface FocusItem { + provider: string; + type: 'issue' | 'pr'; + id: string; + repositoryId: string; + repositoryName: string; + repositoryOwner: string; +} + +export interface EnrichedItem { + id: string; + userId: string; + type: 'pinned' | 'snoozed'; + + provider: string; + entityType: 'issue' | 'pr'; + entityId: string; + repositoryId: string; + repositoryName: string; + repositoryOwner: string; + + createdAt: number; + updatedAt: number; +} + +export class FocusService implements Disposable { + constructor( + private readonly container: Container, + private readonly connection: ServerConnection, + ) {} + + dispose(): void {} + + async pinItem(item: FocusItem): Promise { + type Result = { data: EnrichedItem }; + + const rsp = await this.connection.fetch( + Uri.joinPath(this.connection.baseGkApiUri, 'v1/enrich-items/pin').toString(), + { + method: 'POST', + body: JSON.stringify(item), + }, + ); + const result = (await rsp.json()) as Result; + return result.data; + } + + async snoozeItem(item: FocusItem): Promise { + type Result = { data: EnrichedItem }; + + const rsp = await this.connection.fetch( + Uri.joinPath(this.connection.baseGkApiUri, 'v1/enrich-items/snooze').toString(), + { + method: 'POST', + body: JSON.stringify(item), + }, + ); + const result = (await rsp.json()) as Result; + return result.data; + } + + async getPins(): Promise { + const data = await this.getAll(); + return data.filter(i => i.type === 'pinned'); + } + + async getSnoozed(): Promise { + const data = await this.getAll(); + return data.filter(i => i.type === 'snoozed'); + } + + async getAll(): Promise { + type Result = { data: EnrichedItem[] }; + + const rsp = await this.connection.fetch( + Uri.joinPath(this.connection.baseGkApiUri, 'v1/enrich-items').toString(), + { + method: 'GET', + }, + ); + + const result = (await rsp.json()) as Result; + return result.data.map(i => i); + } +} From 1019f861e374b491a20ae97e9f0de8170eaeb508 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 5 Sep 2023 15:23:00 -0400 Subject: [PATCH 0005/1012] Adds unpin/unsnooze & delete --- src/plus/focus/focusService.ts | 120 +++++++++++++++++++++++---------- 1 file changed, 86 insertions(+), 34 deletions(-) diff --git a/src/plus/focus/focusService.ts b/src/plus/focus/focusService.ts index 454199a064767..32178f598012f 100644 --- a/src/plus/focus/focusService.ts +++ b/src/plus/focus/focusService.ts @@ -4,29 +4,62 @@ import type { Container } from '../../container'; import type { ServerConnection } from '../gk/serverConnection'; export interface FocusItem { - provider: string; - type: 'issue' | 'pr'; + provider: EnrichedItemResponse['provider']; + type: EnrichedItemResponse['entityType']; id: string; - repositoryId: string; repositoryName: string; repositoryOwner: string; } -export interface EnrichedItem { +export type EnrichedItem = { id: string; userId: string; - type: 'pinned' | 'snoozed'; + type: EnrichedItemResponse['type']; - provider: string; + provider: EnrichedItemResponse['provider']; + entityType: EnrichedItemResponse['entityType']; + entityId: string; + + createdAt: number; + updatedAt: number; +} & ( + | { repositoryId: string } + | { + repositoryName: string; + repositoryOwner: string; + } +); + +type EnrichedItemRequest = { + provider: EnrichedItemResponse['provider']; + type: EnrichedItemResponse['entityType']; + id: string; +} & ( + | { repositoryId: string } + | { + repositoryName: string; + repositoryOwner: string; + } +); + +type EnrichedItemResponse = { + id: string; + userId: string; + type: 'pin' | 'snooze'; + + provider: 'azure' | 'bitbucket' | 'github' | 'gitlab' | 'gitkraken'; entityType: 'issue' | 'pr'; entityId: string; - repositoryId: string; - repositoryName: string; - repositoryOwner: string; createdAt: number; updatedAt: number; -} +} & ( + | { repositoryId: string } + | { + repositoryName: string; + repositoryOwner: string; + } +); export class FocusService implements Disposable { constructor( @@ -36,55 +69,74 @@ export class FocusService implements Disposable { dispose(): void {} - async pinItem(item: FocusItem): Promise { - type Result = { data: EnrichedItem }; + private async delete(id: string): Promise { + const rsp = await this.connection.fetch( + Uri.joinPath(this.connection.baseGkApiUri, `v1/enrich-items/${id}`).toString(), + { + method: 'DELETE', + }, + ); + if (!rsp.ok) { + debugger; + throw new Error(`Unable to delete enrichment: ${rsp.statusText}`); + } + } + + async get(type?: EnrichedItemResponse['type']): Promise { + type Result = { data: EnrichedItemResponse[] }; const rsp = await this.connection.fetch( - Uri.joinPath(this.connection.baseGkApiUri, 'v1/enrich-items/pin').toString(), + Uri.joinPath(this.connection.baseGkApiUri, 'v1/enrich-items').toString(), { - method: 'POST', - body: JSON.stringify(item), + method: 'GET', }, ); + const result = (await rsp.json()) as Result; - return result.data; + return type == null ? result.data : result.data.filter(i => i.type === type); } - async snoozeItem(item: FocusItem): Promise { - type Result = { data: EnrichedItem }; + getPins(): Promise { + return this.get('pin'); + } + + getSnoozed(): Promise { + return this.get('snooze'); + } + + async pinItem(item: FocusItem): Promise { + type Result = { data: EnrichedItemResponse }; const rsp = await this.connection.fetch( - Uri.joinPath(this.connection.baseGkApiUri, 'v1/enrich-items/snooze').toString(), + Uri.joinPath(this.connection.baseGkApiUri, 'v1/enrich-items/pin').toString(), { method: 'POST', - body: JSON.stringify(item), + body: JSON.stringify(item satisfies EnrichedItemRequest), }, ); const result = (await rsp.json()) as Result; return result.data; } - async getPins(): Promise { - const data = await this.getAll(); - return data.filter(i => i.type === 'pinned'); + unpinItem(id: string): Promise { + return this.delete(id); } - async getSnoozed(): Promise { - const data = await this.getAll(); - return data.filter(i => i.type === 'snoozed'); - } - - async getAll(): Promise { - type Result = { data: EnrichedItem[] }; + async snoozeItem(item: FocusItem): Promise { + type Result = { data: EnrichedItemResponse }; const rsp = await this.connection.fetch( - Uri.joinPath(this.connection.baseGkApiUri, 'v1/enrich-items').toString(), + Uri.joinPath(this.connection.baseGkApiUri, 'v1/enrich-items/snooze').toString(), { - method: 'GET', + method: 'POST', + body: JSON.stringify(item satisfies EnrichedItemRequest), }, ); - const result = (await rsp.json()) as Result; - return result.data.map(i => i); + return result.data; + } + + unsnoozeItem(id: string): Promise { + return this.delete(id); } } From c39e7e7c38ed126e706fbb6e073eb10913a5e57b Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Thu, 7 Sep 2023 19:12:58 -0400 Subject: [PATCH 0006/1012] Adds basic error handling --- src/plus/focus/focusService.ts | 111 ++++++++++++++++++++++----------- 1 file changed, 74 insertions(+), 37 deletions(-) diff --git a/src/plus/focus/focusService.ts b/src/plus/focus/focusService.ts index 32178f598012f..9d987b7e5d8f5 100644 --- a/src/plus/focus/focusService.ts +++ b/src/plus/focus/focusService.ts @@ -1,6 +1,8 @@ import type { Disposable } from 'vscode'; -import { Uri } from 'vscode'; import type { Container } from '../../container'; +import { log } from '../../system/decorators/log'; +import { Logger } from '../../system/logger'; +import { getLogScope } from '../../system/logger.scope'; import type { ServerConnection } from '../gk/serverConnection'; export interface FocusItem { @@ -69,74 +71,109 @@ export class FocusService implements Disposable { dispose(): void {} - private async delete(id: string): Promise { - const rsp = await this.connection.fetch( - Uri.joinPath(this.connection.baseGkApiUri, `v1/enrich-items/${id}`).toString(), - { - method: 'DELETE', - }, - ); - if (!rsp.ok) { + private async delete(id: string, context: 'unpin' | 'unsnooze'): Promise { + const scope = getLogScope(); + + try { + const rsp = await this.connection.fetchGkDevApi(`v1/enrich-items/${id}`, { method: 'DELETE' }); + + if (!rsp.ok) throw new Error(`Unable to ${context} item '${id}': (${rsp.status}) ${rsp.statusText}`); + } catch (ex) { + Logger.error(ex, scope); debugger; - throw new Error(`Unable to delete enrichment: ${rsp.statusText}`); + throw ex; } } + @log() async get(type?: EnrichedItemResponse['type']): Promise { - type Result = { data: EnrichedItemResponse[] }; + const scope = getLogScope(); + + try { + type Result = { data: EnrichedItemResponse[] }; - const rsp = await this.connection.fetch( - Uri.joinPath(this.connection.baseGkApiUri, 'v1/enrich-items').toString(), - { - method: 'GET', - }, - ); + const rsp = await this.connection.fetchGkDevApi('v1/enrich-items', { method: 'GET' }); - const result = (await rsp.json()) as Result; - return type == null ? result.data : result.data.filter(i => i.type === type); + const result = (await rsp.json()) as Result; + return type == null ? result.data : result.data.filter(i => i.type === type); + } catch (ex) { + Logger.error(ex, scope); + debugger; + throw ex; + } } + @log() getPins(): Promise { return this.get('pin'); } + @log() getSnoozed(): Promise { return this.get('snooze'); } + @log() async pinItem(item: FocusItem): Promise { - type Result = { data: EnrichedItemResponse }; + const scope = getLogScope(); + + try { + type Result = { data: EnrichedItemResponse }; - const rsp = await this.connection.fetch( - Uri.joinPath(this.connection.baseGkApiUri, 'v1/enrich-items/pin').toString(), - { + const rsp = await this.connection.fetchGkDevApi('v1/enrich-items/pin', { method: 'POST', body: JSON.stringify(item satisfies EnrichedItemRequest), - }, - ); - const result = (await rsp.json()) as Result; - return result.data; + }); + + if (!rsp.ok) { + throw new Error( + `Unable to pin item '${item.provider}|${item.repositoryOwner}/${item.repositoryName}#${item.id}': (${rsp.status}) ${rsp.statusText}`, + ); + } + + const result = (await rsp.json()) as Result; + return result.data; + } catch (ex) { + Logger.error(ex, scope); + debugger; + throw ex; + } } + @log() unpinItem(id: string): Promise { - return this.delete(id); + return this.delete(id, 'unpin'); } + @log() async snoozeItem(item: FocusItem): Promise { - type Result = { data: EnrichedItemResponse }; + const scope = getLogScope(); + + try { + type Result = { data: EnrichedItemResponse }; - const rsp = await this.connection.fetch( - Uri.joinPath(this.connection.baseGkApiUri, 'v1/enrich-items/snooze').toString(), - { + const rsp = await this.connection.fetchGkDevApi('v1/enrich-items/snooze', { method: 'POST', body: JSON.stringify(item satisfies EnrichedItemRequest), - }, - ); - const result = (await rsp.json()) as Result; - return result.data; + }); + + if (!rsp.ok) { + throw new Error( + `Unable to snooze item '${item.provider}|${item.repositoryOwner}/${item.repositoryName}#${item.id}': (${rsp.status}) ${rsp.statusText}`, + ); + } + + const result = (await rsp.json()) as Result; + return result.data; + } catch (ex) { + Logger.error(ex, scope); + debugger; + throw ex; + } } + @log() unsnoozeItem(id: string): Promise { - return this.delete(id); + return this.delete(id, 'unsnooze'); } } From 1ba08fa38f5ba4da343965ce45cf98fa7d05737f Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sun, 1 Oct 2023 00:52:15 -0400 Subject: [PATCH 0007/1012] Adds pin and snooze UI --- package.json | 2 +- src/plus/focus/focusService.ts | 79 ++++-- src/plus/webviews/focus/focusWebview.ts | 262 +++++++++++++++--- src/plus/webviews/focus/protocol.ts | 31 +++ .../apps/plus/focus/components/focus-app.ts | 82 +++++- .../plus/focus/components/gk-issue-row.ts | 60 ++++ .../focus/components/gk-pull-request-row.ts | 62 ++++- src/webviews/apps/plus/focus/focus.ts | 45 +++ yarn.lock | 2 +- 9 files changed, 554 insertions(+), 71 deletions(-) diff --git a/package.json b/package.json index 330baea348e6c..1cbf1d0329410 100644 --- a/package.json +++ b/package.json @@ -14816,7 +14816,7 @@ }, "dependencies": { "@gitkraken/gitkraken-components": "10.1.25", - "@gitkraken/shared-web-components": "^0.1.1-rc.6", + "@gitkraken/shared-web-components": "^0.1.1-rc.9", "@microsoft/fast-element": "1.12.0", "@microsoft/fast-react-wrapper": "0.3.19", "@octokit/graphql": "7.0.2", diff --git a/src/plus/focus/focusService.ts b/src/plus/focus/focusService.ts index 9d987b7e5d8f5..8ea0725bfe94d 100644 --- a/src/plus/focus/focusService.ts +++ b/src/plus/focus/focusService.ts @@ -1,21 +1,21 @@ import type { Disposable } from 'vscode'; import type { Container } from '../../container'; +import type { GitRemote } from '../../git/models/remote'; +import type { RichRemoteProvider } from '../../git/remotes/richRemoteProvider'; import { log } from '../../system/decorators/log'; import { Logger } from '../../system/logger'; import { getLogScope } from '../../system/logger.scope'; import type { ServerConnection } from '../gk/serverConnection'; export interface FocusItem { - provider: EnrichedItemResponse['provider']; type: EnrichedItemResponse['entityType']; id: string; - repositoryName: string; - repositoryOwner: string; + remote?: GitRemote; } export type EnrichedItem = { id: string; - userId: string; + userId?: string; type: EnrichedItemResponse['type']; provider: EnrichedItemResponse['provider']; @@ -25,28 +25,45 @@ export type EnrichedItem = { createdAt: number; updatedAt: number; } & ( - | { repositoryId: string } + | { gitRepositoryId: string } | { repositoryName: string; repositoryOwner: string; } ); -type EnrichedItemRequest = { - provider: EnrichedItemResponse['provider']; - type: EnrichedItemResponse['entityType']; - id: string; -} & ( - | { repositoryId: string } +type GitRepositoryDataRequest = | { - repositoryName: string; - repositoryOwner: string; + readonly initialCommitSha: string; + readonly remoteUrl?: undefined; + readonly remoteDomain?: undefined; + readonly remotePath?: undefined; } -); + | ({ + readonly initialCommitSha?: string; + readonly remoteUrl: string; + readonly remoteDomain: string; + readonly remotePath: string; + } & ( + | { readonly remoteProvider?: undefined } + | { + readonly remoteProvider: string; + readonly remoteProviderRepoDomain: string; + readonly remoteProviderRepoName: string; + readonly remoteProviderRepoOwnerDomain?: string; + } + )); + +type EnrichedItemRequest = { + provider: EnrichedItemResponse['provider']; + entityType: EnrichedItemResponse['entityType']; + entityId: string; + gitRepoData: GitRepositoryDataRequest; +}; type EnrichedItemResponse = { id: string; - userId: string; + userId?: string; type: 'pin' | 'snooze'; provider: 'azure' | 'bitbucket' | 'github' | 'gitlab' | 'gitkraken'; @@ -56,7 +73,7 @@ type EnrichedItemResponse = { createdAt: number; updatedAt: number; } & ( - | { repositoryId: string } + | { gitRepositoryId: string } | { repositoryName: string; repositoryOwner: string; @@ -120,14 +137,25 @@ export class FocusService implements Disposable { try { type Result = { data: EnrichedItemResponse }; + const rq: EnrichedItemRequest = { + provider: item.remote!.provider.id as EnrichedItemResponse['provider'], + entityType: item.type, + entityId: item.id, + gitRepoData: { + remoteUrl: item.remote!.url, + remotePath: item.remote!.provider.path, + remoteDomain: item.remote!.provider.domain, + }, + }; + const rsp = await this.connection.fetchGkDevApi('v1/enrich-items/pin', { method: 'POST', - body: JSON.stringify(item satisfies EnrichedItemRequest), + body: JSON.stringify(rq), }); if (!rsp.ok) { throw new Error( - `Unable to pin item '${item.provider}|${item.repositoryOwner}/${item.repositoryName}#${item.id}': (${rsp.status}) ${rsp.statusText}`, + `Unable to pin item '${rq.provider}|${rq.gitRepoData.remoteDomain}/${rq.gitRepoData.remotePath}#${item.id}': (${rsp.status}) ${rsp.statusText}`, ); } @@ -152,14 +180,25 @@ export class FocusService implements Disposable { try { type Result = { data: EnrichedItemResponse }; + const rq: EnrichedItemRequest = { + provider: item.remote!.provider.id as EnrichedItemResponse['provider'], + entityType: item.type, + entityId: item.id, + gitRepoData: { + remoteUrl: item.remote!.url, + remotePath: item.remote!.provider.path, + remoteDomain: item.remote!.provider.domain, + }, + }; + const rsp = await this.connection.fetchGkDevApi('v1/enrich-items/snooze', { method: 'POST', - body: JSON.stringify(item satisfies EnrichedItemRequest), + body: JSON.stringify(rq), }); if (!rsp.ok) { throw new Error( - `Unable to snooze item '${item.provider}|${item.repositoryOwner}/${item.repositoryName}#${item.id}': (${rsp.status}) ${rsp.statusText}`, + `Unable to snooze item '${rq.provider}|${rq.gitRepoData.remoteDomain}/${rq.gitRepoData.remotePath}#${item.id}': (${rsp.status}) ${rsp.statusText}`, ); } diff --git a/src/plus/webviews/focus/focusWebview.ts b/src/plus/webviews/focus/focusWebview.ts index ce943c10a392a..7156de3db6207 100644 --- a/src/plus/webviews/focus/focusWebview.ts +++ b/src/plus/webviews/focus/focusWebview.ts @@ -27,13 +27,27 @@ import { getSettledValue } from '../../../system/promise'; import type { IpcMessage } from '../../../webviews/protocol'; import { onIpc } from '../../../webviews/protocol'; import type { WebviewController, WebviewProvider } from '../../../webviews/webviewController'; +import type { EnrichedItem, FocusItem } from '../../focus/focusService'; import type { SubscriptionChangeEvent } from '../../subscription/subscriptionService'; import type { ShowInCommitGraphCommandArgs } from '../graph/protocol'; -import type { OpenBranchParams, OpenWorktreeParams, State, SwitchToBranchParams } from './protocol'; +import type { + OpenBranchParams, + OpenWorktreeParams, + PinIssueParams, + PinPrParams, + SnoozeIssueParams, + SnoozePrParams, + State, + SwitchToBranchParams, +} from './protocol'; import { DidChangeNotificationType, OpenBranchCommandType, OpenWorktreeCommandType, + PinIssueCommandType, + PinPrCommandType, + SnoozeIssueCommandType, + SnoozePrCommandType, SwitchToBranchCommandType, } from './protocol'; @@ -51,15 +65,21 @@ interface SearchedPullRequestWithRemote extends SearchedPullRequest { isCurrentBranch?: boolean; hasWorktree?: boolean; isCurrentWorktree?: boolean; + rank: number; +} + +interface SearchedIssueWithRank extends SearchedIssue { + rank: number; } export class FocusWebviewProvider implements WebviewProvider { private _pullRequests: SearchedPullRequestWithRemote[] = []; - private _issues: SearchedIssue[] = []; + private _issues: SearchedIssueWithRank[] = []; private readonly _disposable: Disposable; private _etagSubscription?: number; private _repositoryEventsDisposable?: Disposable; private _repos?: RepoWithRichRemote[]; + private _enrichedItems?: EnrichedItem[]; constructor( private readonly container: Container, @@ -90,7 +110,115 @@ export class FocusWebviewProvider implements WebviewProvider { case OpenWorktreeCommandType.method: onIpc(OpenWorktreeCommandType, e, params => this.onOpenWorktree(params)); break; + case SnoozePrCommandType.method: + onIpc(SnoozePrCommandType, e, params => this.onSnoozePr(params)); + break; + case PinPrCommandType.method: + onIpc(PinPrCommandType, e, params => this.onPinPr(params)); + break; + case SnoozeIssueCommandType.method: + onIpc(SnoozeIssueCommandType, e, params => this.onSnoozeIssue(params)); + break; + case PinIssueCommandType.method: + onIpc(PinIssueCommandType, e, params => this.onPinIssue(params)); + break; + } + } + + private async onPinIssue({ issue, pin }: PinIssueParams) { + const issueWithRemote = this._issues?.find(r => r.issue.id === issue.id); + if (issueWithRemote == null) return; + + if (pin) { + await this.container.focus.unpinItem(issueWithRemote.issue.id); + this._enrichedItems = this._enrichedItems?.filter(e => e.id !== pin); + } else { + const focusItem: FocusItem = { + type: 'issue', + id: issueWithRemote.issue.id, + // remote: issueWithRemote.issue.remote, + }; + const enrichedItem = await this.container.focus.pinItem(focusItem); + if (enrichedItem == null) return; + if (this._enrichedItems == null) { + this._enrichedItems = []; + } + this._enrichedItems.push(enrichedItem); + } + + void this.notifyDidChangeState(); + } + + private async onSnoozeIssue({ issue, snooze }: SnoozeIssueParams) { + const issueWithRemote = this._issues?.find(r => r.issue.id === issue.id); + if (issueWithRemote == null) return; + + if (snooze) { + await this.container.focus.unsnoozeItem(snooze); + this._enrichedItems = this._enrichedItems?.filter(e => e.id !== snooze); + } else { + const focusItem: FocusItem = { + type: 'issue', + id: issueWithRemote.issue.id, + // remote: issueWithRemote.issue.remote, + }; + const enrichedItem = await this.container.focus.snoozeItem(focusItem); + if (enrichedItem == null) return; + if (this._enrichedItems == null) { + this._enrichedItems = []; + } + this._enrichedItems.push(enrichedItem); } + + void this.notifyDidChangeState(); + } + + private async onPinPr({ pullRequest, pin }: PinPrParams) { + const prWithRemote = this._pullRequests?.find(r => r.pullRequest.id === pullRequest.id); + if (prWithRemote == null) return; + + if (pin) { + await this.container.focus.unpinItem(pin); + this._enrichedItems = this._enrichedItems?.filter(e => e.id !== pin); + } else { + const focusItem: FocusItem = { + type: 'pr', + id: prWithRemote.pullRequest.id, + remote: prWithRemote.repoAndRemote.remote, + }; + const enrichedItem = await this.container.focus.pinItem(focusItem); + if (enrichedItem == null) return; + if (this._enrichedItems == null) { + this._enrichedItems = []; + } + this._enrichedItems.push(enrichedItem); + } + + void this.notifyDidChangeState(); + } + + private async onSnoozePr({ pullRequest, snooze }: SnoozePrParams) { + const prWithRemote = this._pullRequests?.find(r => r.pullRequest.id === pullRequest.id); + if (prWithRemote == null) return; + + if (snooze) { + await this.container.focus.unsnoozeItem(snooze); + this._enrichedItems = this._enrichedItems?.filter(e => e.id !== snooze); + } else { + const focusItem: FocusItem = { + type: 'pr', + id: prWithRemote.pullRequest.id, + remote: prWithRemote.repoAndRemote.remote, + }; + const enrichedItem = await this.container.focus.snoozeItem(focusItem); + if (enrichedItem == null) return; + if (this._enrichedItems == null) { + this._enrichedItems = []; + } + this._enrichedItems.push(enrichedItem); + } + + void this.notifyDidChangeState(); } private findSearchedPullRequest(pullRequest: PullRequestShape): SearchedPullRequestWithRemote | undefined { @@ -273,10 +401,11 @@ export class FocusWebviewProvider implements WebviewProvider { const statePromise = Promise.allSettled([ this.getMyPullRequests(connectedRepos), this.getMyIssues(connectedRepos), + this.getEnrichedItems(), ]); async function getStateCore() { - const [prsResult, issuesResult] = await statePromise; + const [prsResult, issuesResult, enrichedItems] = await statePromise; return { webviewId: webviewId, timestamp: Date.now(), @@ -289,10 +418,14 @@ export class FocusWebviewProvider implements WebviewProvider { isCurrentWorktree: pr.isCurrentWorktree ?? false, hasWorktree: pr.hasWorktree ?? false, hasLocalBranch: pr.hasLocalBranch ?? false, + enriched: findEnrichedItem(pr, getSettledValue(enrichedItems)), + rank: pr.rank, })), issues: getSettledValue(issuesResult)?.map(issue => ({ issue: serializeIssue(issue.issue), reasons: issue.reasons, + enriched: findEnrichedItem(issue, getSettledValue(enrichedItems)), + rank: issue.rank, })), }; } @@ -374,6 +507,7 @@ export class FocusWebviewProvider implements WebviewProvider { repoAndRemote: richRepo, isCurrentWorktree: false, isCurrentBranch: false, + rank: getPrRank(pr), }; const remoteBranchName = `${entry.pullRequest.refs!.head.owner}/${entry.pullRequest.refs!.head.branch}`; // TODO@eamodio really need to check for upstream url rather than name @@ -397,36 +531,9 @@ export class FocusWebviewProvider implements WebviewProvider { } } - function getScore(pr: SearchedPullRequest) { - let score = 0; - if (pr.reasons.includes('authored')) { - score += 1000; - } else if (pr.reasons.includes('assigned')) { - score += 900; - } else if (pr.reasons.includes('review-requested')) { - score += 800; - } else if (pr.reasons.includes('mentioned')) { - score += 700; - } - - if (pr.pullRequest.reviewDecision === PullRequestReviewDecision.Approved) { - if (pr.pullRequest.mergeableState === PullRequestMergeableState.Mergeable) { - score += 100; - } else if (pr.pullRequest.mergeableState === PullRequestMergeableState.Conflicting) { - score += 90; - } else { - score += 80; - } - } else if (pr.pullRequest.reviewDecision === PullRequestReviewDecision.ChangesRequested) { - score += 70; - } - - return score; - } - this._pullRequests = allPrs.sort((a, b) => { - const scoreA = getScore(a); - const scoreB = getScore(b); + const scoreA = a.rank; + const scoreB = b.rank; if (scoreA === scoreB) { return a.pullRequest.date.getTime() - b.pullRequest.date.getTime(); @@ -437,26 +544,113 @@ export class FocusWebviewProvider implements WebviewProvider { return this._pullRequests; } - private async getMyIssues(richRepos: RepoWithRichRemote[]): Promise { + private async getMyIssues(richRepos: RepoWithRichRemote[]): Promise { const allIssues = []; for (const { remote } of richRepos) { const issues = await this.container.git.getMyIssues(remote); if (issues == null) { continue; } - allIssues.push(...issues.filter(pr => pr.reasons.length > 0)); + + for (const issue of issues) { + if (issue.reasons.length === 0) { + continue; + } + allIssues.push({ + ...issue, + rank: 0, // getIssueRank(issue), + }); + } } + // this._issues = allIssues.sort((a, b) => { + // const scoreA = a.rank; + // const scoreB = b.rank; + + // if (scoreA === scoreB) { + // return b.issue.updatedDate.getTime() - a.issue.updatedDate.getTime(); + // } + // return (scoreB ?? 0) - (scoreA ?? 0); + // }); + this._issues = allIssues.sort((a, b) => b.issue.updatedDate.getTime() - a.issue.updatedDate.getTime()); return this._issues; } + private async getEnrichedItems(): Promise { + // TODO needs cache invalidation + if (this._enrichedItems == null) { + const enrichedItems = await this.container.focus.get(); + this._enrichedItems = enrichedItems; + } + return this._enrichedItems; + } + private async notifyDidChangeState(deferState?: boolean) { void this.host.notify(DidChangeNotificationType, { state: await this.getState(deferState) }); } } +function findEnrichedItem(item: SearchedPullRequestWithRemote | SearchedIssue, enrichedItems?: EnrichedItem[]) { + if (enrichedItems == null || enrichedItems.length === 0) return; + + let result; + // TODO: filter by entity id, type, and gitRepositoryId + if ((item as SearchedPullRequestWithRemote).pullRequest != null) { + result = enrichedItems.find(e => e.entityId === (item as SearchedPullRequestWithRemote).pullRequest.id); + } else { + result = enrichedItems.find(e => e.entityId === (item as SearchedIssue).issue.id); + } + + if (result == null) return; + + return { + id: result.id, + type: result.type, + }; +} + +function getPrRank(pr: SearchedPullRequest) { + let score = 0; + if (pr.reasons.includes('authored')) { + score += 1000; + } else if (pr.reasons.includes('assigned')) { + score += 900; + } else if (pr.reasons.includes('review-requested')) { + score += 800; + } else if (pr.reasons.includes('mentioned')) { + score += 700; + } + + if (pr.pullRequest.reviewDecision === PullRequestReviewDecision.Approved) { + if (pr.pullRequest.mergeableState === PullRequestMergeableState.Mergeable) { + score += 100; + } else if (pr.pullRequest.mergeableState === PullRequestMergeableState.Conflicting) { + score += 90; + } else { + score += 80; + } + } else if (pr.pullRequest.reviewDecision === PullRequestReviewDecision.ChangesRequested) { + score += 70; + } + + return score; +} + +// function getIssueRank(issue: SearchedIssue) { +// let score = 0; +// if (issue.reasons.includes('authored')) { +// score += 1000; +// } else if (issue.reasons.includes('assigned')) { +// score += 900; +// } else if (issue.reasons.includes('mentioned')) { +// score += 700; +// } + +// return score; +// } + function filterGithubRepos(list: RepoWithRichRemote[]): RepoWithRichRemote[] { return list.filter(entry => entry.isGitHub); } diff --git a/src/plus/webviews/focus/protocol.ts b/src/plus/webviews/focus/protocol.ts index df1063e2e28b3..f422ec9c2af04 100644 --- a/src/plus/webviews/focus/protocol.ts +++ b/src/plus/webviews/focus/protocol.ts @@ -3,6 +3,7 @@ import type { FeatureAccess } from '../../../features'; import type { IssueShape } from '../../../git/models/issue'; import type { PullRequestShape } from '../../../git/models/pullRequest'; import { IpcCommandType, IpcNotificationType } from '../../../webviews/protocol'; +import type { EnrichedItem } from '../../focus/focusService'; export interface State { webviewId: WebviewIds | WebviewViewIds; @@ -16,6 +17,12 @@ export interface State { export interface SearchResultBase { reasons: string[]; + rank?: number; + // TODO: convert to array of EnrichedItem + enriched?: { + id: EnrichedItem['id']; + type: EnrichedItem['type']; + }; } export interface IssueResult extends SearchResultBase { @@ -53,6 +60,30 @@ export interface SwitchToBranchParams { } export const SwitchToBranchCommandType = new IpcCommandType('focus/pr/switchToBranch'); +export interface SnoozePrParams { + pullRequest: PullRequestShape; + snooze?: string; +} +export const SnoozePrCommandType = new IpcCommandType('focus/pr/snooze'); + +export interface PinPrParams { + pullRequest: PullRequestShape; + pin?: string; +} +export const PinPrCommandType = new IpcCommandType('focus/pr/pin'); + +export interface SnoozeIssueParams { + issue: IssueShape; + snooze?: string; +} +export const SnoozeIssueCommandType = new IpcCommandType('focus/issue/snooze'); + +export interface PinIssueParams { + issue: IssueShape; + pin?: string; +} +export const PinIssueCommandType = new IpcCommandType('focus/issue/pin'); + // Notifications export interface DidChangeParams { diff --git a/src/webviews/apps/plus/focus/components/focus-app.ts b/src/webviews/apps/plus/focus/components/focus-app.ts index 93996d09715f1..9adce0f9085cd 100644 --- a/src/webviews/apps/plus/focus/components/focus-app.ts +++ b/src/webviews/apps/plus/focus/components/focus-app.ts @@ -28,11 +28,12 @@ import './gk-issue-row'; @customElement('gl-focus-app') export class GlFocusApp extends LitElement { static override styles = [themeProperties]; - private readonly tabFilters = ['prs', 'issues']; + private readonly tabFilters = ['prs', 'issues', 'snoozed']; private readonly tabFilterOptions = [ { label: 'All', value: '' }, { label: 'PRs', value: 'prs' }, { label: 'Issues', value: 'issues' }, + { label: 'Later', value: 'snoozed' }, ]; private readonly mineFilters = ['authored', 'assigned', 'review-requested', 'mentioned']; private readonly mineFilterOptions = [ @@ -98,11 +99,30 @@ export class GlFocusApp extends LitElement { return []; } - const items: { isPullrequest: boolean; rank: number; state: Record; tags: string[] }[] = []; + const items: { + isPullrequest: boolean; + rank: number; + state: Record; + tags: string[]; + isPinned: boolean; + isSnoozed: boolean; + enrichedId?: string; + }[] = []; - let rank = 0; this.state?.pullRequests?.forEach( - ({ pullRequest, reasons, isCurrentBranch, isCurrentWorktree, hasWorktree, hasLocalBranch }) => { + ({ + pullRequest, + reasons, + isCurrentBranch, + isCurrentWorktree, + hasWorktree, + hasLocalBranch, + rank, + enriched, + }) => { + const isPinned = enriched?.type === 'pin'; + const isSnoozed = enriched?.type === 'snooze'; + items.push({ isPullrequest: true, state: { @@ -112,19 +132,28 @@ export class GlFocusApp extends LitElement { hasWorktree: hasWorktree, hasLocalBranch: hasLocalBranch, }, - rank: ++rank, + rank: rank ?? 0, tags: reasons, + isPinned: isPinned, + isSnoozed: isSnoozed, + enrichedId: enriched?.id, }); }, ); - this.state?.issues?.forEach(({ issue, reasons }) => { + this.state?.issues?.forEach(({ issue, reasons, rank, enriched }) => { + const isPinned = enriched?.type === 'pin'; + const isSnoozed = enriched?.type === 'snooze'; + items.push({ isPullrequest: false, - rank: ++rank, + rank: rank ?? 0, state: { issue: issue, }, tags: reasons, + isPinned: isPinned, + isSnoozed: isSnoozed, + enrichedId: enriched?.id, }); }); @@ -135,8 +164,8 @@ export class GlFocusApp extends LitElement { const counts: Record = {}; this.tabFilters.forEach(f => (counts[f] = 0)); - this.items.forEach(({ isPullrequest }) => { - const key = isPullrequest ? 'prs' : 'issues'; + this.items.forEach(({ isPullrequest, isSnoozed }) => { + const key = isSnoozed ? 'snoozed' : isPullrequest ? 'prs' : 'issues'; if (counts[key] != null) { counts[key]++; } @@ -190,6 +219,15 @@ export class GlFocusApp extends LitElement { }); } + get sortedItems() { + return this.filteredItems.sort((a, b) => { + if (a.isPinned === b.isPinned) { + return a.rank - b.rank; + } + return a.isPinned ? -1 : 1; + }); + } + get isLoading() { return this.state?.pullRequests == null || this.state?.issues == null; } @@ -207,7 +245,7 @@ export class GlFocusApp extends LitElement { return this.loadingContent(); } - if (this.filteredItems.length === 0) { + if (this.sortedItems.length === 0) { return html`
None found @@ -217,9 +255,12 @@ export class GlFocusApp extends LitElement { return html` ${repeat( - this.filteredItems, - item => item.rank, - ({ isPullrequest, rank, state }) => + this.sortedItems, + (item, i) => + `item-${i}-${ + item.isPullrequest ? `pr-${item.state.pullRequest.id}` : `issue-${item.state.issue.id}` + }`, + ({ isPullrequest, rank, state, isPinned, isSnoozed }) => when( isPullrequest, () => @@ -230,8 +271,18 @@ export class GlFocusApp extends LitElement { .isCurrentWorktree=${state.isCurrentWorktree} .hasWorktree=${state.hasWorktree} .hasLocalBranch=${state.hasLocalBranch} + .pinned=${isPinned} + .snoozed=${isSnoozed} + .enrichedId=${state.enrichedId} >`, - () => html``, + () => + html``, ), )} `; @@ -341,6 +392,9 @@ export class GlFocusApp extends LitElement {
+ + + Repo / Branch diff --git a/src/webviews/apps/plus/focus/components/gk-issue-row.ts b/src/webviews/apps/plus/focus/components/gk-issue-row.ts index a88e87a18a956..ddf3a00fefd6d 100644 --- a/src/webviews/apps/plus/focus/components/gk-issue-row.ts +++ b/src/webviews/apps/plus/focus/components/gk-issue-row.ts @@ -90,6 +90,21 @@ export class GkIssueRow extends LitElement { display: inline-block; min-width: 1.6rem; } + + .pin { + opacity: 0.4; + } + .pin:hover { + opacity: 0.64; + } + + gk-focus-row:not(:hover):not(:focus-within) .pin:not(.is-active) { + opacity: 0; + } + + .pin.is-active { + opacity: 1; + } `, ]; @@ -99,6 +114,15 @@ export class GkIssueRow extends LitElement { @property({ type: Object }) public issue?: IssueShape; + @property({ type: Boolean }) + public pinned = false; + + @property({ type: Boolean }) + public snoozed = false; + + @property({ attribute: 'enriched-id' }) + public enrichedId?: string; + constructor() { super(); @@ -132,6 +156,26 @@ export class GkIssueRow extends LitElement { return html` + + + + Pin + + + + Mark for Later + +

@@ -199,4 +243,20 @@ export class GkIssueRow extends LitElement { `; } + + onSnoozeClick(_e: Event) { + this.dispatchEvent( + new CustomEvent('snooze-item', { + detail: { item: this.issue!, snooze: this.snoozed ? this.enrichedId : undefined }, + }), + ); + } + + onPinClick(_e: Event) { + this.dispatchEvent( + new CustomEvent('pin-item', { + detail: { item: this.issue!, pin: this.pinned ? this.enrichedId : undefined }, + }), + ); + } } diff --git a/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts b/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts index 6c99cfbda5b6c..483ffb9dea6ba 100644 --- a/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts +++ b/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts @@ -97,7 +97,7 @@ export class GkPullRequestRow extends LitElement { .row-type { --gk-badge-outline-padding: 0.3rem 0.8rem; --gk-badge-font-size: 1.1rem; - opacity: 0.5; + opacity: 0.4; vertical-align: middle; } @@ -119,6 +119,21 @@ export class GkPullRequestRow extends LitElement { display: inline-block; min-width: 1.6rem; } + + .pin { + opacity: 0.4; + } + .pin:hover { + opacity: 0.64; + } + + gk-focus-row:not(:hover):not(:focus-within) .pin:not(.is-active) { + opacity: 0; + } + + .pin.is-active { + opacity: 1; + } `, ]; @@ -140,6 +155,15 @@ export class GkPullRequestRow extends LitElement { @property({ type: Boolean }) public hasLocalBranch = false; + @property({ type: Boolean }) + public pinned = false; + + @property({ type: Boolean }) + public snoozed = false; + + @property({ attribute: 'enriched-id' }) + public enrichedId?: string; + constructor() { super(); @@ -196,6 +220,26 @@ export class GkPullRequestRow extends LitElement { return html` + + + + ${this.pinned ? 'Unpinned' : 'Pin'} + + + + ${this.snoozed ? 'Watch' : 'Mark for Later'} + + ${when( this.indicator === 'changes', @@ -347,4 +391,20 @@ export class GkPullRequestRow extends LitElement { } this.dispatchEvent(new CustomEvent('switch-branch', { detail: this.pullRequest! })); } + + onSnoozeClick(_e: Event) { + this.dispatchEvent( + new CustomEvent('snooze-item', { + detail: { item: this.pullRequest!, snooze: this.snoozed ? this.enrichedId : undefined }, + }), + ); + } + + onPinClick(_e: Event) { + this.dispatchEvent( + new CustomEvent('pin-item', { + detail: { item: this.pullRequest!, pin: this.pinned ? this.enrichedId : undefined }, + }), + ); + } } diff --git a/src/webviews/apps/plus/focus/focus.ts b/src/webviews/apps/plus/focus/focus.ts index 65cefbac668d6..dbe34377a7038 100644 --- a/src/webviews/apps/plus/focus/focus.ts +++ b/src/webviews/apps/plus/focus/focus.ts @@ -1,9 +1,14 @@ +import type { IssueShape } from '../../../../git/models/issue'; import type { PullRequestShape } from '../../../../git/models/pullRequest'; import type { State } from '../../../../plus/webviews/focus/protocol'; import { DidChangeNotificationType, OpenBranchCommandType, OpenWorktreeCommandType, + PinIssueCommandType, + PinPrCommandType, + SnoozeIssueCommandType, + SnoozePrCommandType, SwitchToBranchCommandType, } from '../../../../plus/webviews/focus/protocol'; import type { IpcMessage } from '../../../protocol'; @@ -11,6 +16,7 @@ import { onIpc } from '../../../protocol'; import { App } from '../../shared/appBase'; import { DOM } from '../../shared/dom'; import type { GlFocusApp } from './components/focus-app'; +import type { GkIssueRow } from './components/gk-issue-row'; import type { GkPullRequestRow } from './components/gk-pull-request-row'; import './components/focus-app'; import './focus.scss'; @@ -41,6 +47,26 @@ export class FocusApp extends App { 'switch-branch', (e, target: HTMLElement) => this.onSwitchBranch(e, target), ), + DOM.on( + 'gk-pull-request-row', + 'snooze-item', + (e, _target: HTMLElement) => this.onSnoozeItem(e, false), + ), + DOM.on( + 'gk-pull-request-row', + 'pin-item', + (e, _target: HTMLElement) => this.onPinItem(e, false), + ), + DOM.on( + 'gk-issue-row', + 'snooze-item', + (e, _target: HTMLElement) => this.onSnoozeItem(e, true), + ), + DOM.on( + 'gk-issue-row', + 'pin-item', + (e, _target: HTMLElement) => this.onPinItem(e, true), + ), ); return disposables; @@ -73,6 +99,25 @@ export class FocusApp extends App { this.sendCommand(OpenWorktreeCommandType, { pullRequest: e.detail }); } + private onSnoozeItem(e: CustomEvent<{ item: PullRequestShape | IssueShape; snooze?: string }>, isIssue: boolean) { + if (isIssue) { + this.sendCommand(SnoozeIssueCommandType, { issue: e.detail.item as IssueShape, snooze: e.detail.snooze }); + } else { + this.sendCommand(SnoozePrCommandType, { + pullRequest: e.detail.item as PullRequestShape, + snooze: e.detail.snooze, + }); + } + } + + private onPinItem(e: CustomEvent<{ item: PullRequestShape | IssueShape; pin?: string }>, isIssue: boolean) { + if (isIssue) { + this.sendCommand(PinIssueCommandType, { issue: e.detail.item as IssueShape, pin: e.detail.pin }); + } else { + this.sendCommand(PinPrCommandType, { pullRequest: e.detail.item as PullRequestShape, pin: e.detail.pin }); + } + } + protected override onMessageReceived(e: MessageEvent) { const msg = e.data as IpcMessage; this.log(`onMessageReceived(${msg.id}): name=${msg.method}`); diff --git a/yarn.lock b/yarn.lock index a865f3d2c1b57..cfefe9c82cc60 100644 --- a/yarn.lock +++ b/yarn.lock @@ -237,7 +237,7 @@ react-dragula "1.1.17" react-onclickoutside "^6.13.0" -"@gitkraken/shared-web-components@^0.1.1-rc.6": +"@gitkraken/shared-web-components@^0.1.1-rc.9": version "0.1.1-rc.10" resolved "https://registry.yarnpkg.com/@gitkraken/shared-web-components/-/shared-web-components-0.1.1-rc.10.tgz#bed7021a0e6912ae3196e06078169950f0616bed" integrity sha512-2GoM9Gg473zbtTL5u5YTiDeU8mzACj2hMQBk+7iruiiVoJLGxvi1bT95MyXHakhv4zk4lI5OVWP6TU4ZAaoDLQ== From 63770851f498015f9d3d5c5542d04aeb02b01398 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Mon, 11 Sep 2023 17:33:57 -0400 Subject: [PATCH 0008/1012] Updates focus enrichment types --- src/plus/webviews/focus/focusWebview.ts | 16 +++++---- src/plus/webviews/focus/protocol.ts | 2 +- .../apps/plus/focus/components/focus-app.ts | 35 ++++++++++--------- .../plus/focus/components/gk-issue-row.ts | 11 +++--- .../focus/components/gk-pull-request-row.ts | 15 ++++---- 5 files changed, 39 insertions(+), 40 deletions(-) diff --git a/src/plus/webviews/focus/focusWebview.ts b/src/plus/webviews/focus/focusWebview.ts index 7156de3db6207..dc5378ebd823b 100644 --- a/src/plus/webviews/focus/focusWebview.ts +++ b/src/plus/webviews/focus/focusWebview.ts @@ -418,13 +418,13 @@ export class FocusWebviewProvider implements WebviewProvider { isCurrentWorktree: pr.isCurrentWorktree ?? false, hasWorktree: pr.hasWorktree ?? false, hasLocalBranch: pr.hasLocalBranch ?? false, - enriched: findEnrichedItem(pr, getSettledValue(enrichedItems)), + enriched: findEnrichedItems(pr, getSettledValue(enrichedItems)), rank: pr.rank, })), issues: getSettledValue(issuesResult)?.map(issue => ({ issue: serializeIssue(issue.issue), reasons: issue.reasons, - enriched: findEnrichedItem(issue, getSettledValue(enrichedItems)), + enriched: findEnrichedItems(issue, getSettledValue(enrichedItems)), rank: issue.rank, })), }; @@ -592,7 +592,7 @@ export class FocusWebviewProvider implements WebviewProvider { } } -function findEnrichedItem(item: SearchedPullRequestWithRemote | SearchedIssue, enrichedItems?: EnrichedItem[]) { +function findEnrichedItems(item: SearchedPullRequestWithRemote | SearchedIssue, enrichedItems?: EnrichedItem[]) { if (enrichedItems == null || enrichedItems.length === 0) return; let result; @@ -605,10 +605,12 @@ function findEnrichedItem(item: SearchedPullRequestWithRemote | SearchedIssue, e if (result == null) return; - return { - id: result.id, - type: result.type, - }; + return [ + { + id: result.id, + type: result.type, + }, + ]; } function getPrRank(pr: SearchedPullRequest) { diff --git a/src/plus/webviews/focus/protocol.ts b/src/plus/webviews/focus/protocol.ts index f422ec9c2af04..956e2c40bbb80 100644 --- a/src/plus/webviews/focus/protocol.ts +++ b/src/plus/webviews/focus/protocol.ts @@ -22,7 +22,7 @@ export interface SearchResultBase { enriched?: { id: EnrichedItem['id']; type: EnrichedItem['type']; - }; + }[]; } export interface IssueResult extends SearchResultBase { diff --git a/src/webviews/apps/plus/focus/components/focus-app.ts b/src/webviews/apps/plus/focus/components/focus-app.ts index 9adce0f9085cd..d75b95ae74932 100644 --- a/src/webviews/apps/plus/focus/components/focus-app.ts +++ b/src/webviews/apps/plus/focus/components/focus-app.ts @@ -104,9 +104,8 @@ export class GlFocusApp extends LitElement { rank: number; state: Record; tags: string[]; - isPinned: boolean; - isSnoozed: boolean; - enrichedId?: string; + isPinned?: string; + isSnoozed?: string; }[] = []; this.state?.pullRequests?.forEach( @@ -120,8 +119,8 @@ export class GlFocusApp extends LitElement { rank, enriched, }) => { - const isPinned = enriched?.type === 'pin'; - const isSnoozed = enriched?.type === 'snooze'; + const isPinned = enriched?.find(item => item.type === 'pin')?.id; + const isSnoozed = enriched?.find(item => item.type === 'snooze')?.id; items.push({ isPullrequest: true, @@ -136,13 +135,12 @@ export class GlFocusApp extends LitElement { tags: reasons, isPinned: isPinned, isSnoozed: isSnoozed, - enrichedId: enriched?.id, }); }, ); this.state?.issues?.forEach(({ issue, reasons, rank, enriched }) => { - const isPinned = enriched?.type === 'pin'; - const isSnoozed = enriched?.type === 'snooze'; + const isPinned = enriched?.find(item => item.type === 'pin')?.id; + const isSnoozed = enriched?.find(item => item.type === 'snooze')?.id; items.push({ isPullrequest: false, @@ -153,7 +151,6 @@ export class GlFocusApp extends LitElement { tags: reasons, isPinned: isPinned, isSnoozed: isSnoozed, - enrichedId: enriched?.id, }); }); @@ -188,16 +185,21 @@ export class GlFocusApp extends LitElement { const hasMineFilter = this.selectedMineFilter != null && this.selectedMineFilter !== ''; const hasTabFilter = this.selectedTabFilter != null && this.selectedTabFilter !== ''; if (!hasSearch && !hasMineFilter && !hasTabFilter) { - return this.items; + return this.items.filter(i => i.isSnoozed == null); } const searchText = this.searchText?.toLowerCase(); return this.items.filter(i => { - if ( - hasTabFilter && - ((i.isPullrequest === true && this.selectedTabFilter === 'issues') || - (i.isPullrequest === false && this.selectedTabFilter === 'prs')) - ) { + if (hasTabFilter) { + if ( + (i.isSnoozed != null && this.selectedTabFilter !== 'snoozed') || + (i.isSnoozed == null && this.selectedTabFilter == 'snoozed') || + (i.isPullrequest === true && this.selectedTabFilter === 'issues') || + (i.isPullrequest === false && this.selectedTabFilter === 'prs') + ) { + return false; + } + } else if (i.isSnoozed != null) { return false; } @@ -222,7 +224,8 @@ export class GlFocusApp extends LitElement { get sortedItems() { return this.filteredItems.sort((a, b) => { if (a.isPinned === b.isPinned) { - return a.rank - b.rank; + return 0; + // return a.rank - b.rank; } return a.isPinned ? -1 : 1; }); diff --git a/src/webviews/apps/plus/focus/components/gk-issue-row.ts b/src/webviews/apps/plus/focus/components/gk-issue-row.ts index ddf3a00fefd6d..30ab7ab902e8a 100644 --- a/src/webviews/apps/plus/focus/components/gk-issue-row.ts +++ b/src/webviews/apps/plus/focus/components/gk-issue-row.ts @@ -114,15 +114,12 @@ export class GkIssueRow extends LitElement { @property({ type: Object }) public issue?: IssueShape; - @property({ type: Boolean }) + @property() public pinned = false; - @property({ type: Boolean }) + @property() public snoozed = false; - @property({ attribute: 'enriched-id' }) - public enrichedId?: string; - constructor() { super(); @@ -247,7 +244,7 @@ export class GkIssueRow extends LitElement { onSnoozeClick(_e: Event) { this.dispatchEvent( new CustomEvent('snooze-item', { - detail: { item: this.issue!, snooze: this.snoozed ? this.enrichedId : undefined }, + detail: { item: this.issue!, snooze: this.snoozed }, }), ); } @@ -255,7 +252,7 @@ export class GkIssueRow extends LitElement { onPinClick(_e: Event) { this.dispatchEvent( new CustomEvent('pin-item', { - detail: { item: this.issue!, pin: this.pinned ? this.enrichedId : undefined }, + detail: { item: this.issue!, pin: this.pinned }, }), ); } diff --git a/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts b/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts index 483ffb9dea6ba..2705e63841b72 100644 --- a/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts +++ b/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts @@ -155,14 +155,11 @@ export class GkPullRequestRow extends LitElement { @property({ type: Boolean }) public hasLocalBranch = false; - @property({ type: Boolean }) - public pinned = false; - - @property({ type: Boolean }) - public snoozed = false; + @property() + public pinned?: string; - @property({ attribute: 'enriched-id' }) - public enrichedId?: string; + @property() + public snoozed?: string; constructor() { super(); @@ -395,7 +392,7 @@ export class GkPullRequestRow extends LitElement { onSnoozeClick(_e: Event) { this.dispatchEvent( new CustomEvent('snooze-item', { - detail: { item: this.pullRequest!, snooze: this.snoozed ? this.enrichedId : undefined }, + detail: { item: this.pullRequest!, snooze: this.snoozed }, }), ); } @@ -403,7 +400,7 @@ export class GkPullRequestRow extends LitElement { onPinClick(_e: Event) { this.dispatchEvent( new CustomEvent('pin-item', { - detail: { item: this.pullRequest!, pin: this.pinned ? this.enrichedId : undefined }, + detail: { item: this.pullRequest!, pin: this.pinned }, }), ); } From 985a511633aaf234195d4b55500c1a1aa52af7df Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Mon, 11 Sep 2023 17:51:22 -0400 Subject: [PATCH 0009/1012] Updates multiple enrichment items --- src/plus/webviews/focus/focusWebview.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plus/webviews/focus/focusWebview.ts b/src/plus/webviews/focus/focusWebview.ts index dc5378ebd823b..52e94e0e15ef2 100644 --- a/src/plus/webviews/focus/focusWebview.ts +++ b/src/plus/webviews/focus/focusWebview.ts @@ -598,19 +598,19 @@ function findEnrichedItems(item: SearchedPullRequestWithRemote | SearchedIssue, let result; // TODO: filter by entity id, type, and gitRepositoryId if ((item as SearchedPullRequestWithRemote).pullRequest != null) { - result = enrichedItems.find(e => e.entityId === (item as SearchedPullRequestWithRemote).pullRequest.id); + result = enrichedItems.filter(e => e.entityId === (item as SearchedPullRequestWithRemote).pullRequest.id); } else { - result = enrichedItems.find(e => e.entityId === (item as SearchedIssue).issue.id); + result = enrichedItems.filter(e => e.entityId === (item as SearchedIssue).issue.id); } - if (result == null) return; + if (result.length === 0) return; - return [ - { + return result.map(result => { + return { id: result.id, type: result.type, - }, - ]; + }; + }); } function getPrRank(pr: SearchedPullRequest) { From 7b3376812904ce049c04856fdc2ab17a2de0381a Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Mon, 11 Sep 2023 18:17:55 -0400 Subject: [PATCH 0010/1012] Updates remote info for enriching issues --- src/plus/focus/focusService.ts | 18 +++++------ src/plus/webviews/focus/focusWebview.ts | 40 +++++++++++++++++++++---- src/plus/webviews/focus/protocol.ts | 11 +++---- 3 files changed, 50 insertions(+), 19 deletions(-) diff --git a/src/plus/focus/focusService.ts b/src/plus/focus/focusService.ts index 8ea0725bfe94d..fe9eacc385b55 100644 --- a/src/plus/focus/focusService.ts +++ b/src/plus/focus/focusService.ts @@ -10,7 +10,7 @@ import type { ServerConnection } from '../gk/serverConnection'; export interface FocusItem { type: EnrichedItemResponse['entityType']; id: string; - remote?: GitRemote; + remote: GitRemote; } export type EnrichedItem = { @@ -138,13 +138,13 @@ export class FocusService implements Disposable { type Result = { data: EnrichedItemResponse }; const rq: EnrichedItemRequest = { - provider: item.remote!.provider.id as EnrichedItemResponse['provider'], + provider: item.remote.provider.id as EnrichedItemResponse['provider'], entityType: item.type, entityId: item.id, gitRepoData: { - remoteUrl: item.remote!.url, - remotePath: item.remote!.provider.path, - remoteDomain: item.remote!.provider.domain, + remoteUrl: item.remote.url, + remotePath: item.remote.provider.path, + remoteDomain: item.remote.provider.domain, }, }; @@ -181,13 +181,13 @@ export class FocusService implements Disposable { type Result = { data: EnrichedItemResponse }; const rq: EnrichedItemRequest = { - provider: item.remote!.provider.id as EnrichedItemResponse['provider'], + provider: item.remote.provider.id as EnrichedItemResponse['provider'], entityType: item.type, entityId: item.id, gitRepoData: { - remoteUrl: item.remote!.url, - remotePath: item.remote!.provider.path, - remoteDomain: item.remote!.provider.domain, + remoteUrl: item.remote.url, + remotePath: item.remote.provider.path, + remoteDomain: item.remote.provider.domain, }, }; diff --git a/src/plus/webviews/focus/focusWebview.ts b/src/plus/webviews/focus/focusWebview.ts index 52e94e0e15ef2..e03e0a6d664bd 100644 --- a/src/plus/webviews/focus/focusWebview.ts +++ b/src/plus/webviews/focus/focusWebview.ts @@ -66,10 +66,13 @@ interface SearchedPullRequestWithRemote extends SearchedPullRequest { hasWorktree?: boolean; isCurrentWorktree?: boolean; rank: number; + enriched?: EnrichedItem[]; } interface SearchedIssueWithRank extends SearchedIssue { + repoAndRemote: RepoWithRichRemote; rank: number; + enriched?: EnrichedItem[]; } export class FocusWebviewProvider implements WebviewProvider { @@ -132,11 +135,12 @@ export class FocusWebviewProvider implements WebviewProvider { if (pin) { await this.container.focus.unpinItem(issueWithRemote.issue.id); this._enrichedItems = this._enrichedItems?.filter(e => e.id !== pin); + issueWithRemote.enriched = issueWithRemote.enriched?.filter(e => e.id !== pin); } else { const focusItem: FocusItem = { type: 'issue', id: issueWithRemote.issue.id, - // remote: issueWithRemote.issue.remote, + remote: issueWithRemote.repoAndRemote.remote, }; const enrichedItem = await this.container.focus.pinItem(focusItem); if (enrichedItem == null) return; @@ -144,6 +148,10 @@ export class FocusWebviewProvider implements WebviewProvider { this._enrichedItems = []; } this._enrichedItems.push(enrichedItem); + if (issueWithRemote.enriched == null) { + issueWithRemote.enriched = []; + } + issueWithRemote.enriched.push(enrichedItem); } void this.notifyDidChangeState(); @@ -156,11 +164,12 @@ export class FocusWebviewProvider implements WebviewProvider { if (snooze) { await this.container.focus.unsnoozeItem(snooze); this._enrichedItems = this._enrichedItems?.filter(e => e.id !== snooze); + issueWithRemote.enriched = issueWithRemote.enriched?.filter(e => e.id !== snooze); } else { const focusItem: FocusItem = { type: 'issue', id: issueWithRemote.issue.id, - // remote: issueWithRemote.issue.remote, + remote: issueWithRemote.repoAndRemote.remote, }; const enrichedItem = await this.container.focus.snoozeItem(focusItem); if (enrichedItem == null) return; @@ -168,6 +177,10 @@ export class FocusWebviewProvider implements WebviewProvider { this._enrichedItems = []; } this._enrichedItems.push(enrichedItem); + if (issueWithRemote.enriched == null) { + issueWithRemote.enriched = []; + } + issueWithRemote.enriched.push(enrichedItem); } void this.notifyDidChangeState(); @@ -180,6 +193,7 @@ export class FocusWebviewProvider implements WebviewProvider { if (pin) { await this.container.focus.unpinItem(pin); this._enrichedItems = this._enrichedItems?.filter(e => e.id !== pin); + prWithRemote.enriched = prWithRemote.enriched?.filter(e => e.id !== pin); } else { const focusItem: FocusItem = { type: 'pr', @@ -192,6 +206,10 @@ export class FocusWebviewProvider implements WebviewProvider { this._enrichedItems = []; } this._enrichedItems.push(enrichedItem); + if (prWithRemote.enriched == null) { + prWithRemote.enriched = []; + } + prWithRemote.enriched.push(enrichedItem); } void this.notifyDidChangeState(); @@ -204,6 +222,7 @@ export class FocusWebviewProvider implements WebviewProvider { if (snooze) { await this.container.focus.unsnoozeItem(snooze); this._enrichedItems = this._enrichedItems?.filter(e => e.id !== snooze); + prWithRemote.enriched = prWithRemote.enriched?.filter(e => e.id !== snooze); } else { const focusItem: FocusItem = { type: 'pr', @@ -216,6 +235,10 @@ export class FocusWebviewProvider implements WebviewProvider { this._enrichedItems = []; } this._enrichedItems.push(enrichedItem); + if (prWithRemote.enriched == null) { + prWithRemote.enriched = []; + } + prWithRemote.enriched.push(enrichedItem); } void this.notifyDidChangeState(); @@ -546,7 +569,8 @@ export class FocusWebviewProvider implements WebviewProvider { private async getMyIssues(richRepos: RepoWithRichRemote[]): Promise { const allIssues = []; - for (const { remote } of richRepos) { + for (const richRepo of richRepos) { + const remote = richRepo.remote; const issues = await this.container.git.getMyIssues(remote); if (issues == null) { continue; @@ -558,6 +582,7 @@ export class FocusWebviewProvider implements WebviewProvider { } allIssues.push({ ...issue, + repoAndRemote: richRepo, rank: 0, // getIssueRank(issue), }); } @@ -592,7 +617,10 @@ export class FocusWebviewProvider implements WebviewProvider { } } -function findEnrichedItems(item: SearchedPullRequestWithRemote | SearchedIssue, enrichedItems?: EnrichedItem[]) { +function findEnrichedItems( + item: SearchedPullRequestWithRemote | SearchedIssueWithRank, + enrichedItems?: EnrichedItem[], +) { if (enrichedItems == null || enrichedItems.length === 0) return; let result; @@ -600,11 +628,13 @@ function findEnrichedItems(item: SearchedPullRequestWithRemote | SearchedIssue, if ((item as SearchedPullRequestWithRemote).pullRequest != null) { result = enrichedItems.filter(e => e.entityId === (item as SearchedPullRequestWithRemote).pullRequest.id); } else { - result = enrichedItems.filter(e => e.entityId === (item as SearchedIssue).issue.id); + result = enrichedItems.filter(e => e.entityId === (item as SearchedIssueWithRank).issue.id); } if (result.length === 0) return; + item.enriched = result; + return result.map(result => { return { id: result.id, diff --git a/src/plus/webviews/focus/protocol.ts b/src/plus/webviews/focus/protocol.ts index 956e2c40bbb80..f40778ce4eb5b 100644 --- a/src/plus/webviews/focus/protocol.ts +++ b/src/plus/webviews/focus/protocol.ts @@ -18,11 +18,12 @@ export interface State { export interface SearchResultBase { reasons: string[]; rank?: number; - // TODO: convert to array of EnrichedItem - enriched?: { - id: EnrichedItem['id']; - type: EnrichedItem['type']; - }[]; + enriched?: EnrichedItemSummary[]; +} + +export interface EnrichedItemSummary { + id: EnrichedItem['id']; + type: EnrichedItem['type']; } export interface IssueResult extends SearchResultBase { From 1d1a189b9175924da4b2d6f37af3168f45b6344a Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Tue, 12 Sep 2023 12:14:37 -0400 Subject: [PATCH 0011/1012] Updates pin snooze action styles --- .../apps/plus/focus/components/common.css.ts | 123 ++++++++++++++ .../plus/focus/components/gk-issue-row.ts | 118 +++---------- .../focus/components/gk-pull-request-row.ts | 158 ++++-------------- src/webviews/apps/plus/focus/focus.scss | 1 + 4 files changed, 171 insertions(+), 229 deletions(-) create mode 100644 src/webviews/apps/plus/focus/components/common.css.ts diff --git a/src/webviews/apps/plus/focus/components/common.css.ts b/src/webviews/apps/plus/focus/components/common.css.ts new file mode 100644 index 0000000000000..9e085829f1801 --- /dev/null +++ b/src/webviews/apps/plus/focus/components/common.css.ts @@ -0,0 +1,123 @@ +import { css } from 'lit'; + +export const rowBaseStyles = css` + :host { + display: block; + } + + p { + margin: 0; + } + + a { + color: var(--vscode-textLink-foreground); + text-decoration: none; + } + a:hover { + text-decoration: underline; + } + a:focus { + outline: 1px solid var(--vscode-focusBorder); + outline-offset: -1px; + } + + .actions gk-tooltip { + display: inline-block; + } + + .actions a { + box-sizing: border-box; + display: inline-flex; + justify-content: center; + align-items: center; + width: 3.2rem; + height: 3.2rem; + border-radius: 0.5rem; + color: inherit; + padding: 0.2rem; + vertical-align: text-bottom; + text-decoration: none; + cursor: pointer; + } + .actions a:hover { + background-color: var(--vscode-toolbar-hoverBackground); + } + .actions a:active { + background-color: var(--vscode-toolbar-activeBackground); + } + .actions a[tabindex='-1'] { + opacity: 0.5; + cursor: default; + } + + .actions a code-icon { + font-size: 1.6rem; + } + + .indicator-info { + color: var(--vscode-problemsInfoIcon-foreground); + } + .indicator-warning { + color: var(--vscode-problemsWarningIcon-foreground); + } + .indicator-error { + color: var(--vscode-problemsErrorIcon-foreground); + } + .indicator-neutral { + color: var(--color-alert-neutralBorder); + } + + .row-type { + --gk-badge-outline-padding: 0.3rem 0.8rem; + --gk-badge-font-size: 1.1rem; + opacity: 0.4; + vertical-align: middle; + } + + .title { + font-size: 1.4rem; + } + + .add-delete { + margin-left: 0.4rem; + margin-right: 0.2rem; + } + + .key { + z-index: 1; + position: relative; + } + + .date { + display: inline-block; + min-width: 1.6rem; + } + + .icon { + box-sizing: border-box; + display: inline-flex; + justify-content: center; + align-items: center; + width: 2.4rem; + height: 2.4rem; + } + + .pin { + color: inherit; + text-decoration: none; + cursor: pointer; + opacity: 0.4; + } + .pin:hover { + opacity: 0.64; + text-decoration: none; + } + + gk-focus-row:not(:hover):not(:focus-within) .pin:not(.is-active) { + opacity: 0; + } + + .pin.is-active { + opacity: 1; + } +`; diff --git a/src/webviews/apps/plus/focus/components/gk-issue-row.ts b/src/webviews/apps/plus/focus/components/gk-issue-row.ts index 30ab7ab902e8a..e451f84d68ec5 100644 --- a/src/webviews/apps/plus/focus/components/gk-issue-row.ts +++ b/src/webviews/apps/plus/focus/components/gk-issue-row.ts @@ -15,98 +15,14 @@ import { when } from 'lit/directives/when.js'; import type { IssueMember, IssueShape } from '../../../../../git/models/issue'; import { elementBase } from '../../../shared/components/styles/lit/base.css'; import { repoBranchStyles } from './branch-tag.css'; +import { rowBaseStyles } from './common.css'; import { dateAgeStyles } from './date-styles.css'; import { themeProperties } from './gk-theme.css'; import { fromDateRange } from './helpers'; @customElement('gk-issue-row') export class GkIssueRow extends LitElement { - static override styles = [ - themeProperties, - elementBase, - dateAgeStyles, - repoBranchStyles, - css` - :host { - display: block; - } - - p { - margin: 0; - } - - a { - color: var(--vscode-textLink-foreground); - text-decoration: none; - } - a:hover { - text-decoration: underline; - } - a:focus { - outline: 1px solid var(--vscode-focusBorder); - outline-offset: -1px; - } - - .actions { - } - - .actions a { - box-sizing: border-box; - display: inline-flex; - justify-content: center; - align-items: center; - width: 3.2rem; - height: 3.2rem; - border-radius: 0.5rem; - color: inherit; - padding: 0.2rem; - vertical-align: text-bottom; - text-decoration: none; - cursor: pointer; - } - .actions a:hover { - background-color: var(--vscode-toolbar-hoverBackground); - } - .actions a:active { - background-color: var(--vscode-toolbar-activeBackground); - } - - .actions a code-icon { - font-size: 1.6rem; - } - - .row-type { - --gk-badge-outline-padding: 0.3rem 0.8rem; - --gk-badge-font-size: 1.1rem; - opacity: 0.5; - vertical-align: middle; - } - - .title { - font-size: 1.4rem; - } - - .date { - display: inline-block; - min-width: 1.6rem; - } - - .pin { - opacity: 0.4; - } - .pin:hover { - opacity: 0.64; - } - - gk-focus-row:not(:hover):not(:focus-within) .pin:not(.is-active) { - opacity: 0; - } - - .pin.is-active { - opacity: 1; - } - `, - ]; + static override styles = [themeProperties, elementBase, dateAgeStyles, repoBranchStyles, rowBaseStyles, css``]; @property({ type: Number }) public rank?: number; @@ -155,24 +71,29 @@ export class GkIssueRow extends LitElement { - + > Pin - + > Mark for Later + + +

@@ -221,9 +142,6 @@ export class GkIssueRow extends LitElement { )} - - -

@@ -241,7 +159,8 @@ export class GkIssueRow extends LitElement { `; } - onSnoozeClick(_e: Event) { + onSnoozeClick(e: Event) { + e.preventDefault(); this.dispatchEvent( new CustomEvent('snooze-item', { detail: { item: this.issue!, snooze: this.snoozed }, @@ -249,7 +168,8 @@ export class GkIssueRow extends LitElement { ); } - onPinClick(_e: Event) { + onPinClick(e: Event) { + e.preventDefault(); this.dispatchEvent( new CustomEvent('pin-item', { detail: { item: this.issue!, pin: this.pinned }, diff --git a/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts b/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts index 2705e63841b72..05806405f980f 100644 --- a/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts +++ b/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts @@ -16,126 +16,14 @@ import { when } from 'lit/directives/when.js'; import type { PullRequestMember, PullRequestShape } from '../../../../../git/models/pullRequest'; import { elementBase } from '../../../shared/components/styles/lit/base.css'; import { repoBranchStyles } from './branch-tag.css'; +import { rowBaseStyles } from './common.css'; import { dateAgeStyles } from './date-styles.css'; import { themeProperties } from './gk-theme.css'; import { fromDateRange } from './helpers'; @customElement('gk-pull-request-row') export class GkPullRequestRow extends LitElement { - static override styles = [ - themeProperties, - elementBase, - dateAgeStyles, - repoBranchStyles, - css` - :host { - display: block; - } - - p { - margin: 0; - } - - a { - color: var(--vscode-textLink-foreground); - text-decoration: none; - } - a:hover { - text-decoration: underline; - } - a:focus { - outline: 1px solid var(--vscode-focusBorder); - outline-offset: -1px; - } - - .actions gk-tooltip { - display: inline-block; - } - - .actions a { - box-sizing: border-box; - display: inline-flex; - justify-content: center; - align-items: center; - width: 3.2rem; - height: 3.2rem; - border-radius: 0.5rem; - color: inherit; - padding: 0.2rem; - vertical-align: text-bottom; - text-decoration: none; - cursor: pointer; - } - .actions a:hover { - background-color: var(--vscode-toolbar-hoverBackground); - } - .actions a:active { - background-color: var(--vscode-toolbar-activeBackground); - } - .actions a[tabindex='-1'] { - opacity: 0.5; - cursor: default; - } - - .actions a code-icon { - font-size: 1.6rem; - } - - .indicator-info { - color: var(--vscode-problemsInfoIcon-foreground); - } - .indicator-warning { - color: var(--vscode-problemsWarningIcon-foreground); - } - .indicator-error { - color: var(--vscode-problemsErrorIcon-foreground); - } - .indicator-neutral { - color: var(--color-alert-neutralBorder); - } - - .row-type { - --gk-badge-outline-padding: 0.3rem 0.8rem; - --gk-badge-font-size: 1.1rem; - opacity: 0.4; - vertical-align: middle; - } - - .title { - font-size: 1.4rem; - } - - .add-delete { - margin-left: 0.4rem; - margin-right: 0.2rem; - } - - .key { - z-index: 1; - position: relative; - } - - .date { - display: inline-block; - min-width: 1.6rem; - } - - .pin { - opacity: 0.4; - } - .pin:hover { - opacity: 0.64; - } - - gk-focus-row:not(:hover):not(:focus-within) .pin:not(.is-active) { - opacity: 0; - } - - .pin.is-active { - opacity: 1; - } - `, - ]; + static override styles = [themeProperties, elementBase, dateAgeStyles, repoBranchStyles, rowBaseStyles, css``]; @property({ type: Number }) public rank?: number; @@ -219,30 +107,37 @@ export class GkPullRequestRow extends LitElement { - + > ${this.pinned ? 'Unpinned' : 'Pin'} - + > ${this.snoozed ? 'Watch' : 'Mark for Later'} + + + ${when( this.indicator === 'changes', () => html` - + changes requested `, )} @@ -250,7 +145,9 @@ export class GkPullRequestRow extends LitElement { this.indicator === 'ready', () => html` - + approved and ready to merge `, )} @@ -258,7 +155,9 @@ export class GkPullRequestRow extends LitElement { this.indicator === 'conflicting', () => html` - + cannot be merged due to merge conflicts `, )} @@ -312,9 +211,6 @@ export class GkPullRequestRow extends LitElement { )} - - -
@@ -389,7 +285,8 @@ export class GkPullRequestRow extends LitElement { this.dispatchEvent(new CustomEvent('switch-branch', { detail: this.pullRequest! })); } - onSnoozeClick(_e: Event) { + onSnoozeClick(e: Event) { + e.preventDefault(); this.dispatchEvent( new CustomEvent('snooze-item', { detail: { item: this.pullRequest!, snooze: this.snoozed }, @@ -397,7 +294,8 @@ export class GkPullRequestRow extends LitElement { ); } - onPinClick(_e: Event) { + onPinClick(e: Event) { + e.preventDefault(); this.dispatchEvent( new CustomEvent('pin-item', { detail: { item: this.pullRequest!, pin: this.pinned }, diff --git a/src/webviews/apps/plus/focus/focus.scss b/src/webviews/apps/plus/focus/focus.scss index c51477192f644..d1df9989fed7a 100644 --- a/src/webviews/apps/plus/focus/focus.scss +++ b/src/webviews/apps/plus/focus/focus.scss @@ -39,6 +39,7 @@ body { --gk-tooltip-padding: 0.4rem 0.8rem; --gk-focus-background-color-hover: var(--background-05); --gk-divider-color: var(--background-05); + --gk-focus-row-pin-min-width: 52px; } .vscode-high-contrast, From e77c7f7987eb5b5e8c48514824d86a5ab3d5faba Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Wed, 13 Sep 2023 13:01:34 -0400 Subject: [PATCH 0012/1012] Updates snooze labelling --- src/webviews/apps/plus/focus/components/common.css.ts | 1 + src/webviews/apps/plus/focus/components/focus-app.ts | 2 +- src/webviews/apps/plus/focus/components/gk-issue-row.ts | 4 ++-- .../apps/plus/focus/components/gk-pull-request-row.ts | 4 ++-- src/webviews/apps/plus/focus/focus.scss | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/webviews/apps/plus/focus/components/common.css.ts b/src/webviews/apps/plus/focus/components/common.css.ts index 9e085829f1801..bc2a94df2459e 100644 --- a/src/webviews/apps/plus/focus/components/common.css.ts +++ b/src/webviews/apps/plus/focus/components/common.css.ts @@ -91,6 +91,7 @@ export const rowBaseStyles = css` .date { display: inline-block; min-width: 1.6rem; + line-height: 2.4rem; } .icon { diff --git a/src/webviews/apps/plus/focus/components/focus-app.ts b/src/webviews/apps/plus/focus/components/focus-app.ts index d75b95ae74932..701661f4804a4 100644 --- a/src/webviews/apps/plus/focus/components/focus-app.ts +++ b/src/webviews/apps/plus/focus/components/focus-app.ts @@ -33,7 +33,7 @@ export class GlFocusApp extends LitElement { { label: 'All', value: '' }, { label: 'PRs', value: 'prs' }, { label: 'Issues', value: 'issues' }, - { label: 'Later', value: 'snoozed' }, + { label: 'Snoozed', value: 'snoozed' }, ]; private readonly mineFilters = ['authored', 'assigned', 'review-requested', 'mentioned']; private readonly mineFilterOptions = [ diff --git a/src/webviews/apps/plus/focus/components/gk-issue-row.ts b/src/webviews/apps/plus/focus/components/gk-issue-row.ts index e451f84d68ec5..6e1c8736d7adc 100644 --- a/src/webviews/apps/plus/focus/components/gk-issue-row.ts +++ b/src/webviews/apps/plus/focus/components/gk-issue-row.ts @@ -78,7 +78,7 @@ export class GkIssueRow extends LitElement { @click="${this.onPinClick}" > - Pin + ${this.pinned ? 'Unpin' : 'Pin'} - Mark for Later + ${this.snoozed ? 'Unsnooze' : 'Snooze'} diff --git a/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts b/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts index 05806405f980f..e46566fc4cfa7 100644 --- a/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts +++ b/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts @@ -114,7 +114,7 @@ export class GkPullRequestRow extends LitElement { @click="${this.onPinClick}" > - ${this.pinned ? 'Unpinned' : 'Pin'} + ${this.pinned ? 'Unpin' : 'Pin'} - ${this.snoozed ? 'Watch' : 'Mark for Later'} + ${this.snoozed ? 'Unsnooze' : 'Snooze'} diff --git a/src/webviews/apps/plus/focus/focus.scss b/src/webviews/apps/plus/focus/focus.scss index d1df9989fed7a..1ba69b9a07388 100644 --- a/src/webviews/apps/plus/focus/focus.scss +++ b/src/webviews/apps/plus/focus/focus.scss @@ -39,7 +39,7 @@ body { --gk-tooltip-padding: 0.4rem 0.8rem; --gk-focus-background-color-hover: var(--background-05); --gk-divider-color: var(--background-05); - --gk-focus-row-pin-min-width: 52px; + --gk-focus-row-pin-min-width: 64px; } .vscode-high-contrast, From 648a4071f77116904c0445501fffaf18d64d9416 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Wed, 13 Sep 2023 13:01:51 -0400 Subject: [PATCH 0013/1012] Updates repo column sizing --- src/webviews/apps/plus/focus/focus.scss | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/webviews/apps/plus/focus/focus.scss b/src/webviews/apps/plus/focus/focus.scss index 1ba69b9a07388..890478e6c736c 100644 --- a/src/webviews/apps/plus/focus/focus.scss +++ b/src/webviews/apps/plus/focus/focus.scss @@ -40,6 +40,7 @@ body { --gk-focus-background-color-hover: var(--background-05); --gk-divider-color: var(--background-05); --gk-focus-row-pin-min-width: 64px; + --gk-focus-item-repo-min-width: 150px; } .vscode-high-contrast, @@ -66,6 +67,18 @@ body { --popover-bg: var(--color-background--darken-15); } +@media (min-width: 1200px) { + body { + --gk-focus-item-repo-min-width: 240px; + } +} + +@media (min-width: 1400px) { + body { + --gk-focus-item-repo-min-width: 320px; + } +} + :root { font-size: 62.5%; font-family: var(--font-family); From de6a0bb3a9df4ece829ecc2d136076ae17d2dd4c Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Mon, 18 Sep 2023 17:27:09 -0400 Subject: [PATCH 0014/1012] Updates EnrichedItem with entityUrl --- src/plus/focus/focusService.ts | 59 +++++-------------------- src/plus/webviews/focus/focusWebview.ts | 4 ++ 2 files changed, 14 insertions(+), 49 deletions(-) diff --git a/src/plus/focus/focusService.ts b/src/plus/focus/focusService.ts index fe9eacc385b55..ccfabd227935c 100644 --- a/src/plus/focus/focusService.ts +++ b/src/plus/focus/focusService.ts @@ -11,6 +11,7 @@ export interface FocusItem { type: EnrichedItemResponse['entityType']; id: string; remote: GitRemote; + url: string; } export type EnrichedItem = { @@ -21,44 +22,17 @@ export type EnrichedItem = { provider: EnrichedItemResponse['provider']; entityType: EnrichedItemResponse['entityType']; entityId: string; + entityUrl: string; createdAt: number; updatedAt: number; -} & ( - | { gitRepositoryId: string } - | { - repositoryName: string; - repositoryOwner: string; - } -); - -type GitRepositoryDataRequest = - | { - readonly initialCommitSha: string; - readonly remoteUrl?: undefined; - readonly remoteDomain?: undefined; - readonly remotePath?: undefined; - } - | ({ - readonly initialCommitSha?: string; - readonly remoteUrl: string; - readonly remoteDomain: string; - readonly remotePath: string; - } & ( - | { readonly remoteProvider?: undefined } - | { - readonly remoteProvider: string; - readonly remoteProviderRepoDomain: string; - readonly remoteProviderRepoName: string; - readonly remoteProviderRepoOwnerDomain?: string; - } - )); +}; type EnrichedItemRequest = { provider: EnrichedItemResponse['provider']; entityType: EnrichedItemResponse['entityType']; entityId: string; - gitRepoData: GitRepositoryDataRequest; + entityUrl: string; }; type EnrichedItemResponse = { @@ -69,16 +43,11 @@ type EnrichedItemResponse = { provider: 'azure' | 'bitbucket' | 'github' | 'gitlab' | 'gitkraken'; entityType: 'issue' | 'pr'; entityId: string; + entityUrl: string; createdAt: number; updatedAt: number; -} & ( - | { gitRepositoryId: string } - | { - repositoryName: string; - repositoryOwner: string; - } -); +}; export class FocusService implements Disposable { constructor( @@ -141,11 +110,7 @@ export class FocusService implements Disposable { provider: item.remote.provider.id as EnrichedItemResponse['provider'], entityType: item.type, entityId: item.id, - gitRepoData: { - remoteUrl: item.remote.url, - remotePath: item.remote.provider.path, - remoteDomain: item.remote.provider.domain, - }, + entityUrl: item.url, }; const rsp = await this.connection.fetchGkDevApi('v1/enrich-items/pin', { @@ -155,7 +120,7 @@ export class FocusService implements Disposable { if (!rsp.ok) { throw new Error( - `Unable to pin item '${rq.provider}|${rq.gitRepoData.remoteDomain}/${rq.gitRepoData.remotePath}#${item.id}': (${rsp.status}) ${rsp.statusText}`, + `Unable to pin item '${rq.provider}|${rq.entityUrl}#${item.id}': (${rsp.status}) ${rsp.statusText}`, ); } @@ -184,11 +149,7 @@ export class FocusService implements Disposable { provider: item.remote.provider.id as EnrichedItemResponse['provider'], entityType: item.type, entityId: item.id, - gitRepoData: { - remoteUrl: item.remote.url, - remotePath: item.remote.provider.path, - remoteDomain: item.remote.provider.domain, - }, + entityUrl: item.url, }; const rsp = await this.connection.fetchGkDevApi('v1/enrich-items/snooze', { @@ -198,7 +159,7 @@ export class FocusService implements Disposable { if (!rsp.ok) { throw new Error( - `Unable to snooze item '${rq.provider}|${rq.gitRepoData.remoteDomain}/${rq.gitRepoData.remotePath}#${item.id}': (${rsp.status}) ${rsp.statusText}`, + `Unable to snooze item '${rq.provider}|${rq.entityUrl}#${item.id}': (${rsp.status}) ${rsp.statusText}`, ); } diff --git a/src/plus/webviews/focus/focusWebview.ts b/src/plus/webviews/focus/focusWebview.ts index e03e0a6d664bd..0717dbb8e1211 100644 --- a/src/plus/webviews/focus/focusWebview.ts +++ b/src/plus/webviews/focus/focusWebview.ts @@ -141,6 +141,7 @@ export class FocusWebviewProvider implements WebviewProvider { type: 'issue', id: issueWithRemote.issue.id, remote: issueWithRemote.repoAndRemote.remote, + url: issueWithRemote.issue.url, }; const enrichedItem = await this.container.focus.pinItem(focusItem); if (enrichedItem == null) return; @@ -170,6 +171,7 @@ export class FocusWebviewProvider implements WebviewProvider { type: 'issue', id: issueWithRemote.issue.id, remote: issueWithRemote.repoAndRemote.remote, + url: issueWithRemote.issue.url, }; const enrichedItem = await this.container.focus.snoozeItem(focusItem); if (enrichedItem == null) return; @@ -199,6 +201,7 @@ export class FocusWebviewProvider implements WebviewProvider { type: 'pr', id: prWithRemote.pullRequest.id, remote: prWithRemote.repoAndRemote.remote, + url: prWithRemote.pullRequest.url, }; const enrichedItem = await this.container.focus.pinItem(focusItem); if (enrichedItem == null) return; @@ -228,6 +231,7 @@ export class FocusWebviewProvider implements WebviewProvider { type: 'pr', id: prWithRemote.pullRequest.id, remote: prWithRemote.repoAndRemote.remote, + url: prWithRemote.pullRequest.url, }; const enrichedItem = await this.container.focus.snoozeItem(focusItem); if (enrichedItem == null) return; From ad4ccb5444e7416e22d182d8059da3f44584db9b Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Mon, 2 Oct 2023 15:33:48 -0400 Subject: [PATCH 0015/1012] adds nodeId to issues and PRs --- src/git/models/issue.ts | 4 ++++ src/git/models/pullRequest.ts | 2 ++ src/plus/github/github.ts | 5 +++++ src/plus/github/models.ts | 6 ++++++ src/plus/gitlab/gitlab.ts | 3 +++ src/plus/gitlab/models.ts | 1 + src/webviews/settings/settingsWebview.ts | 1 + 7 files changed, 22 insertions(+) diff --git a/src/git/models/issue.ts b/src/git/models/issue.ts index 1860991000896..a3a427297c6b8 100644 --- a/src/git/models/issue.ts +++ b/src/git/models/issue.ts @@ -9,6 +9,7 @@ export interface IssueOrPullRequest { readonly type: IssueOrPullRequestType; readonly provider: RemoteProviderReference; readonly id: string; + readonly nodeId: string | undefined; readonly title: string; readonly url: string; readonly date: Date; @@ -58,6 +59,7 @@ export function serializeIssueOrPullRequest(value: IssueOrPullRequest): IssueOrP icon: value.provider.icon, }, id: value.id, + nodeId: value.nodeId, title: value.title, url: value.url, date: value.date, @@ -183,6 +185,7 @@ export function serializeIssue(value: IssueShape): IssueShape { icon: value.provider.icon, }, id: value.id, + nodeId: value.nodeId, title: value.title, url: value.url, date: value.date, @@ -223,6 +226,7 @@ export class Issue implements IssueShape { constructor( public readonly provider: RemoteProviderReference, public readonly id: string, + public readonly nodeId: string | undefined, public readonly title: string, public readonly url: string, public readonly date: Date, diff --git a/src/git/models/pullRequest.ts b/src/git/models/pullRequest.ts index b78ed86ee30e8..3222100a3e679 100644 --- a/src/git/models/pullRequest.ts +++ b/src/git/models/pullRequest.ts @@ -73,6 +73,7 @@ export function serializePullRequest(value: PullRequest): PullRequestShape { icon: value.provider.icon, }, id: value.id, + nodeId: value.nodeId, title: value.title, url: value.url, date: value.date, @@ -133,6 +134,7 @@ export class PullRequest implements PullRequestShape { readonly url: string; }, public readonly id: string, + public readonly nodeId: string | undefined, public readonly title: string, public readonly url: string, public readonly state: PullRequestState, diff --git a/src/plus/github/github.ts b/src/plus/github/github.ts index 834194a1246ae..12e1dcf20fbdf 100644 --- a/src/plus/github/github.ts +++ b/src/plus/github/github.ts @@ -103,6 +103,7 @@ headRepository { url } permalink +id number title state @@ -155,6 +156,7 @@ const issueNodeProperties = ` comments { totalCount } + id number title url @@ -488,6 +490,7 @@ export class GitHubApi implements Disposable { createdAt closed closedAt + id title url state @@ -496,6 +499,7 @@ export class GitHubApi implements Disposable { createdAt closed closedAt + id title url state @@ -524,6 +528,7 @@ export class GitHubApi implements Disposable { provider: provider, type: issue.type, id: String(number), + nodeId: issue.id, date: new Date(issue.createdAt), title: issue.title, closed: issue.closed, diff --git a/src/plus/github/models.ts b/src/plus/github/models.ts index 6ad2707592a03..41aa614ef3c50 100644 --- a/src/plus/github/models.ts +++ b/src/plus/github/models.ts @@ -45,6 +45,8 @@ export interface GitHubCommitRef { export type GitHubContributor = Endpoints['GET /repos/{owner}/{repo}/contributors']['response']['data'][0]; export interface GitHubIssueOrPullRequest { + id: string; + nodeId: string; type: IssueOrPullRequestType; number: number; createdAt: string; @@ -76,6 +78,7 @@ export interface GitHubPullRequest { }; permalink: string; number: number; + id: string; title: string; state: GitHubPullRequestState; updatedAt: string; @@ -172,6 +175,7 @@ export function fromGitHubPullRequest(pr: GitHubPullRequest, provider: RichRemot url: pr.author.url, }, String(pr.number), + pr.id, pr.title, pr.permalink, fromGitHubPullRequestState(pr.state), @@ -253,6 +257,7 @@ export function fromGitHubPullRequestDetailed( url: pr.author.url, }, String(pr.number), + pr.id, pr.title, pr.permalink, fromGitHubPullRequestState(pr.state), @@ -309,6 +314,7 @@ export function fromGitHubIssueDetailed(value: GitHubIssueDetailed, provider: Ri icon: provider.icon, }, String(value.number), + value.id, value.title, value.url, new Date(value.createdAt), diff --git a/src/plus/gitlab/gitlab.ts b/src/plus/gitlab/gitlab.ts index 0c14952ab330c..0b35ea574aae8 100644 --- a/src/plus/gitlab/gitlab.ts +++ b/src/plus/gitlab/gitlab.ts @@ -320,6 +320,7 @@ export class GitLabApi implements Disposable { provider: provider, type: 'issue', id: issue.iid, + nodeId: undefined, date: new Date(issue.createdAt), title: issue.title, closed: issue.state === 'closed', @@ -335,6 +336,7 @@ export class GitLabApi implements Disposable { provider: provider, type: 'pullrequest', id: mergeRequest.iid, + nodeId: undefined, date: new Date(mergeRequest.createdAt), title: mergeRequest.title, closed: mergeRequest.state === 'closed', @@ -487,6 +489,7 @@ export class GitLabApi implements Disposable { url: pr.author?.webUrl ?? '', }, String(pr.iid), + undefined, pr.title, pr.webUrl, fromGitLabMergeRequestState(pr.state), diff --git a/src/plus/gitlab/models.ts b/src/plus/gitlab/models.ts index f319ac1d67cd9..9742f911f9c25 100644 --- a/src/plus/gitlab/models.ts +++ b/src/plus/gitlab/models.ts @@ -98,6 +98,7 @@ export function fromGitLabMergeRequestREST(pr: GitLabMergeRequestREST, provider: url: pr.author?.web_url ?? '', }, String(pr.iid), + undefined, pr.title, pr.web_url, fromGitLabMergeRequestState(pr.state), diff --git a/src/webviews/settings/settingsWebview.ts b/src/webviews/settings/settingsWebview.ts index cc81537ad8766..0b1d004b87d73 100644 --- a/src/webviews/settings/settingsWebview.ts +++ b/src/webviews/settings/settingsWebview.ts @@ -200,6 +200,7 @@ export class SettingsWebviewProvider implements WebviewProvider { url: 'https://github.com/eamodio', }, '1', + undefined, 'Supercharged', 'https://github.com/gitkraken/vscode-gitlens/pulls/1', 'merged', From 50c9a4383989180083103fb1767c362386fafef2 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Mon, 2 Oct 2023 16:16:51 -0400 Subject: [PATCH 0016/1012] Updates focus view to use nodeId --- src/plus/webviews/focus/focusWebview.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/plus/webviews/focus/focusWebview.ts b/src/plus/webviews/focus/focusWebview.ts index 0717dbb8e1211..df389f98373ea 100644 --- a/src/plus/webviews/focus/focusWebview.ts +++ b/src/plus/webviews/focus/focusWebview.ts @@ -129,7 +129,7 @@ export class FocusWebviewProvider implements WebviewProvider { } private async onPinIssue({ issue, pin }: PinIssueParams) { - const issueWithRemote = this._issues?.find(r => r.issue.id === issue.id); + const issueWithRemote = this._issues?.find(r => r.issue.nodeId === issue.nodeId); if (issueWithRemote == null) return; if (pin) { @@ -139,7 +139,7 @@ export class FocusWebviewProvider implements WebviewProvider { } else { const focusItem: FocusItem = { type: 'issue', - id: issueWithRemote.issue.id, + id: issueWithRemote.issue.nodeId!, remote: issueWithRemote.repoAndRemote.remote, url: issueWithRemote.issue.url, }; @@ -159,7 +159,7 @@ export class FocusWebviewProvider implements WebviewProvider { } private async onSnoozeIssue({ issue, snooze }: SnoozeIssueParams) { - const issueWithRemote = this._issues?.find(r => r.issue.id === issue.id); + const issueWithRemote = this._issues?.find(r => r.issue.nodeId === issue.nodeId); if (issueWithRemote == null) return; if (snooze) { @@ -169,7 +169,7 @@ export class FocusWebviewProvider implements WebviewProvider { } else { const focusItem: FocusItem = { type: 'issue', - id: issueWithRemote.issue.id, + id: issueWithRemote.issue.nodeId!, remote: issueWithRemote.repoAndRemote.remote, url: issueWithRemote.issue.url, }; @@ -189,7 +189,7 @@ export class FocusWebviewProvider implements WebviewProvider { } private async onPinPr({ pullRequest, pin }: PinPrParams) { - const prWithRemote = this._pullRequests?.find(r => r.pullRequest.id === pullRequest.id); + const prWithRemote = this._pullRequests?.find(r => r.pullRequest.nodeId === pullRequest.nodeId); if (prWithRemote == null) return; if (pin) { @@ -199,7 +199,7 @@ export class FocusWebviewProvider implements WebviewProvider { } else { const focusItem: FocusItem = { type: 'pr', - id: prWithRemote.pullRequest.id, + id: prWithRemote.pullRequest.nodeId!, remote: prWithRemote.repoAndRemote.remote, url: prWithRemote.pullRequest.url, }; @@ -219,7 +219,7 @@ export class FocusWebviewProvider implements WebviewProvider { } private async onSnoozePr({ pullRequest, snooze }: SnoozePrParams) { - const prWithRemote = this._pullRequests?.find(r => r.pullRequest.id === pullRequest.id); + const prWithRemote = this._pullRequests?.find(r => r.pullRequest.nodeId === pullRequest.nodeId); if (prWithRemote == null) return; if (snooze) { @@ -229,7 +229,7 @@ export class FocusWebviewProvider implements WebviewProvider { } else { const focusItem: FocusItem = { type: 'pr', - id: prWithRemote.pullRequest.id, + id: prWithRemote.pullRequest.nodeId!, remote: prWithRemote.repoAndRemote.remote, url: prWithRemote.pullRequest.url, }; @@ -630,9 +630,9 @@ function findEnrichedItems( let result; // TODO: filter by entity id, type, and gitRepositoryId if ((item as SearchedPullRequestWithRemote).pullRequest != null) { - result = enrichedItems.filter(e => e.entityId === (item as SearchedPullRequestWithRemote).pullRequest.id); + result = enrichedItems.filter(e => e.entityId === (item as SearchedPullRequestWithRemote).pullRequest.nodeId); } else { - result = enrichedItems.filter(e => e.entityId === (item as SearchedIssueWithRank).issue.id); + result = enrichedItems.filter(e => e.entityId === (item as SearchedIssueWithRank).issue.nodeId); } if (result.length === 0) return; From 3e54c1f1fdf89d4bf66bf43a7aed9b690037dcd7 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Mon, 2 Oct 2023 22:42:48 -0400 Subject: [PATCH 0017/1012] Fixes focus view tooltips --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 1cbf1d0329410..7974d885027a1 100644 --- a/package.json +++ b/package.json @@ -14816,7 +14816,7 @@ }, "dependencies": { "@gitkraken/gitkraken-components": "10.1.25", - "@gitkraken/shared-web-components": "^0.1.1-rc.9", + "@gitkraken/shared-web-components": "^0.1.1-rc.11", "@microsoft/fast-element": "1.12.0", "@microsoft/fast-react-wrapper": "0.3.19", "@octokit/graphql": "7.0.2", diff --git a/yarn.lock b/yarn.lock index cfefe9c82cc60..35c0cc154850a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -237,10 +237,10 @@ react-dragula "1.1.17" react-onclickoutside "^6.13.0" -"@gitkraken/shared-web-components@^0.1.1-rc.9": - version "0.1.1-rc.10" - resolved "https://registry.yarnpkg.com/@gitkraken/shared-web-components/-/shared-web-components-0.1.1-rc.10.tgz#bed7021a0e6912ae3196e06078169950f0616bed" - integrity sha512-2GoM9Gg473zbtTL5u5YTiDeU8mzACj2hMQBk+7iruiiVoJLGxvi1bT95MyXHakhv4zk4lI5OVWP6TU4ZAaoDLQ== +"@gitkraken/shared-web-components@^0.1.1-rc.11": + version "0.1.1-rc.11" + resolved "https://registry.npmjs.org/@gitkraken/shared-web-components/-/shared-web-components-0.1.1-rc.11.tgz#0d588af0a9c92a6ccf2339a341787c6d9d60227c" + integrity sha512-lslDHNgU2znzoLydkLudETHP0WlRBLdV25YgRSTcm724Elah5nFfqUdJZ8lQCKehxJBnlWtll5uTxuM+7wxVDw== dependencies: "@floating-ui/dom" "^1.4.2" typescript "^4.9.5" From 276688689d8338159c1ceeeb098d46f4649e20eb Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Wed, 4 Oct 2023 10:18:42 -0400 Subject: [PATCH 0018/1012] Fixes assignee name in PRs --- src/plus/github/models.ts | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/plus/github/models.ts b/src/plus/github/models.ts index 41aa614ef3c50..ca1ceae729611 100644 --- a/src/plus/github/models.ts +++ b/src/plus/github/models.ts @@ -11,6 +11,12 @@ export interface GitHubBlame { viewer?: string; } +export interface GitHubMember { + login: string; + avatarUrl: string; + url: string; +} + export interface GitHubBlameRange { startingLine: number; endingLine: number; @@ -95,12 +101,8 @@ export interface GitHubPullRequest { export interface GitHubIssueDetailed extends GitHubIssueOrPullRequest { date: Date; updatedAt: Date; - author: { - login: string; - avatarUrl: string; - url: string; - }; - assignees: { nodes: IssueMember[] }; + author: GitHubMember; + assignees: { nodes: GitHubMember[] }; repository: { name: string; owner: { @@ -150,19 +152,11 @@ export interface GitHubDetailedPullRequest extends GitHubPullRequest { reviewRequests: { nodes: { asCodeOwner: boolean; - requestedReviewer: { - login: string; - avatarUrl: string; - url: string; - }; + requestedReviewer: GitHubMember; }[]; }; assignees: { - nodes: { - login: string; - avatarUrl: string; - url: string; - }[]; + nodes: GitHubMember[]; }; } @@ -331,7 +325,7 @@ export function fromGitHubIssueDetailed(value: GitHubIssueDetailed, provider: Ri repo: value.repository.name, }, value.assignees.nodes.map(assignee => ({ - name: assignee.name, + name: assignee.login, avatarUrl: assignee.avatarUrl, url: assignee.url, })), From b90de792b4c336af7fb896ca350481f9f86f849b Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Wed, 4 Oct 2023 10:19:19 -0400 Subject: [PATCH 0019/1012] Adds reviewers to focus view items --- .../focus/components/gk-pull-request-row.ts | 46 +++++++++++++------ 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts b/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts index e46566fc4cfa7..39c6ac57590b9 100644 --- a/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts +++ b/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts @@ -100,6 +100,32 @@ export class GkPullRequestRow extends LitElement { return `indicator-${fromDateRange(this.lastUpdatedDate).status}`; } + get participants() { + const participants: { member: PullRequestMember; roles: string[] }[] = []; + function addMember(member: PullRequestMember, role: string) { + const participant = participants.find(p => p.member.name === member.name); + if (participant != null) { + participant.roles.push(role); + } else { + participants.push({ member: member, roles: [role] }); + } + } + + if (this.pullRequest?.author != null) { + addMember(this.pullRequest.author, 'author'); + } + + if (this.pullRequest?.assignees != null) { + this.pullRequest.assignees.forEach(m => addMember(m, 'assigned')); + } + + if (this.pullRequest?.reviewRequests != null) { + this.pullRequest.reviewRequests.forEach(m => addMember(m.reviewer, 'reviewer')); + } + + return participants; + } + override render() { if (!this.pullRequest) return undefined; @@ -188,23 +214,17 @@ export class GkPullRequestRow extends LitElement { ${when( - this.pullRequest.author != null, - () => - html``, - )} - ${when( - this.assignees.length > 0, + this.participants.length > 0, () => html` ${repeat( - this.assignees, - item => item.url, + this.participants, + item => item.member.url, item => html``, )} `, From f674841720b639a9bc77d14e84f6c317687fce88 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Wed, 4 Oct 2023 12:04:30 -0700 Subject: [PATCH 0020/1012] Updates CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9326fb48adbc0..09bf4aea68ffc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Changed - Relaxes PR autolink detection for Azure DevOps to use `PR ` instead of `Merged PR ` — closes [#2908](https://github.com/gitkraken/vscode-gitlens/issues/2908) +- Replaces VSCode git operations (`fetch`, `push`, `pull`) with GitLens' own implementations to avoid issues with VSCode's git extension. This can be reverted by setting `"gitlens.experimental.nativeGit"` to `"false"` in settings. +- Adds deep link support for workspaces in the _GitKraken Workspaces_ view + - Deep link format: `https://gitkraken.dev/link/workspaces/{workspaceId}` + - Adds a _Share_ submenu with a _Copy Link to Workspace_ command to workspaces in the _GitKraken Workspaces_ view ### Fixed @@ -17,6 +21,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Fixes [#2928](https://github.com/gitkraken/vscode-gitlens/issues/2928) - Apply Changes should create new files when needed - Fixes [#2896](https://github.com/gitkraken/vscode-gitlens/issues/2896) - Repositories view stuck in loading state - Fixes issue with "View as [List|Tree]" toggle not working in the _Commit Details_ view +- Fixes an issue with deep links sometimes failing to properly resolve when a matching repository without the remote is found +- Fixes an issue in the _Commit Graph_ where commits not in the history of a merge commit were showing in the same column ## [14.3.0] - 2023-09-07 From 6c036b4153c1e79522436bae78ba9c00c8f82edd Mon Sep 17 00:00:00 2001 From: ericf-axosoft <90025366+ericf-axosoft@users.noreply.github.com> Date: Thu, 5 Oct 2023 18:44:27 +0200 Subject: [PATCH 0021/1012] Add new service-specific ref icons (#2936) * Added service-specific ref icons * Added "hostingServiceType" property to the GK Graph remote type to be able to get icons * Added better icons for Gitlab and Bitbucket services * Added missing icons * Bump GK Graph dependency to v10.1.27 * Fixed build * Refactor: isolate the component imports to one file * Formatting --------- Co-authored-by: Ramin Tadayon --- package.json | 2 +- src/env/node/git/localGitProvider.ts | 2 ++ src/git/models/graph.ts | 12 ++++++- src/plus/github/githubGitProvider.ts | 3 ++ src/webviews/apps/plus/graph/GraphWrapper.tsx | 7 +++++ src/webviews/apps/plus/graph/graph.scss | 31 +++++++++++++++++++ yarn.lock | 8 ++--- 7 files changed, 59 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 7974d885027a1..60509b15fc2a0 100644 --- a/package.json +++ b/package.json @@ -14815,7 +14815,7 @@ "vscode:prepublish": "yarn run bundle" }, "dependencies": { - "@gitkraken/gitkraken-components": "10.1.25", + "@gitkraken/gitkraken-components": "10.1.27", "@gitkraken/shared-web-components": "^0.1.1-rc.11", "@microsoft/fast-element": "1.12.0", "@microsoft/fast-react-wrapper": "0.3.19", diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts index 87903b377d007..1573c4721c33b 100644 --- a/src/env/node/git/localGitProvider.ts +++ b/src/env/node/git/localGitProvider.ts @@ -69,6 +69,7 @@ import type { GitFile, GitFileStatus } from '../../../git/models/file'; import { GitFileChange } from '../../../git/models/file'; import type { GitGraph, + GitGraphHostingServiceType, GitGraphRow, GitGraphRowContexts, GitGraphRowHead, @@ -2201,6 +2202,7 @@ export class LocalGitProvider implements GitProvider, Disposable { avatarUrl: avatarUrl, context: serializeWebviewItemContext(context), current: tip === headRefUpstreamName, + hostingServiceType: remote.provider?.id as GitGraphHostingServiceType, }; refRemoteHeads.push(refRemoteHead); diff --git a/src/git/models/graph.ts b/src/git/models/graph.ts index ebaa95f64ad52..4fb4adcd7ab26 100644 --- a/src/git/models/graph.ts +++ b/src/git/models/graph.ts @@ -1,7 +1,17 @@ -import type { GraphRow, Head, Remote, RowContexts, RowStats, Tag } from '@gitkraken/gitkraken-components'; +import type { + GraphRow, + Head, + HostingServiceType, + Remote, + RowContexts, + RowStats, + Tag, +} from '@gitkraken/gitkraken-components'; import type { GitBranch } from './branch'; import type { GitRemote } from './remote'; +export type GitGraphHostingServiceType = HostingServiceType; + export type GitGraphRowHead = Head; export type GitGraphRowRemoteHead = Remote; export type GitGraphRowTag = Tag; diff --git a/src/plus/github/githubGitProvider.ts b/src/plus/github/githubGitProvider.ts index 03cfcea72b3a1..b202a368c366c 100644 --- a/src/plus/github/githubGitProvider.ts +++ b/src/plus/github/githubGitProvider.ts @@ -48,6 +48,7 @@ import type { GitFile } from '../../git/models/file'; import { GitFileChange, GitFileIndexStatus } from '../../git/models/file'; import type { GitGraph, + GitGraphHostingServiceType, GitGraphRow, GitGraphRowContexts, GitGraphRowHead, @@ -1409,6 +1410,7 @@ export class GitHubGitProvider implements GitProvider, Disposable { avatarUrl: avatarUrl, context: serializeWebviewItemContext(context), current: true, + hostingServiceType: remote.provider?.id as GitGraphHostingServiceType, }, ]; @@ -1460,6 +1462,7 @@ export class GitHubGitProvider implements GitProvider, Disposable { url: remote.url, avatarUrl: avatarUrl, context: serializeWebviewItemContext(context), + hostingServiceType: remote.provider?.id as GitGraphHostingServiceType, }); } } diff --git a/src/webviews/apps/plus/graph/GraphWrapper.tsx b/src/webviews/apps/plus/graph/GraphWrapper.tsx index f3e969d51678a..c342f2e6c2947 100644 --- a/src/webviews/apps/plus/graph/GraphWrapper.tsx +++ b/src/webviews/apps/plus/graph/GraphWrapper.tsx @@ -111,6 +111,13 @@ const createIconElements = (): Record => { const iconList = [ 'head', 'remote', + 'remote-github', + 'remote-githubEnterprise', + 'remote-gitlab', + 'remote-gitlabSelfHosted', + 'remote-bitbucket', + 'remote-bitbucketServer', + 'remote-azureDevops', 'tag', 'stash', 'check', diff --git a/src/webviews/apps/plus/graph/graph.scss b/src/webviews/apps/plus/graph/graph.scss index 266fea363ddca..b1a0ef1a0de2d 100644 --- a/src/webviews/apps/plus/graph/graph.scss +++ b/src/webviews/apps/plus/graph/graph.scss @@ -622,6 +622,37 @@ button:not([disabled]), content: '\ebaa'; } } + &--remote-github, + &--remote-githubEnterprise { + &::before { + // codicon-github-inverted + font-family: codicon; + content: '\eba1'; + } + } + &--remote-gitlab, + &--remote-gitlabSelfHosted { + &::before { + // glicon-provider-gitlab + font-family: 'glicons'; + content: '\f123'; + } + } + &--remote-bitbucket, + &--remote-bitbucketServer { + &::before { + // glicon-provider-bitbucket + font-family: 'glicons'; + content: '\f11f'; + } + } + &--remote-azureDevops { + &::before { + // glicon-provider-azdo + font-family: 'glicons'; + content: '\f11e'; + } + } &--tag { &::before { // codicon-tag diff --git a/yarn.lock b/yarn.lock index 35c0cc154850a..411114e95b2ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -223,10 +223,10 @@ resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.1.4.tgz#19654d1026cc410975d46445180e70a5089b3e7d" integrity sha512-qprfWkn82Iw821mcKofJ5Pk9wgioHicxcQMxx+5zt5GSKoqdWvgG5AxVmpmUUjzTLPVSH5auBrhI93Deayn/DA== -"@gitkraken/gitkraken-components@10.1.25": - version "10.1.25" - resolved "https://registry.yarnpkg.com/@gitkraken/gitkraken-components/-/gitkraken-components-10.1.25.tgz#0e710ae118c4c70982b730fb1a00f3c16328678b" - integrity sha512-UeZVdnVEyL/yEtD9fhCTHUXFogJeRVjglbswp1Gf5ekuzDtuRZqAmyU1MOhMKdIa9X6XOufTJg7z/FyNyuNELw== +"@gitkraken/gitkraken-components@10.1.27": + version "10.1.27" + resolved "https://registry.npmjs.org/@gitkraken/gitkraken-components/-/gitkraken-components-10.1.27.tgz#18a9430678d7cef6a6476f8fcab956ea26dca76e" + integrity sha512-NiQ6M7J2sfrGfB2RRaIzMuM9l67GXY5BbgNVnQJajHa3zmuPN3ImLZ92Qxn0nn/0ZsrvVDaY6ZShnPRBNnbmeA== dependencies: "@axosoft/react-virtualized" "9.22.3-gitkraken.3" classnames "2.3.2" From 77beea79561595a088d63a6526b8d0ccf8502ca0 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon <67011668+axosoft-ramint@users.noreply.github.com> Date: Thu, 5 Oct 2023 09:57:12 -0700 Subject: [PATCH 0022/1012] Updates license strings (#2945) * Updates 'GitLens X' and 'Pro trial' patterns * Updates base/default plan name --- README.md | 12 ++++++------ package.json | 14 +++++++------- src/git/remotes/richRemoteProvider.ts | 2 +- src/plus/subscription/subscriptionService.ts | 6 +++--- src/plus/workspaces/workspacesService.ts | 2 +- src/quickpicks/items/directive.ts | 2 +- src/subscription.ts | 14 +++++++------- .../plus/account/components/account-content.ts | 14 +++++++------- .../shared/components/feature-gate-plus-state.ts | 11 +++++++---- src/webviews/apps/welcome/welcome.html | 2 +- 10 files changed, 41 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 19ef4e0bfe781..7f7a05ba0fd39 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ See the [FAQ](#is-gitlens-free-to-use 'Jump to FAQ') for more details. [Features](#discover-powerful-features 'Jump to Discover Powerful Features') | [Labs](#gitkraken-labs 'Jump to GitKraken Labs') -| [Pro](#ready-for-gitlens-pro 'Jump to Ready for GitLens Pro?') +| [Pro](#ready-for-gitlens-pro 'Jump to Ready for GitKraken Pro?') | [FAQ](#faq 'Jump to FAQ') | [Support and Community](#support-and-community 'Jump to Support and Community') | [Contributing](#contributing 'Jump to Contributing') @@ -257,11 +257,11 @@ Use the Explain panel on the **Commit Details** view to leverage AI to help you Use the `Generate Commit Message` command from the Source Control view's context menu to automatically generate a commit message for your staged changes by leveraging AI. -# Ready for GitLens Pro? +# Ready for GitKraken Pro? -When you're ready to unlock the full potential of GitLens and enjoy all the benefits on your privately hosted repos, consider upgrading to GitLens Pro. With GitLens Pro, you'll gain access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan. +When you're ready to unlock the full potential of GitLens and enjoy all the benefits on your privately hosted repos, consider upgrading to GitKraken Pro. With GitKraken Pro, you'll gain access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan. -To learn more about the pricing and the additional ✨ and ☁️ features offered with GitLens Pro, visit the [GitLens Pricing page](https://www.gitkraken.com/gitlens/pricing). Upgrade to GitLens Pro today and take your Git workflow to the next level! +To learn more about the pricing and the additional ✨ and ☁️ features offered with GitKraken Pro, visit the [GitLens Pricing page](https://www.gitkraken.com/gitlens/pricing). Upgrade to GitKraken Pro today and take your Git workflow to the next level! # FAQ @@ -274,7 +274,7 @@ Yes. All features are free to use on all repos, **except** for features, While GitLens offers a remarkable set of free features, a subset of features tailored for professional developers and teams, marked with a ✨, require a trial or paid plan for use on privately hosted repos — use on local or publicly hosted repos is free for everyone. Additionally some features marked with a ☁️, rely on GitKraken Dev Services which requires an account and access is based on your plan, e.g. Free, Pro, etc. -Preview ✨ features instantly for free for 3 days without an account, or start a free Pro trial to get an additional 7 days and gain access to ☁️ features to experience the full power of GitLens. +Preview ✨ features instantly for free for 3 days without an account, or start a free GitKraken trial to get an additional 7 days and gain access to ☁️ features to experience the full power of GitLens. ## Are ✨ and ☁️ features free to use? @@ -300,7 +300,7 @@ Join the GitLens community on [GitHub Discussions](https://github.com/gitkraken/ For any issues or inquiries related to GitLens, you can reach out to the GitKraken support team via the [official support page](https://support.gitkraken.com/). They will be happy to assist you with any problems you may encounter. -With GitLens Pro, you gain access to priority email support from our customer success team, ensuring higher priority and faster response times. Custom onboarding and training are also available to help you and your team quickly get up and running with a GitLens Pro plan. +With GitKraken Pro, you gain access to priority email support from our customer success team, ensuring higher priority and faster response times. Custom onboarding and training are also available to help you and your team quickly get up and running with a GitKraken Pro plan. # Contributing diff --git a/package.json b/package.json index 60509b15fc2a0..03f696f902711 100644 --- a/package.json +++ b/package.json @@ -14448,7 +14448,7 @@ }, { "view": "gitlens.views.workspaces", - "contents": "[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free 7-day Pro trial to use GitKraken Workspaces, or [sign in](command:gitlens.plus.loginOrSignUp).\n☁️ Requires an account and access is based on your plan, e.g. Free, Pro, etc", + "contents": "[Start Free GitKraken Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free 7-day GitKraken trial to use GitKraken Workspaces, or [sign in](command:gitlens.plus.loginOrSignUp).\n☁️ Requires an account and access is based on your plan, e.g. Free, Pro, etc", "when": "!gitlens:plus" }, { @@ -14468,17 +14468,17 @@ }, { "view": "gitlens.views.worktrees", - "contents": "[Preview Pro](command:gitlens.plus.startPreviewTrial)\n\nPreview Pro for 3 days, or [sign in](command:gitlens.plus.loginOrSignUp) to start a full 7-day Pro trial.\n✨ A trial or paid plan is required to use this on privately hosted repos.", + "contents": "[Preview Pro](command:gitlens.plus.startPreviewTrial)\n\nPreview Pro for 3 days, or [sign in](command:gitlens.plus.loginOrSignUp) to start a full 7-day GitKraken trial.\n✨ A trial or paid plan is required to use this on privately hosted repos.", "when": "gitlens:plus:required && gitlens:plus:state == 0" }, { "view": "gitlens.views.worktrees", - "contents": "Your 3-day Pro preview has ended, start a free Pro trial to get an additional 7 days, or [sign in](command:gitlens.plus.loginOrSignUp).\n\n[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n✨ A trial or paid plan is required to use this on privately hosted repos.", + "contents": "Your 3-day Pro preview has ended, start a free GitKraken trial to get an additional 7 days, or [sign in](command:gitlens.plus.loginOrSignUp).\n\n[Start Free GitKraken Trial](command:gitlens.plus.loginOrSignUp)\n✨ A trial or paid plan is required to use this on privately hosted repos.", "when": "gitlens:plus:required && gitlens:plus:state == 2" }, { "view": "gitlens.views.worktrees", - "contents": "Your Pro trial has ended, please upgrade to continue to use this on privately hosted repos.\n\n[Upgrade to Pro](command:gitlens.plus.purchase)\n✨ A paid plan is required to use this on privately hosted repos.", + "contents": "Your GitKraken trial has ended, please upgrade to continue to use this on privately hosted repos.\n\n[Upgrade to Pro](command:gitlens.plus.purchase)\n✨ A paid plan is required to use this on privately hosted repos.", "when": "gitlens:plus:required && gitlens:plus:state == 4" } ], @@ -14732,8 +14732,8 @@ }, { "id": "gitlens.welcome.preview", - "title": "Previewing GitLens Pro", - "description": "During your preview, you have access to ✨ features on privately hosted repos. [Learn more](https://www.gitkraken.com/gitlens/pro-features)\n\n[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free Pro trial to get an additional 7 days.", + "title": "Previewing GitKraken Pro", + "description": "During your preview, you have access to ✨ features on privately hosted repos. [Learn more](https://www.gitkraken.com/gitlens/pro-features)\n\n[Start Free GitKraken Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free GitKraken trial to get an additional 7 days.", "media": { "markdown": "walkthroughs/welcome/preview.md" }, @@ -14741,7 +14741,7 @@ }, { "id": "gitlens.welcome.trial", - "title": "Trialing GitLens Pro", + "title": "Trialing GitKraken Pro", "description": "During your trial, you have access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan. [Learn more](https://www.gitkraken.com/gitlens/pro-features)\n\n[Upgrade to Pro](command:gitlens.plus.purchase)", "media": { "markdown": "walkthroughs/welcome/trial.md" diff --git a/src/git/remotes/richRemoteProvider.ts b/src/git/remotes/richRemoteProvider.ts index 9c552f3ae284c..ed3464d56d163 100644 --- a/src/git/remotes/richRemoteProvider.ts +++ b/src/git/remotes/richRemoteProvider.ts @@ -578,7 +578,7 @@ export async function ensurePaidPlan(providerName: string, container: Container) void container.subscription.startPreviewTrial(); break; } else if (subscription.account == null) { - const signIn = { title: 'Start Free Pro Trial' }; + const signIn = { title: 'Start Free GitKraken Trial' }; const cancel = { title: 'Cancel', isCloseAffordance: true }; const result = await window.showWarningMessage( `${title}\n\nDo you want to continue to use ✨ features on privately hosted repos, free for an additional 7 days?`, diff --git a/src/plus/subscription/subscriptionService.ts b/src/plus/subscription/subscriptionService.ts index 0f9359d2f5def..759bf4d53cbeb 100644 --- a/src/plus/subscription/subscriptionService.ts +++ b/src/plus/subscription/subscriptionService.ts @@ -419,10 +419,10 @@ export class SubscriptionService implements Disposable { void this.showAccountView(); if (!silent && plan.effective.id === SubscriptionPlanId.Free) { - const confirm: MessageItem = { title: 'Start Free Pro Trial', isCloseAffordance: true }; + const confirm: MessageItem = { title: 'Start Free GitKraken Trial', isCloseAffordance: true }; const cancel: MessageItem = { title: 'Cancel' }; const result = await window.showInformationMessage( - 'Your 3-day Pro preview has ended, start a free Pro trial to get an additional 7 days.\n\n✨ A trial or paid plan is required to use Pro features on privately hosted repos.', + 'Your 3-day Pro preview has ended, start a free GitKraken trial to get an additional 7 days.\n\n✨ A trial or paid plan is required to use Pro features on privately hosted repos.', { modal: true }, confirm, cancel, @@ -475,7 +475,7 @@ export class SubscriptionService implements Disposable { `You can now preview Pro features for ${pluralize( 'day', days, - )}. After which, you can start a free Pro trial for an additional 7 days.`, + )}. After which, you can start a free GitKraken trial for an additional 7 days.`, confirm, learn, ); diff --git a/src/plus/workspaces/workspacesService.ts b/src/plus/workspaces/workspacesService.ts index 0f209981699ec..df9b9041c9fe4 100644 --- a/src/plus/workspaces/workspacesService.ts +++ b/src/plus/workspaces/workspacesService.ts @@ -163,7 +163,7 @@ export class WorkspacesService implements Disposable { cloudWorkspaces: cloudWorkspaces, cloudWorkspaceInfo: filteredSharedWorkspaceCount > 0 - ? `${filteredSharedWorkspaceCount} shared workspaces hidden - upgrade to GitLens Pro to access.` + ? `${filteredSharedWorkspaceCount} shared workspaces hidden - upgrade to GitKraken Pro to access.` : undefined, }; } diff --git a/src/quickpicks/items/directive.ts b/src/quickpicks/items/directive.ts index c3b942649d05b..ebdbacdd503e9 100644 --- a/src/quickpicks/items/directive.ts +++ b/src/quickpicks/items/directive.ts @@ -47,7 +47,7 @@ export function createDirectiveQuickPickItem( detail = 'Preview Pro for 3-days to use this on privately hosted repos'; break; case Directive.ExtendTrial: - label = 'Start Free Pro Trial'; + label = 'Start Free GitKraken Trial'; detail = 'Continue to use this on privately hosted repos, free for an additional 7 days'; break; case Directive.RequiresVerification: diff --git a/src/subscription.ts b/src/subscription.ts index c2719718b4974..3cb3732804b3f 100644 --- a/src/subscription.ts +++ b/src/subscription.ts @@ -131,16 +131,16 @@ export function getSubscriptionPlan( export function getSubscriptionPlanName(id: SubscriptionPlanId) { switch (id) { case SubscriptionPlanId.FreePlus: - return 'GitLens Free'; + return 'GitKraken Free'; case SubscriptionPlanId.Pro: - return 'GitLens Pro'; + return 'GitKraken Pro'; case SubscriptionPlanId.Teams: - return 'GitLens Teams'; + return 'GitKraken Teams'; case SubscriptionPlanId.Enterprise: - return 'GitLens Enterprise'; + return 'GitKraken Enterprise'; case SubscriptionPlanId.Free: default: - return 'GitLens'; + return 'GitKraken'; } } @@ -153,14 +153,14 @@ export function getSubscriptionStatePlanName(state: SubscriptionState | undefine case SubscriptionState.FreePlusInTrial: return `${getSubscriptionPlanName(id ?? SubscriptionPlanId.Pro)} (Trial)`; case SubscriptionState.VerificationRequired: - return `GitLens (Unverified)`; + return `GitKraken (Unverified)`; case SubscriptionState.Paid: return getSubscriptionPlanName(id ?? SubscriptionPlanId.Pro); case SubscriptionState.Free: case SubscriptionState.FreePreviewTrialExpired: case null: default: - return 'GitLens'; + return 'GitKraken'; } } diff --git a/src/webviews/apps/plus/account/components/account-content.ts b/src/webviews/apps/plus/account/components/account-content.ts index 8ed47c64c4f89..5ca90b1929504 100644 --- a/src/webviews/apps/plus/account/components/account-content.ts +++ b/src/webviews/apps/plus/account/components/account-content.ts @@ -97,10 +97,10 @@ export class AccountContent extends LitElement { case SubscriptionState.Free: case SubscriptionState.FreePreviewTrialExpired: case SubscriptionState.FreePlusTrialExpired: - return 'GitLens Free'; + return 'GitKraken Free'; case SubscriptionState.FreeInPreviewTrial: case SubscriptionState.FreePlusInTrial: - return 'GitLens Pro (Trial)'; + return 'GitKraken Pro (Trial)'; case SubscriptionState.VerificationRequired: return `${this.plan} (Unverified)`; default: @@ -171,14 +171,14 @@ export class AccountContent extends LitElement { Sign Up -

Signing up starts a free 7-day Pro trial.

+

Signing up starts a free 7-day GitKraken trial.

`; case SubscriptionState.FreePlusTrialExpired: return html`

- Your Pro trial has ended, please upgrade to continue to use ✨ features on privately hosted - repos. + Your GitKraken trial has ended, please upgrade to continue to use ✨ features on privately + hosted repos.

Upgrade to Pro @@ -192,8 +192,8 @@ export class AccountContent extends LitElement { case SubscriptionState.FreePlusInTrial: return html`

- Your have ${this.daysRemaining} remaining in your Pro trial. Once your trial ends, you'll need a - paid plan to continue using ✨ features. + Your have ${this.daysRemaining} remaining in your GitKraken trial. Once your trial ends, you'll + need a paid plan to continue using ✨ features.

Upgrade to Pro diff --git a/src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts b/src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts index 11c2db015b5aa..c29c371361184 100644 --- a/src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts +++ b/src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts @@ -76,7 +76,7 @@ export class FeatureGatePlusState extends LitElement { >

Preview Pro for 3 days, or - sign in to start a full 7-day Pro trial. + sign in to start a full 7-day GitKraken trial.

✨ A trial or paid plan is required to use this on privately hosted repos.

`; @@ -84,18 +84,21 @@ export class FeatureGatePlusState extends LitElement { case SubscriptionState.FreePreviewTrialExpired: return html`

- Your 3-day Pro preview has ended, start a free Pro trial to get an additional 7 days, or + Your 3-day Pro preview has ended, start a free GitKraken trial to get an additional 7 days, or sign in.

Start Free Pro TrialStart Free GitKraken Trial

✨ A trial or paid plan is required to use this on privately hosted repos.

`; case SubscriptionState.FreePlusTrialExpired: return html` -

Your Pro trial has ended, please upgrade to continue to use this on privately hosted repos.

+

+ Your GitKraken trial has ended, please upgrade to continue to use this on privately hosted + repos. +

Upgrade to Pro diff --git a/src/webviews/apps/welcome/welcome.html b/src/webviews/apps/welcome/welcome.html index 85fc68bda28de..8349e0713a255 100644 --- a/src/webviews/apps/welcome/welcome.html +++ b/src/webviews/apps/welcome/welcome.html @@ -392,7 +392,7 @@

Try Pro ✨

Unlock the full power of GitLens ✨ and ☁️ features

Start a Pro trialStart a GitKraken trial  or sign in

From 414edb15f44fb14da70e5641c9a586563c9e9838 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Thu, 5 Oct 2023 10:06:23 -0700 Subject: [PATCH 0023/1012] Fixes lint --- src/plus/github/models.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plus/github/models.ts b/src/plus/github/models.ts index ca1ceae729611..5627ae443c912 100644 --- a/src/plus/github/models.ts +++ b/src/plus/github/models.ts @@ -1,6 +1,6 @@ import type { Endpoints } from '@octokit/types'; import { GitFileIndexStatus } from '../../git/models/file'; -import type { IssueLabel, IssueMember, IssueOrPullRequestType } from '../../git/models/issue'; +import type { IssueLabel, IssueOrPullRequestType } from '../../git/models/issue'; import { Issue } from '../../git/models/issue'; import type { PullRequestState } from '../../git/models/pullRequest'; import { PullRequest, PullRequestMergeableState, PullRequestReviewDecision } from '../../git/models/pullRequest'; From 7dcfedfc4586174b198560c5b7537a353c3ac5fd Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Thu, 5 Oct 2023 22:17:18 -0400 Subject: [PATCH 0024/1012] Updates enrichment to match by url --- src/plus/webviews/focus/focusWebview.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plus/webviews/focus/focusWebview.ts b/src/plus/webviews/focus/focusWebview.ts index df389f98373ea..b1eb111969f9b 100644 --- a/src/plus/webviews/focus/focusWebview.ts +++ b/src/plus/webviews/focus/focusWebview.ts @@ -630,9 +630,9 @@ function findEnrichedItems( let result; // TODO: filter by entity id, type, and gitRepositoryId if ((item as SearchedPullRequestWithRemote).pullRequest != null) { - result = enrichedItems.filter(e => e.entityId === (item as SearchedPullRequestWithRemote).pullRequest.nodeId); + result = enrichedItems.filter(e => e.entityUrl === (item as SearchedPullRequestWithRemote).pullRequest.url); } else { - result = enrichedItems.filter(e => e.entityId === (item as SearchedIssueWithRank).issue.nodeId); + result = enrichedItems.filter(e => e.entityUrl === (item as SearchedIssueWithRank).issue.url); } if (result.length === 0) return; From 4f9fb3cd167ccb6061a42380f17fd63f6900e78a Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 6 Oct 2023 13:48:13 -0400 Subject: [PATCH 0025/1012] Updates dependencies & TypeScript 5.3-beta --- package.json | 14 +-- yarn.lock | 244 +++++++++++++++++++++++++-------------------------- 2 files changed, 128 insertions(+), 130 deletions(-) diff --git a/package.json b/package.json index 03f696f902711..cece2f619b4fe 100644 --- a/package.json +++ b/package.json @@ -14816,7 +14816,7 @@ }, "dependencies": { "@gitkraken/gitkraken-components": "10.1.27", - "@gitkraken/shared-web-components": "^0.1.1-rc.11", + "@gitkraken/shared-web-components": "0.1.1-rc.11", "@microsoft/fast-element": "1.12.0", "@microsoft/fast-react-wrapper": "0.3.19", "@octokit/graphql": "7.0.2", @@ -14845,9 +14845,9 @@ "@types/react-dom": "17.0.17", "@types/sortablejs": "1.15.2", "@types/vscode": "1.80.0", - "@typescript-eslint/eslint-plugin": "6.7.3", - "@typescript-eslint/parser": "6.7.3", - "@vscode/test-electron": "2.3.4", + "@typescript-eslint/eslint-plugin": "6.7.4", + "@typescript-eslint/parser": "6.7.4", + "@vscode/test-electron": "2.3.5", "@vscode/test-web": "0.0.46", "@vscode/vsce": "2.21.1", "circular-dependency-plugin": "5.2.2", @@ -14860,7 +14860,7 @@ "cssnano-preset-advanced": "6.0.1", "esbuild": "0.19.4", "esbuild-loader": "4.0.2", - "esbuild-sass-plugin": "2.15.0", + "esbuild-sass-plugin": "2.16.0", "eslint": "8.50.0", "eslint-cli": "1.1.1", "eslint-config-prettier": "9.0.0", @@ -14880,7 +14880,7 @@ "mini-css-extract-plugin": "2.7.6", "mocha": "10.2.0", "prettier": "3.0.3", - "sass": "1.68.0", + "sass": "1.69.0", "sass-loader": "13.3.2", "schema-utils": "4.2.0", "sharp": "0.32.6", @@ -14888,7 +14888,7 @@ "terser-webpack-plugin": "5.3.9", "ts-loader": "9.4.4", "tsc-alias": "1.8.8", - "typescript": "5.2.2", + "typescript": "5.3.0-beta", "webpack": "5.88.2", "webpack-bundle-analyzer": "4.9.1", "webpack-cli": "5.1.4", diff --git a/yarn.lock b/yarn.lock index 411114e95b2ec..5574288dfb238 100644 --- a/yarn.lock +++ b/yarn.lock @@ -179,9 +179,9 @@ eslint-visitor-keys "^3.3.0" "@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1": - version "4.9.0" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.9.0.tgz#7ccb5f58703fa61ffdcbf39e2c604a109e781162" - integrity sha512-zJmuCWj2VLBt4c25CfBIbMZLGLyhkvs7LznyVX5HfpzeocThgIj5XQK4L+g3U36mMcx8bPMhGyPpwCATamC4jQ== + version "4.9.1" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.9.1.tgz#449dfa81a57a1d755b09aa58d826c1262e4283b4" + integrity sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA== "@eslint/eslintrc@^2.1.2": version "2.1.2" @@ -219,13 +219,13 @@ "@floating-ui/utils" "^0.1.3" "@floating-ui/utils@^0.1.3": - version "0.1.4" - resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.1.4.tgz#19654d1026cc410975d46445180e70a5089b3e7d" - integrity sha512-qprfWkn82Iw821mcKofJ5Pk9wgioHicxcQMxx+5zt5GSKoqdWvgG5AxVmpmUUjzTLPVSH5auBrhI93Deayn/DA== + version "0.1.6" + resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.1.6.tgz#22958c042e10b67463997bd6ea7115fe28cbcaf9" + integrity sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A== "@gitkraken/gitkraken-components@10.1.27": version "10.1.27" - resolved "https://registry.npmjs.org/@gitkraken/gitkraken-components/-/gitkraken-components-10.1.27.tgz#18a9430678d7cef6a6476f8fcab956ea26dca76e" + resolved "https://registry.yarnpkg.com/@gitkraken/gitkraken-components/-/gitkraken-components-10.1.27.tgz#18a9430678d7cef6a6476f8fcab956ea26dca76e" integrity sha512-NiQ6M7J2sfrGfB2RRaIzMuM9l67GXY5BbgNVnQJajHa3zmuPN3ImLZ92Qxn0nn/0ZsrvVDaY6ZShnPRBNnbmeA== dependencies: "@axosoft/react-virtualized" "9.22.3-gitkraken.3" @@ -237,9 +237,9 @@ react-dragula "1.1.17" react-onclickoutside "^6.13.0" -"@gitkraken/shared-web-components@^0.1.1-rc.11": +"@gitkraken/shared-web-components@0.1.1-rc.11": version "0.1.1-rc.11" - resolved "https://registry.npmjs.org/@gitkraken/shared-web-components/-/shared-web-components-0.1.1-rc.11.tgz#0d588af0a9c92a6ccf2339a341787c6d9d60227c" + resolved "https://registry.yarnpkg.com/@gitkraken/shared-web-components/-/shared-web-components-0.1.1-rc.11.tgz#0d588af0a9c92a6ccf2339a341787c6d9d60227c" integrity sha512-lslDHNgU2znzoLydkLudETHP0WlRBLdV25YgRSTcm724Elah5nFfqUdJZ8lQCKehxJBnlWtll5uTxuM+7wxVDw== dependencies: "@floating-ui/dom" "^1.4.2" @@ -696,9 +696,9 @@ integrity sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q== "@types/node@*": - version "20.8.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.0.tgz#10ddf0119cf20028781c06d7115562934e53f745" - integrity sha512-LzcWltT83s1bthcvjBmiBvGJiiUe84NWRHkw+ZV6Fr41z2FbIzvc815dk2nQ3RAKMuN2fkenM/z3Xv2QzEpYxQ== + version "20.8.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.2.tgz#d76fb80d87d0d8abfe334fc6d292e83e5524efc4" + integrity sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w== "@types/node@16.11.47": version "16.11.47" @@ -716,9 +716,9 @@ integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== "@types/prop-types@*": - version "15.7.7" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.7.tgz#f9361f7b87fd5d8188b2c998db0a1f47e9fb391a" - integrity sha512-FbtmBWCcSa2J4zL781Zf1p5YUBXQomPEcep9QZCfRfQgTxz3pJWiDFLebohZ9fFntX5ibzOkSsrJ0TEew8cAog== + version "15.7.8" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.8.tgz#805eae6e8f41bd19e88917d2ea200dc992f405d3" + integrity sha512-kMpQpfZKSCBqltAJwskgePRaYRFukDkm1oItcAbC3gNELR20XIBcN9VRgg4+m8DKsTfkWeA4m4Imp4DDuWy7FQ== "@types/react-dom@17.0.17": version "17.0.17" @@ -782,16 +782,16 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@6.7.3": - version "6.7.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.3.tgz#d98046e9f7102d49a93d944d413c6055c47fafd7" - integrity sha512-vntq452UHNltxsaaN+L9WyuMch8bMd9CqJ3zhzTPXXidwbf5mqqKCVXEuvRZUqLJSTLeWE65lQwyXsRGnXkCTA== +"@typescript-eslint/eslint-plugin@6.7.4": + version "6.7.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.4.tgz#057338df21b6062c2f2fc5999fbea8af9973ac6d" + integrity sha512-DAbgDXwtX+pDkAHwiGhqP3zWUGpW49B7eqmgpPtg+BKJXwdct79ut9+ifqOFPJGClGKSHXn2PTBatCnldJRUoA== dependencies: "@eslint-community/regexpp" "^4.5.1" - "@typescript-eslint/scope-manager" "6.7.3" - "@typescript-eslint/type-utils" "6.7.3" - "@typescript-eslint/utils" "6.7.3" - "@typescript-eslint/visitor-keys" "6.7.3" + "@typescript-eslint/scope-manager" "6.7.4" + "@typescript-eslint/type-utils" "6.7.4" + "@typescript-eslint/utils" "6.7.4" + "@typescript-eslint/visitor-keys" "6.7.4" debug "^4.3.4" graphemer "^1.4.0" ignore "^5.2.4" @@ -799,72 +799,72 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/parser@6.7.3": - version "6.7.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.7.3.tgz#aaf40092a32877439e5957e18f2d6a91c82cc2fd" - integrity sha512-TlutE+iep2o7R8Lf+yoer3zU6/0EAUc8QIBB3GYBc1KGz4c4TRm83xwXUZVPlZ6YCLss4r77jbu6j3sendJoiQ== +"@typescript-eslint/parser@6.7.4": + version "6.7.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.7.4.tgz#23d1dd4fe5d295c7fa2ab651f5406cd9ad0bd435" + integrity sha512-I5zVZFY+cw4IMZUeNCU7Sh2PO5O57F7Lr0uyhgCJmhN/BuTlnc55KxPonR4+EM3GBdfiCyGZye6DgMjtubQkmA== dependencies: - "@typescript-eslint/scope-manager" "6.7.3" - "@typescript-eslint/types" "6.7.3" - "@typescript-eslint/typescript-estree" "6.7.3" - "@typescript-eslint/visitor-keys" "6.7.3" + "@typescript-eslint/scope-manager" "6.7.4" + "@typescript-eslint/types" "6.7.4" + "@typescript-eslint/typescript-estree" "6.7.4" + "@typescript-eslint/visitor-keys" "6.7.4" debug "^4.3.4" -"@typescript-eslint/scope-manager@6.7.3": - version "6.7.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.7.3.tgz#07e5709c9bdae3eaf216947433ef97b3b8b7d755" - integrity sha512-wOlo0QnEou9cHO2TdkJmzF7DFGvAKEnB82PuPNHpT8ZKKaZu6Bm63ugOTn9fXNJtvuDPanBc78lGUGGytJoVzQ== +"@typescript-eslint/scope-manager@6.7.4": + version "6.7.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.7.4.tgz#a484a17aa219e96044db40813429eb7214d7b386" + integrity sha512-SdGqSLUPTXAXi7c3Ob7peAGVnmMoGzZ361VswK2Mqf8UOYcODiYvs8rs5ILqEdfvX1lE7wEZbLyELCW+Yrql1A== dependencies: - "@typescript-eslint/types" "6.7.3" - "@typescript-eslint/visitor-keys" "6.7.3" + "@typescript-eslint/types" "6.7.4" + "@typescript-eslint/visitor-keys" "6.7.4" -"@typescript-eslint/type-utils@6.7.3": - version "6.7.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.7.3.tgz#c2c165c135dda68a5e70074ade183f5ad68f3400" - integrity sha512-Fc68K0aTDrKIBvLnKTZ5Pf3MXK495YErrbHb1R6aTpfK5OdSFj0rVN7ib6Tx6ePrZ2gsjLqr0s98NG7l96KSQw== +"@typescript-eslint/type-utils@6.7.4": + version "6.7.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.7.4.tgz#847cd3b59baf948984499be3e0a12ff07373e321" + integrity sha512-n+g3zi1QzpcAdHFP9KQF+rEFxMb2KxtnJGID3teA/nxKHOVi3ylKovaqEzGBbVY2pBttU6z85gp0D00ufLzViQ== dependencies: - "@typescript-eslint/typescript-estree" "6.7.3" - "@typescript-eslint/utils" "6.7.3" + "@typescript-eslint/typescript-estree" "6.7.4" + "@typescript-eslint/utils" "6.7.4" debug "^4.3.4" ts-api-utils "^1.0.1" -"@typescript-eslint/types@6.7.3": - version "6.7.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.7.3.tgz#0402b5628a63f24f2dc9d4a678e9a92cc50ea3e9" - integrity sha512-4g+de6roB2NFcfkZb439tigpAMnvEIg3rIjWQ+EM7IBaYt/CdJt6em9BJ4h4UpdgaBWdmx2iWsafHTrqmgIPNw== +"@typescript-eslint/types@6.7.4": + version "6.7.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.7.4.tgz#5d358484d2be986980c039de68e9f1eb62ea7897" + integrity sha512-o9XWK2FLW6eSS/0r/tgjAGsYasLAnOWg7hvZ/dGYSSNjCh+49k5ocPN8OmG5aZcSJ8pclSOyVKP2x03Sj+RrCA== -"@typescript-eslint/typescript-estree@6.7.3": - version "6.7.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.3.tgz#ec5bb7ab4d3566818abaf0e4a8fa1958561b7279" - integrity sha512-YLQ3tJoS4VxLFYHTw21oe1/vIZPRqAO91z6Uv0Ss2BKm/Ag7/RVQBcXTGcXhgJMdA4U+HrKuY5gWlJlvoaKZ5g== +"@typescript-eslint/typescript-estree@6.7.4": + version "6.7.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.4.tgz#f2baece09f7bb1df9296e32638b2e1130014ef1a" + integrity sha512-ty8b5qHKatlNYd9vmpHooQz3Vki3gG+3PchmtsA4TgrZBKWHNjWfkQid7K7xQogBqqc7/BhGazxMD5vr6Ha+iQ== dependencies: - "@typescript-eslint/types" "6.7.3" - "@typescript-eslint/visitor-keys" "6.7.3" + "@typescript-eslint/types" "6.7.4" + "@typescript-eslint/visitor-keys" "6.7.4" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/utils@6.7.3": - version "6.7.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.7.3.tgz#96c655816c373135b07282d67407cb577f62e143" - integrity sha512-vzLkVder21GpWRrmSR9JxGZ5+ibIUSudXlW52qeKpzUEQhRSmyZiVDDj3crAth7+5tmN1ulvgKaCU2f/bPRCzg== +"@typescript-eslint/utils@6.7.4": + version "6.7.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.7.4.tgz#2236f72b10e38277ee05ef06142522e1de470ff2" + integrity sha512-PRQAs+HUn85Qdk+khAxsVV+oULy3VkbH3hQ8hxLRJXWBEd7iI+GbQxH5SEUSH7kbEoTp6oT1bOwyga24ELALTA== dependencies: "@eslint-community/eslint-utils" "^4.4.0" "@types/json-schema" "^7.0.12" "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "6.7.3" - "@typescript-eslint/types" "6.7.3" - "@typescript-eslint/typescript-estree" "6.7.3" + "@typescript-eslint/scope-manager" "6.7.4" + "@typescript-eslint/types" "6.7.4" + "@typescript-eslint/typescript-estree" "6.7.4" semver "^7.5.4" -"@typescript-eslint/visitor-keys@6.7.3": - version "6.7.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.3.tgz#83809631ca12909bd2083558d2f93f5747deebb2" - integrity sha512-HEVXkU9IB+nk9o63CeICMHxFWbHWr3E1mpilIQBe9+7L/lH97rleFLVtYsfnWB+JVMaiFnEaxvknvmIzX+CqVg== +"@typescript-eslint/visitor-keys@6.7.4": + version "6.7.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.4.tgz#80dfecf820fc67574012375859085f91a4dff043" + integrity sha512-pOW37DUhlTZbvph50x5zZCkFn3xzwkGtNoJHzIM3svpiSkJzwOYr/kVBaXmf+RAQiUDs1AHEZVNPg6UJCJpwRA== dependencies: - "@typescript-eslint/types" "6.7.3" + "@typescript-eslint/types" "6.7.4" eslint-visitor-keys "^3.4.1" "@vscode/codicons@0.0.33": @@ -872,10 +872,10 @@ resolved "https://registry.yarnpkg.com/@vscode/codicons/-/codicons-0.0.33.tgz#a56243ab5492801fff04e53c0aab0d18a6521751" integrity sha512-VdgpnD75swH9hpXjd34VBgQ2w2quK63WljodlUcOoJDPKiV+rPjHrcUc2sjLCNKxhl6oKqmsZgwOWcDAY2GKKQ== -"@vscode/test-electron@2.3.4": - version "2.3.4" - resolved "https://registry.yarnpkg.com/@vscode/test-electron/-/test-electron-2.3.4.tgz#d0ed1de72d347221cdf71426b0c7e21136f4791f" - integrity sha512-eWzIqXMhvlcoXfEFNWrVu/yYT5w6De+WZXR/bafUQhAp8+8GkQo95Oe14phwiRUPv8L+geAKl/QM2+PoT3YW3g== +"@vscode/test-electron@2.3.5": + version "2.3.5" + resolved "https://registry.yarnpkg.com/@vscode/test-electron/-/test-electron-2.3.5.tgz#c472c5bdce1329aeb4762b8aa7a2cbe7aa783aac" + integrity sha512-lAW7nQ0HuPqJnGJrtCzEKZCICtRizeP6qNanyCrjmdCOAAWjX3ixiG8RVPwqsYPQBWLPgYuE12qQlwXsOR/2fQ== dependencies: http-proxy-agent "^4.0.1" https-proxy-agent "^5.0.0" @@ -1612,9 +1612,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001541: - version "1.0.30001541" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001541.tgz#b1aef0fadd87fb72db4dcb55d220eae17b81cdb1" - integrity sha512-bLOsqxDgTqUBkzxbNlSBt8annkDpQB9NdzdTbO2ooJ+eC/IQcvDspDc058g84ejCelF7vHUx57KIOjEecOHXaw== + version "1.0.30001546" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001546.tgz#10fdad03436cfe3cc632d3af7a99a0fb497407f0" + integrity sha512-zvtSJwuQFpewSyRrI3AsftF6rM0X80mZkChIt1spBGEvRglCrjTniXvinc8JKRoqTwXAgvqTImaN9igfSMtUBw== capital-case@^1.0.4: version "1.0.4" @@ -1716,9 +1716,9 @@ chrome-trace-event@^1.0.2: integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== ci-info@^3.2.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" - integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== + version "3.9.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4" + integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ== circular-dependency-plugin@5.2.2: version "5.2.2" @@ -2595,9 +2595,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.4.535: - version "1.4.537" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.537.tgz#aac4101db53066be1e49baedd000a26bc754adc9" - integrity sha512-W1+g9qs9hviII0HAwOdehGYkr+zt7KKdmCcJcjH0mYg6oL8+ioT3Skjmt7BLoAQqXhjf40AXd+HlR4oAWMlXjA== + version "1.4.543" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.543.tgz#51116ffc9fba1ee93514d6a40d34676aa6d7d1c4" + integrity sha512-t2ZP4AcGE0iKCCQCBx/K2426crYdxD3YU6l0uK2EO3FZH0pbC4pFz/sZm2ruZsND6hQBTcDWWlo/MLpiOdif5g== emoji-regex@^8.0.0: version "8.0.0" @@ -2799,13 +2799,13 @@ esbuild-loader@4.0.2: loader-utils "^2.0.4" webpack-sources "^1.4.3" -esbuild-sass-plugin@2.15.0: - version "2.15.0" - resolved "https://registry.yarnpkg.com/esbuild-sass-plugin/-/esbuild-sass-plugin-2.15.0.tgz#268a31617a79ee92ae30db4b91ce3603bfa687ce" - integrity sha512-T0GCHVfeuGBBgY5k19RbExd7vVuC3lzrK8IZbXOqZftw6N9lTBnZuqKhnhdAJBcu6wek7K/fXJ2zzY6KrcNtAg== +esbuild-sass-plugin@2.16.0: + version "2.16.0" + resolved "https://registry.yarnpkg.com/esbuild-sass-plugin/-/esbuild-sass-plugin-2.16.0.tgz#2908ab5e104cfc980118c46d0b409cbab8aa32dd" + integrity sha512-mGCe9MxNYvZ+j77Q/QFO+rwUGA36mojDXkOhtVmoyz1zwYbMaNrtVrmXwwYDleS/UMKTNU3kXuiTtPiAD3K+Pw== dependencies: - resolve "^1.22.2" - sass "^1.65.1" + resolve "^1.22.6" + sass "^1.7.3" esbuild@0.19.4, esbuild@^0.19.0: version "0.19.4" @@ -3190,11 +3190,11 @@ find-up@^4.0.0: path-exists "^4.0.0" flat-cache@^3.0.4: - version "3.1.0" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.0.tgz#0e54ab4a1a60fe87e2946b6b00657f1c99e1af3f" - integrity sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew== + version "3.1.1" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.1.tgz#a02a15fdec25a8f844ff7cc658f03dd99eb4609b" + integrity sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q== dependencies: - flatted "^3.2.7" + flatted "^3.2.9" keyv "^4.5.3" rimraf "^3.0.2" @@ -3203,7 +3203,7 @@ flat@^5.0.2: resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== -flatted@^3.2.7: +flatted@^3.2.9: version "3.2.9" resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf" integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ== @@ -3430,9 +3430,9 @@ glob@^7.0.3, glob@^7.0.6, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0: path-is-absolute "^1.0.0" globals@^13.19.0: - version "13.22.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.22.0.tgz#0c9fcb9c48a2494fbb5edbfee644285543eba9d8" - integrity sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw== + version "13.23.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.23.0.tgz#ef31673c926a0976e1f61dab4dca57e0c0a8af02" + integrity sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA== dependencies: type-fest "^0.20.2" @@ -3587,11 +3587,9 @@ has-unicode@^2.0.1: integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" + version "1.0.4" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6" + integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ== he@1.2.0, he@^1.2.0: version "1.2.0" @@ -5462,11 +5460,11 @@ playwright@^1.38.1: fsevents "2.3.2" plimit-lit@^1.2.6: - version "1.5.0" - resolved "https://registry.yarnpkg.com/plimit-lit/-/plimit-lit-1.5.0.tgz#f66df8a7041de1e965c4f1c0697ab486968a92a5" - integrity sha512-Eb/MqCb1Iv/ok4m1FqIXqvUKPISufcjZ605hl3KM/n8GaX8zfhtgdLwZU3vKjuHGh2O9Rjog/bHTq8ofIShdng== + version "1.6.1" + resolved "https://registry.yarnpkg.com/plimit-lit/-/plimit-lit-1.6.1.tgz#a34594671b31ee8e93c72d505dfb6852eb72374a" + integrity sha512-B7+VDyb8Tl6oMJT9oSO2CW8XC/T4UcJGrwOVoNGwOQsQYhlpfajmrMj5xeejqaASq3V/EqThyOeATEOMuSEXiA== dependencies: - queue-lit "^1.5.0" + queue-lit "^1.5.1" postcss-calc@^9.0.0: version "9.0.1" @@ -5844,10 +5842,10 @@ qs@^6.9.1: dependencies: side-channel "^1.0.4" -queue-lit@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/queue-lit/-/queue-lit-1.5.0.tgz#8197fdafda1edd615c8a0fc14c48353626e5160a" - integrity sha512-IslToJ4eiCEE9xwMzq3viOO5nH8sUWUCwoElrhNMozzr9IIt2qqvB4I+uHu/zJTQVqc9R5DFwok4ijNK1pU3fA== +queue-lit@^1.5.1: + version "1.5.2" + resolved "https://registry.yarnpkg.com/queue-lit/-/queue-lit-1.5.2.tgz#83c24d4f4764802377b05a6e5c73017caf3f8747" + integrity sha512-tLc36IOPeMAubu8BkW8YDBV+WyIgKlYU7zUNs0J5Vk9skSZ4JfGlPOqplP0aHdfv7HL0B2Pg6nwiq60Qc6M2Hw== queue-microtask@^1.2.2: version "1.2.3" @@ -6156,7 +6154,7 @@ resolve-pkg-maps@^1.0.0: resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f" integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw== -resolve@^1.20.0, resolve@^1.22.2, resolve@^1.22.4, resolve@^1.3.3: +resolve@^1.20.0, resolve@^1.22.4, resolve@^1.22.6, resolve@^1.3.3: version "1.22.6" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.6.tgz#dd209739eca3aef739c626fea1b4f3c506195362" integrity sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw== @@ -6249,10 +6247,10 @@ sass-loader@13.3.2: dependencies: neo-async "^2.6.2" -sass@1.68.0, sass@^1.65.1: - version "1.68.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.68.0.tgz#0034b0cc9a50248b7d1702ac166fd25990023669" - integrity sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA== +sass@1.69.0, sass@^1.7.3: + version "1.69.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.0.tgz#5195075371c239ed556280cf2f5944d234f42679" + integrity sha512-l3bbFpfTOGgQZCLU/gvm1lbsQ5mC/WnLz3djL2v4WCJBDrWm58PO+jgngcGRNnKUh6wSsdm50YaovTqskZ0xDQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -6574,9 +6572,9 @@ spdx-expression-parse@^3.0.0, spdx-expression-parse@^3.0.1: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.15" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.15.tgz#142460aabaca062bc7cd4cc87b7d50725ed6a4ba" - integrity sha512-lpT8hSQp9jAKp9mhtBU4Xjon8LPGBvLIuBiSVhMEtmLecTh2mO0tlqrAMp47tBXzMr13NJMQ2lf7RpQGLJ3HsQ== + version "3.0.16" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f" + integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw== spdx-ranges@^2.0.0: version "2.1.1" @@ -6886,9 +6884,9 @@ terser-webpack-plugin@5.3.9, terser-webpack-plugin@^5.3.7: terser "^5.16.8" terser@^5.10.0, terser@^5.15.1, terser@^5.16.8: - version "5.20.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.20.0.tgz#ea42aea62578703e33def47d5c5b93c49772423e" - integrity sha512-e56ETryaQDyebBwJIWYB2TT6f2EZ0fL0sW/JRXNMN26zZdKi2u/E/5my5lG6jNxym6qsrVXfFRmOdV42zlAgLQ== + version "5.21.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.21.0.tgz#d2b27e92b5e56650bc83b6defa00a110f0b124b2" + integrity sha512-WtnFKrxu9kaoXuiZFSGrcAvvBqAdmKx0SFNmVNYdJamMu9yyN3I/QF0FbH4QcqJQ+y1CJnzxGIKH0cSj+FGYRw== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -7138,10 +7136,10 @@ typed-rest-client@^1.8.4: tunnel "0.0.6" underscore "^1.12.1" -typescript@5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78" - integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== +typescript@5.3.0-beta: + version "5.3.0-beta" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.0-beta.tgz#20c29bff9ba381a2120a5705bd87a0c8a2104b54" + integrity sha512-SiTeC1C8wAS6v2SD05iyfojeuIkUZIbb8suZz0d4BR+RErwpG+05iolat+VjM9hqXSrjb3xutEBzh4X3NJ7Jgw== typescript@^4.9.5: version "4.9.5" @@ -7269,9 +7267,9 @@ vary@^1.1.2: integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== vscode-uri@^3.0.7: - version "3.0.7" - resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.7.tgz#6d19fef387ee6b46c479e5fb00870e15e58c1eb8" - integrity sha512-eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA== + version "3.0.8" + resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.8.tgz#1770938d3e72588659a172d0fd4642780083ff9f" + integrity sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw== warning@^3.0.0: version "3.0.0" From d7925410ce63f0561003c0446813ec651abe52c7 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Fri, 6 Oct 2023 11:31:48 -0700 Subject: [PATCH 0026/1012] Updates CHANGELOG --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09bf4aea68ffc..cb261af610c19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,11 +8,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Changed +- Improves performance when working with connected remotes - Relaxes PR autolink detection for Azure DevOps to use `PR ` instead of `Merged PR ` — closes [#2908](https://github.com/gitkraken/vscode-gitlens/issues/2908) - Replaces VSCode git operations (`fetch`, `push`, `pull`) with GitLens' own implementations to avoid issues with VSCode's git extension. This can be reverted by setting `"gitlens.experimental.nativeGit"` to `"false"` in settings. - Adds deep link support for workspaces in the _GitKraken Workspaces_ view - Deep link format: `https://gitkraken.dev/link/workspaces/{workspaceId}` - Adds a _Share_ submenu with a _Copy Link to Workspace_ command to workspaces in the _GitKraken Workspaces_ view +- Changes wording on `Reset Stored OpenAI Key` command to `Reset Stored AI Key` to reflect support for other providers ### Fixed @@ -23,6 +25,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Fixes issue with "View as [List|Tree]" toggle not working in the _Commit Details_ view - Fixes an issue with deep links sometimes failing to properly resolve when a matching repository without the remote is found - Fixes an issue in the _Commit Graph_ where commits not in the history of a merge commit were showing in the same column +- Fixes `Reset Stored AI Key` command to work for the current provider ## [14.3.0] - 2023-09-07 From 5aa1e48730b704ac2377f5a6050a15bf2bed5ac1 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 6 Oct 2023 18:12:12 -0400 Subject: [PATCH 0027/1012] Fixes issue w/ parsing some log renames --- CHANGELOG.md | 1 + src/git/parsers/logParser.ts | 27 +++++++++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb261af610c19..8bef1e10db60f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Fixes an issue with deep links sometimes failing to properly resolve when a matching repository without the remote is found - Fixes an issue in the _Commit Graph_ where commits not in the history of a merge commit were showing in the same column - Fixes `Reset Stored AI Key` command to work for the current provider +- Fixes an issue with parsing some renames in log output ## [14.3.0] - 2023-09-07 diff --git a/src/git/parsers/logParser.ts b/src/git/parsers/logParser.ts index 98abbccadb254..c47af411e93da 100644 --- a/src/git/parsers/logParser.ts +++ b/src/git/parsers/logParser.ts @@ -19,7 +19,7 @@ const diffRangeRegex = /^@@ -(\d+?),(\d+?) \+(\d+?),(\d+?) @@/; export const fileStatusRegex = /(\S)\S*\t([^\t\n]+)(?:\t(.+))?/; const fileStatusAndSummaryRegex = /^(\d+?|-)\s+?(\d+?|-)\s+?(.*)(?:\n\s(delete|rename|copy|create))?/; const fileStatusAndSummaryRenamedFileRegex = /(.+)\s=>\s(.+)/; -const fileStatusAndSummaryRenamedFilePathRegex = /(.*?){(.+?)\s=>\s(.*?)}(.*)/; +const fileStatusAndSummaryRenamedFilePathRegex = /(.*?){(.+?)?\s=>\s(.*?)?}(.*)/; const logFileSimpleRegex = /^ (.*)\s*(?:(?:diff --git a\/(.*) b\/(.*))|(?:(\S)\S*\t([^\t\n]+)(?:\t(.+))?))/gm; const logFileSimpleRenamedRegex = /^ (\S+)\s*(.*)$/s; @@ -656,12 +656,27 @@ export class GitLogParser { renamedMatch = fileStatusAndSummaryRenamedFilePathRegex.exec(renamedFileName); if (renamedMatch != null) { + const [, start, from, to, end] = renamedMatch; // If there is no new path, the path part was removed so ensure we don't end up with // - entry.path = - renamedMatch[3] === '' - ? `${renamedMatch[1]}${renamedMatch[4]}`.replace('//', '/') - : `${renamedMatch[1]}${renamedMatch[3]}${renamedMatch[4]}`; - entry.originalPath = `${renamedMatch[1]}${renamedMatch[2]}${renamedMatch[4]}`; + if (!to) { + entry.path = `${ + start.endsWith('/') && end.startsWith('/') + ? start.slice(0, -1) + : start + }${end}`; + } else { + entry.path = `${start}${to}${end}`; + } + + if (!from) { + entry.originalPath = `${ + start.endsWith('/') && end.startsWith('/') + ? start.slice(0, -1) + : start + }${end}`; + } else { + entry.originalPath = `${start}${from}${end}`; + } } else { renamedMatch = fileStatusAndSummaryRenamedFileRegex.exec(renamedFileName); From d2fc1c1e7dfe1b591e56e51701e4a232e577fe56 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 6 Oct 2023 18:13:23 -0400 Subject: [PATCH 0028/1012] Removes unused flag --- src/env/node/git/localGitProvider.ts | 15 ++++++--------- src/git/gitProvider.ts | 1 - src/git/gitProviderService.ts | 3 +-- src/plus/github/githubGitProvider.ts | 1 - 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts index 1573c4721c33b..98dad369057e5 100644 --- a/src/env/node/git/localGitProvider.ts +++ b/src/env/node/git/localGitProvider.ts @@ -3856,7 +3856,6 @@ export class LocalGitProvider implements GitProvider, Disposable { uri: Uri, ref: string | undefined, skip: number = 0, - firstParent: boolean = false, ): Promise { if (ref === deletedOrMissing) return undefined; @@ -3886,13 +3885,13 @@ export class LocalGitProvider implements GitProvider, Disposable { return { // Diff staged with HEAD (or prior if more skips) current: GitUri.fromFile(relativePath, repoPath, uncommittedStaged), - previous: await this.getPreviousUri(repoPath, uri, ref, skip - 1, undefined, firstParent), + previous: await this.getPreviousUri(repoPath, uri, ref, skip - 1), }; } else if (status.workingTreeStatus != null) { if (skip === 0) { return { current: GitUri.fromFile(relativePath, repoPath, undefined), - previous: await this.getPreviousUri(repoPath, uri, undefined, skip, undefined, firstParent), + previous: await this.getPreviousUri(repoPath, uri, undefined, skip), }; } } @@ -3905,12 +3904,12 @@ export class LocalGitProvider implements GitProvider, Disposable { const current = skip === 0 ? GitUri.fromFile(relativePath, repoPath, ref) - : (await this.getPreviousUri(repoPath, uri, undefined, skip - 1, undefined, firstParent))!; + : (await this.getPreviousUri(repoPath, uri, undefined, skip - 1))!; if (current == null || current.sha === deletedOrMissing) return undefined; return { current: current, - previous: await this.getPreviousUri(repoPath, uri, undefined, skip, undefined, firstParent), + previous: await this.getPreviousUri(repoPath, uri, undefined, skip), }; } @@ -3918,12 +3917,12 @@ export class LocalGitProvider implements GitProvider, Disposable { const current = skip === 0 ? GitUri.fromFile(relativePath, repoPath, ref) - : (await this.getPreviousUri(repoPath, uri, ref, skip - 1, undefined, firstParent))!; + : (await this.getPreviousUri(repoPath, uri, ref, skip - 1))!; if (current == null || current.sha === deletedOrMissing) return undefined; return { current: current, - previous: await this.getPreviousUri(repoPath, uri, ref, skip, undefined, firstParent), + previous: await this.getPreviousUri(repoPath, uri, ref, skip), }; } @@ -4053,7 +4052,6 @@ export class LocalGitProvider implements GitProvider, Disposable { ref?: string, skip: number = 0, editorLine?: number, - firstParent: boolean = false, ): Promise { if (ref === deletedOrMissing) return undefined; @@ -4071,7 +4069,6 @@ export class LocalGitProvider implements GitProvider, Disposable { data = await this.git.log__file(repoPath, relativePath, ref, { argsOrFormat: GitLogParser.simpleFormat, fileMode: 'simple', - firstParent: firstParent, limit: skip + 2, ordering: configuration.get('advanced.commitOrdering'), startLine: editorLine != null ? editorLine + 1 : undefined, diff --git a/src/git/gitProvider.ts b/src/git/gitProvider.ts index 79ac1f0a3b26c..8ad2b5cf119c8 100644 --- a/src/git/gitProvider.ts +++ b/src/git/gitProvider.ts @@ -372,7 +372,6 @@ export interface GitProvider extends Disposable { uri: Uri, ref: string | undefined, skip?: number, - firstParent?: boolean, ): Promise; getPreviousComparisonUrisForLine( repoPath: string, diff --git a/src/git/gitProviderService.ts b/src/git/gitProviderService.ts index 89524da10d917..ec811edc09766 100644 --- a/src/git/gitProviderService.ts +++ b/src/git/gitProviderService.ts @@ -1911,12 +1911,11 @@ export class GitProviderService implements Disposable { uri: Uri, ref: string | undefined, skip: number = 0, - firstParent: boolean = false, ): Promise { if (ref === deletedOrMissing) return Promise.resolve(undefined); const { provider, path } = this.getProvider(repoPath); - return provider.getPreviousComparisonUris(path, uri, ref, skip, firstParent); + return provider.getPreviousComparisonUris(path, uri, ref, skip); } @log() diff --git a/src/plus/github/githubGitProvider.ts b/src/plus/github/githubGitProvider.ts index b202a368c366c..6832633347fa1 100644 --- a/src/plus/github/githubGitProvider.ts +++ b/src/plus/github/githubGitProvider.ts @@ -2413,7 +2413,6 @@ export class GitHubGitProvider implements GitProvider, Disposable { uri: Uri, ref: string | undefined, skip: number = 0, - _firstParent: boolean = false, ): Promise { if (ref === deletedOrMissing) return undefined; From e5c9a0d307a7db7e02f5c6ce5de1119f3758031c Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 6 Oct 2023 19:15:39 -0400 Subject: [PATCH 0029/1012] Fixes #2104, #2944 filter merge commits in history - Changes File History view to follow renames by default - Adds [Show|Hide] Merge Commits toggle to File History - Adds `advanced.fileHistoryShowMergeCommits` setting --- CHANGELOG.md | 6 +++ package.json | 43 ++++++++++++++-- src/config.ts | 1 + src/constants.ts | 1 + src/env/node/git/git.ts | 17 +++---- src/env/node/git/localGitProvider.ts | 73 ++++++++++++++++------------ src/views/fileHistoryView.ts | 17 ++++++- 7 files changed, 113 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bef1e10db60f..16c1ff1aeec2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] +### Added + +- Adds a _[Show|Hide] Merge Commits_ toggle to the _File History_ view — closes [#2104](https://github.com/gitkraken/vscode-gitlens/issues/2104) & [#2944](https://github.com/gitkraken/vscode-gitlens/issues/2944) + - Adds a `gitlens.advanced.fileHistoryShowMergeCommits` setting to specify whether merge commits will be show in file histories + ### Changed - Improves performance when working with connected remotes +- Changes the _File History_ view to follow renames and filters out merge commits by default — closes [#2104](https://github.com/gitkraken/vscode-gitlens/issues/2104) & [#2944](https://github.com/gitkraken/vscode-gitlens/issues/2944) - Relaxes PR autolink detection for Azure DevOps to use `PR ` instead of `Merged PR ` — closes [#2908](https://github.com/gitkraken/vscode-gitlens/issues/2908) - Replaces VSCode git operations (`fetch`, `push`, `pull`) with GitLens' own implementations to avoid issues with VSCode's git extension. This can be reverted by setting `"gitlens.experimental.nativeGit"` to `"false"` in settings. - Adds deep link support for workspaces in the _GitKraken Workspaces_ view diff --git a/package.json b/package.json index cece2f619b4fe..94d6d0f2152f6 100644 --- a/package.json +++ b/package.json @@ -1194,8 +1194,8 @@ }, "gitlens.advanced.fileHistoryFollowsRenames": { "type": "boolean", - "default": false, - "markdownDescription": "Specifies whether file histories will follow renames — will affect how merge commits are shown in histories", + "default": true, + "markdownDescription": "Specifies whether file histories will follow renames", "scope": "window", "order": 100 }, @@ -1205,6 +1205,13 @@ "markdownDescription": "Specifies whether file histories will show commits from all branches", "scope": "window", "order": 101 + }, + "gitlens.advanced.fileHistoryShowMergeCommits": { + "type": "boolean", + "default": false, + "markdownDescription": "Specifies whether file histories will show merge commits", + "scope": "window", + "order": 102 } } }, @@ -6569,6 +6576,16 @@ "title": "View History for Current Branch Only", "category": "GitLens" }, + { + "command": "gitlens.views.fileHistory.setShowMergeCommitsOn", + "title": "Show Merge Commits", + "category": "GitLens" + }, + { + "command": "gitlens.views.fileHistory.setShowMergeCommitsOff", + "title": "Hide Merge Commits", + "category": "GitLens" + }, { "command": "gitlens.views.fileHistory.setShowAvatarsOn", "title": "Show Avatars", @@ -9317,6 +9334,14 @@ "command": "gitlens.views.fileHistory.setShowAllBranchesOff", "when": "false" }, + { + "command": "gitlens.views.fileHistory.setShowMergeCommitsOn", + "when": "false" + }, + { + "command": "gitlens.views.fileHistory.setShowMergeCommitsOff", + "when": "false" + }, { "command": "gitlens.views.fileHistory.setShowAvatarsOn", "when": "false" @@ -10848,15 +10873,25 @@ "when": "view =~ /^gitlens\\.views\\.fileHistory/ && !gitlens:views:fileHistory:cursorFollowing && !config.gitlens.advanced.fileHistoryShowAllBranches && config.gitlens.advanced.fileHistoryFollowsRenames", "group": "3_gitlens@1" }, + { + "command": "gitlens.views.fileHistory.setShowMergeCommitsOn", + "when": "view =~ /^gitlens\\.views\\.fileHistory/ && !gitlens:views:fileHistory:cursorFollowing && !config.gitlens.advanced.fileHistoryShowMergeCommits", + "group": "3_gitlens@2" + }, + { + "command": "gitlens.views.fileHistory.setShowMergeCommitsOff", + "when": "view =~ /^gitlens\\.views\\.fileHistory/ && !gitlens:views:fileHistory:cursorFollowing && config.gitlens.advanced.fileHistoryShowMergeCommits", + "group": "3_gitlens@2" + }, { "command": "gitlens.views.fileHistory.setShowAllBranchesOn", "when": "view =~ /^gitlens\\.views\\.fileHistory/ && !gitlens:views:fileHistory:cursorFollowing && !config.gitlens.advanced.fileHistoryShowAllBranches", - "group": "3_gitlens@2" + "group": "3_gitlens@3" }, { "command": "gitlens.views.fileHistory.setShowAllBranchesOff", "when": "view =~ /^gitlens\\.views\\.fileHistory/ && !gitlens:views:fileHistory:cursorFollowing && config.gitlens.advanced.fileHistoryShowAllBranches", - "group": "3_gitlens@2" + "group": "3_gitlens@3" }, { "command": "gitlens.views.fileHistory.setShowAvatarsOn", diff --git a/src/config.ts b/src/config.ts index e53907bdc7418..c25369e3459e7 100644 --- a/src/config.ts +++ b/src/config.ts @@ -303,6 +303,7 @@ export interface AdvancedConfig { readonly externalDirectoryDiffTool: string | null; readonly fileHistoryFollowsRenames: boolean; readonly fileHistoryShowAllBranches: boolean; + readonly fileHistoryShowMergeCommits: boolean; readonly maxListItems: number; readonly maxSearchItems: number; readonly messages: { [key in SuppressedMessages]: boolean }; diff --git a/src/constants.ts b/src/constants.ts index 818be5ef60522..db3461afd9707 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -353,6 +353,7 @@ export type TreeViewCommands = `gitlens.views.${ | `setEditorFollowing${'On' | 'Off'}` | `setRenameFollowing${'On' | 'Off'}` | `setShowAllBranches${'On' | 'Off'}` + | `setShowMergeCommits${'On' | 'Off'}` | `setShowAvatars${'On' | 'Off'}`}` | `lineHistory.${ | 'copy' diff --git a/src/env/node/git/git.ts b/src/env/node/git/git.ts index f279c26bd9e40..f772c2d13549a 100644 --- a/src/env/node/git/git.ts +++ b/src/env/node/git/git.ts @@ -1213,8 +1213,8 @@ export class Git { // TODO@eamodio remove this in favor of argsOrFormat fileMode = 'full', filters, - firstParent = false, limit, + merges = false, ordering, renames = true, reverse = false, @@ -1228,8 +1228,8 @@ export class Git { // TODO@eamodio remove this in favor of argsOrFormat fileMode?: 'full' | 'simple' | 'none'; filters?: GitDiffFilter[]; - firstParent?: boolean; limit?: number; + merges?: boolean; ordering?: 'date' | 'author-date' | 'topo' | null; renames?: boolean; reverse?: boolean; @@ -1271,18 +1271,17 @@ export class Git { params.push('--all', '--single-worktree'); } + if (merges) { + params.push('--first-parent'); + } + // Can't allow rename detection (`--follow`) if `all` or a `startLine` is specified if (renames && (all || startLine != null)) { renames = false; } - params.push(renames ? '--follow' : '-m'); - if (/*renames ||*/ firstParent) { - params.push('--first-parent'); - // In Git >= 2.29.0 `--first-parent` implies `-m`, so lets include it for consistency - if (renames) { - params.push('-m'); - } + if (renames) { + params.push('--follow'); } if (filters != null && filters.length !== 0) { diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts index 98dad369057e5..ae3ecdd5ebd0f 100644 --- a/src/env/node/git/localGitProvider.ts +++ b/src/env/node/git/localGitProvider.ts @@ -3277,47 +3277,58 @@ export class LocalGitProvider implements GitProvider, Disposable { throw new Error(`File name cannot match the repository path; path=${relativePath}`); } - options = { reverse: false, ...options }; + const opts: typeof options & Parameters[2] = { + reverse: false, + ...options, + }; + + if (opts.renames == null) { + opts.renames = configuration.get('advanced.fileHistoryFollowsRenames'); + } - if (options.renames == null) { - options.renames = configuration.get('advanced.fileHistoryFollowsRenames'); + if (opts.merges == null) { + opts.merges = configuration.get('advanced.fileHistoryShowMergeCommits'); } let key = 'log'; - if (options.ref != null) { - key += `:${options.ref}`; + if (opts.ref != null) { + key += `:${opts.ref}`; } - if (options.all == null) { - options.all = configuration.get('advanced.fileHistoryShowAllBranches'); + if (opts.all == null) { + opts.all = configuration.get('advanced.fileHistoryShowAllBranches'); } - if (options.all) { + if (opts.all) { key += ':all'; } - options.limit = options.limit ?? configuration.get('advanced.maxListItems') ?? 0; - if (options.limit) { - key += `:n${options.limit}`; + opts.limit = opts.limit ?? configuration.get('advanced.maxListItems') ?? 0; + if (opts.limit) { + key += `:n${opts.limit}`; } - if (options.renames) { + if (opts.merges) { + key += ':merges'; + } + + if (opts.renames) { key += ':follow'; } - if (options.reverse) { + if (opts.reverse) { key += ':reverse'; } - if (options.since) { - key += `:since=${options.since}`; + if (opts.since) { + key += `:since=${opts.since}`; } - if (options.skip) { - key += `:skip${options.skip}`; + if (opts.skip) { + key += `:skip${opts.skip}`; } - const doc = await this.container.tracker.getOrAdd(GitUri.fromFile(relativePath, repoPath, options.ref)); - if (!options.force && this.useCaching && options.range == null) { + const doc = await this.container.tracker.getOrAdd(GitUri.fromFile(relativePath, repoPath, opts.ref)); + if (!opts.force && this.useCaching && opts.range == null) { if (doc.state != null) { const cachedLog = doc.state.getLog(key); if (cachedLog != null) { @@ -3325,20 +3336,20 @@ export class LocalGitProvider implements GitProvider, Disposable { return cachedLog.item; } - if (options.ref != null || (options.limit != null && options.limit !== 0)) { + if (opts.ref != null || (opts.limit != null && opts.limit !== 0)) { // Since we are looking for partial log, see if we have the log of the whole file const cachedLog = doc.state.getLog( - `log${options.renames ? ':follow' : ''}${options.reverse ? ':reverse' : ''}`, + `log${opts.renames ? ':follow' : ''}${opts.reverse ? ':reverse' : ''}`, ); if (cachedLog != null) { - if (options.ref == null) { + if (opts.ref == null) { Logger.debug(scope, `Cache hit: ~'${key}'`); return cachedLog.item; } Logger.debug(scope, `Cache ?: '${key}'`); let log = await cachedLog.item; - if (log != null && !log.hasMore && log.commits.has(options.ref)) { + if (log != null && !log.hasMore && log.commits.has(opts.ref)) { Logger.debug(scope, `Cache hit: '${key}'`); // Create a copy of the log starting at the requested commit @@ -3349,12 +3360,12 @@ export class LocalGitProvider implements GitProvider, Disposable { log.commits.entries(), ([ref, c]) => { if (skip) { - if (ref !== options?.ref) return undefined; + if (ref !== opts?.ref) return undefined; skip = false; } i++; - if (options?.limit != null && i > options.limit) { + if (opts?.limit != null && i > opts.limit) { return undefined; } @@ -3363,14 +3374,14 @@ export class LocalGitProvider implements GitProvider, Disposable { ), ); - const opts = { ...options }; + const optsCopy = { ...opts }; log = { ...log, - limit: options.limit, + limit: optsCopy.limit, count: commits.size, commits: commits, query: (limit: number | undefined) => - this.getLogForFile(repoPath, pathOrUri, { ...opts, limit: limit }), + this.getLogForFile(repoPath, pathOrUri, { ...optsCopy, limit: limit }), }; return log; @@ -3386,9 +3397,9 @@ export class LocalGitProvider implements GitProvider, Disposable { } } - const promise = this.getLogForFileCore(repoPath, relativePath, options, doc, key, scope); + const promise = this.getLogForFileCore(repoPath, relativePath, opts, doc, key, scope); - if (doc.state != null && options.range == null) { + if (doc.state != null && opts.range == null) { Logger.debug(scope, `Cache add: '${key}'`); const value: CachedLog = { @@ -3411,6 +3422,7 @@ export class LocalGitProvider implements GitProvider, Disposable { all?: boolean; cursor?: string; limit?: number; + merges?: boolean; ordering?: 'date' | 'author-date' | 'topo' | null; range?: Range; ref?: string; @@ -3439,7 +3451,6 @@ export class LocalGitProvider implements GitProvider, Disposable { const data = await this.git.log__file(root, relativePath, ref, { ordering: configuration.get('advanced.commitOrdering'), ...options, - firstParent: options.renames, startLine: range == null ? undefined : range.start.line + 1, endLine: range == null ? undefined : range.end.line + 1, }); diff --git a/src/views/fileHistoryView.ts b/src/views/fileHistoryView.ts index a6b97a089f1f6..eb11d76e81775 100644 --- a/src/views/fileHistoryView.ts +++ b/src/views/fileHistoryView.ts @@ -89,6 +89,16 @@ export class FileHistoryView extends ViewBase< () => this.setShowAllBranches(false), this, ), + registerViewCommand( + this.getQualifiedCommand('setShowMergeCommitsOn'), + () => this.setShowMergeCommits(true), + this, + ), + registerViewCommand( + this.getQualifiedCommand('setShowMergeCommitsOff'), + () => this.setShowMergeCommits(false), + this, + ), registerViewCommand(this.getQualifiedCommand('setShowAvatarsOn'), () => this.setShowAvatars(true), this), registerViewCommand(this.getQualifiedCommand('setShowAvatarsOff'), () => this.setShowAvatars(false), this), ]; @@ -106,7 +116,8 @@ export class FileHistoryView extends ViewBase< !configuration.changed(e, 'defaultGravatarsStyle') && !configuration.changed(e, 'defaultTimeFormat') && !configuration.changed(e, 'advanced.fileHistoryFollowsRenames') && - !configuration.changed(e, 'advanced.fileHistoryShowAllBranches') + !configuration.changed(e, 'advanced.fileHistoryShowAllBranches') && + !configuration.changed(e, 'advanced.fileHistoryShowMergeCommits') ) { return false; } @@ -180,6 +191,10 @@ export class FileHistoryView extends ViewBase< return configuration.updateEffective('advanced.fileHistoryShowAllBranches', enabled); } + private setShowMergeCommits(enabled: boolean) { + return configuration.updateEffective('advanced.fileHistoryShowMergeCommits', enabled); + } + private setShowAvatars(enabled: boolean) { return configuration.updateEffective(`views.${this.configKey}.avatars` as const, enabled); } From 4501529ab0a3d2c7ae977c1a7554715bbc261b86 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 6 Oct 2023 19:21:04 -0400 Subject: [PATCH 0030/1012] Updates CHANGELOG --- CHANGELOG.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16c1ff1aeec2d..fd868b81cb6cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,16 +10,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds a _[Show|Hide] Merge Commits_ toggle to the _File History_ view — closes [#2104](https://github.com/gitkraken/vscode-gitlens/issues/2104) & [#2944](https://github.com/gitkraken/vscode-gitlens/issues/2944) - Adds a `gitlens.advanced.fileHistoryShowMergeCommits` setting to specify whether merge commits will be show in file histories +- Adds deep link support for workspaces in the _GitKraken Workspaces_ view + - Deep link format: `https://gitkraken.dev/link/workspaces/{workspaceId}` + - Adds a _Share_ submenu with a _Copy Link to Workspace_ command to workspaces in the _GitKraken Workspaces_ view ### Changed -- Improves performance when working with connected remotes +- Improves performance of inline blame, status bar blame, and hovers especially when working with remotes with connected integrations - Changes the _File History_ view to follow renames and filters out merge commits by default — closes [#2104](https://github.com/gitkraken/vscode-gitlens/issues/2104) & [#2944](https://github.com/gitkraken/vscode-gitlens/issues/2944) +- Changes to use our own implementation of `fetch`, `push`, and `pull` Git operations, rather than delegating to VS Code to avoid limitations especially with GitKraken Workspaces. Please report any issues and you can revert this (for now) by setting `"gitlens.experimental.nativeGit"` to `"false"` in your settings - Relaxes PR autolink detection for Azure DevOps to use `PR ` instead of `Merged PR ` — closes [#2908](https://github.com/gitkraken/vscode-gitlens/issues/2908) -- Replaces VSCode git operations (`fetch`, `push`, `pull`) with GitLens' own implementations to avoid issues with VSCode's git extension. This can be reverted by setting `"gitlens.experimental.nativeGit"` to `"false"` in settings. -- Adds deep link support for workspaces in the _GitKraken Workspaces_ view - - Deep link format: `https://gitkraken.dev/link/workspaces/{workspaceId}` - - Adds a _Share_ submenu with a _Copy Link to Workspace_ command to workspaces in the _GitKraken Workspaces_ view - Changes wording on `Reset Stored OpenAI Key` command to `Reset Stored AI Key` to reflect support for other providers ### Fixed From d758cc0a046ecd24c423f24b3eabbbcf4ddbeac4 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Mon, 9 Oct 2023 17:30:04 -0400 Subject: [PATCH 0031/1012] Fixes id for unpinning issues --- src/plus/webviews/focus/focusWebview.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plus/webviews/focus/focusWebview.ts b/src/plus/webviews/focus/focusWebview.ts index b1eb111969f9b..8d16b37b90d2f 100644 --- a/src/plus/webviews/focus/focusWebview.ts +++ b/src/plus/webviews/focus/focusWebview.ts @@ -133,7 +133,7 @@ export class FocusWebviewProvider implements WebviewProvider { if (issueWithRemote == null) return; if (pin) { - await this.container.focus.unpinItem(issueWithRemote.issue.id); + await this.container.focus.unpinItem(pin); this._enrichedItems = this._enrichedItems?.filter(e => e.id !== pin); issueWithRemote.enriched = issueWithRemote.enriched?.filter(e => e.id !== pin); } else { From 1b447ffdfa8fbfa6234c35a95088bf23d0794752 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 9 Oct 2023 23:49:32 -0400 Subject: [PATCH 0032/1012] Removes re-exports to limit import scopes --- src/annotations/annotationProvider.ts | 3 ++- src/annotations/blameAnnotationProvider.ts | 3 ++- src/annotations/fileAnnotationController.ts | 7 ++----- src/annotations/gutterChangesAnnotationProvider.ts | 3 ++- src/annotations/lineAnnotationController.ts | 3 ++- src/codelens/codeLensController.ts | 7 ++----- src/env/node/git/localGitProvider.ts | 3 ++- src/hovers/lineHoverController.ts | 2 +- src/statusbar/statusBarController.ts | 3 ++- src/trackers/documentTracker.ts | 9 ++++++--- src/trackers/gitDocumentTracker.ts | 2 -- src/trackers/gitLineTracker.ts | 6 ++---- src/trackers/trackedDocument.ts | 9 ++------- src/views/nodes/lineHistoryTrackerNode.ts | 2 +- 14 files changed, 28 insertions(+), 34 deletions(-) diff --git a/src/annotations/annotationProvider.ts b/src/annotations/annotationProvider.ts index 702ebf7cdd342..62eda4dd4bc9f 100644 --- a/src/annotations/annotationProvider.ts +++ b/src/annotations/annotationProvider.ts @@ -11,7 +11,8 @@ import { Disposable, window } from 'vscode'; import type { FileAnnotationType } from '../config'; import { setContext } from '../system/context'; import { Logger } from '../system/logger'; -import type { GitDocumentState, TrackedDocument } from '../trackers/gitDocumentTracker'; +import type { GitDocumentState } from '../trackers/gitDocumentTracker'; +import type { TrackedDocument } from '../trackers/trackedDocument'; export type AnnotationStatus = 'computing' | 'computed'; diff --git a/src/annotations/blameAnnotationProvider.ts b/src/annotations/blameAnnotationProvider.ts index 3facb384c196f..3c8b47de9dd83 100644 --- a/src/annotations/blameAnnotationProvider.ts +++ b/src/annotations/blameAnnotationProvider.ts @@ -8,7 +8,8 @@ import type { GitCommit } from '../git/models/commit'; import { changesMessage, detailsMessage } from '../hovers/hovers'; import { configuration } from '../system/configuration'; import { log } from '../system/decorators/log'; -import type { GitDocumentState, TrackedDocument } from '../trackers/gitDocumentTracker'; +import type { GitDocumentState } from '../trackers/gitDocumentTracker'; +import type { TrackedDocument } from '../trackers/trackedDocument'; import { AnnotationProviderBase } from './annotationProvider'; import type { ComputedHeatmap } from './annotations'; import { getHeatmapColors } from './annotations'; diff --git a/src/annotations/fileAnnotationController.ts b/src/annotations/fileAnnotationController.ts index ba787da453d36..d883707f9eaea 100644 --- a/src/annotations/fileAnnotationController.ts +++ b/src/annotations/fileAnnotationController.ts @@ -32,11 +32,8 @@ import type { KeyboardScope } from '../system/keyboard'; import { Logger } from '../system/logger'; import { basename } from '../system/path'; import { isTextEditor } from '../system/utils'; -import type { - DocumentBlameStateChangeEvent, - DocumentDirtyStateChangeEvent, - GitDocumentState, -} from '../trackers/gitDocumentTracker'; +import type { DocumentBlameStateChangeEvent, DocumentDirtyStateChangeEvent } from '../trackers/documentTracker'; +import type { GitDocumentState } from '../trackers/gitDocumentTracker'; import type { AnnotationContext, AnnotationProviderBase, TextEditorCorrelationKey } from './annotationProvider'; import { getEditorCorrelationKey } from './annotationProvider'; import type { ChangesAnnotationContext } from './gutterChangesAnnotationProvider'; diff --git a/src/annotations/gutterChangesAnnotationProvider.ts b/src/annotations/gutterChangesAnnotationProvider.ts index 0ae6605d30e09..6539b0b60149e 100644 --- a/src/annotations/gutterChangesAnnotationProvider.ts +++ b/src/annotations/gutterChangesAnnotationProvider.ts @@ -15,7 +15,8 @@ import { configuration } from '../system/configuration'; import { log } from '../system/decorators/log'; import { getLogScope } from '../system/logger.scope'; import { maybeStopWatch } from '../system/stopwatch'; -import type { GitDocumentState, TrackedDocument } from '../trackers/gitDocumentTracker'; +import type { GitDocumentState } from '../trackers/gitDocumentTracker'; +import type { TrackedDocument } from '../trackers/trackedDocument'; import type { AnnotationContext } from './annotationProvider'; import { AnnotationProviderBase } from './annotationProvider'; import { Decorations } from './fileAnnotationController'; diff --git a/src/annotations/lineAnnotationController.ts b/src/annotations/lineAnnotationController.ts index 5a976e1ab4897..c1a9980505e73 100644 --- a/src/annotations/lineAnnotationController.ts +++ b/src/annotations/lineAnnotationController.ts @@ -15,7 +15,8 @@ import { Logger } from '../system/logger'; import { getLogScope, setLogScopeExit } from '../system/logger.scope'; import { getSettledValue } from '../system/promise'; import { isTextEditor } from '../system/utils'; -import type { GitLineState, LinesChangeEvent } from '../trackers/gitLineTracker'; +import type { GitLineState } from '../trackers/gitLineTracker'; +import type { LinesChangeEvent } from '../trackers/lineTracker'; import { getInlineDecoration } from './annotations'; const annotationDecoration: TextEditorDecorationType = window.createTextEditorDecorationType({ diff --git a/src/codelens/codeLensController.ts b/src/codelens/codeLensController.ts index 1208362fa0277..e1cee391a4d62 100644 --- a/src/codelens/codeLensController.ts +++ b/src/codelens/codeLensController.ts @@ -5,11 +5,8 @@ import { configuration } from '../system/configuration'; import { setContext } from '../system/context'; import { once } from '../system/event'; import { Logger } from '../system/logger'; -import type { - DocumentBlameStateChangeEvent, - DocumentDirtyIdleTriggerEvent, - GitDocumentState, -} from '../trackers/gitDocumentTracker'; +import type { DocumentBlameStateChangeEvent, DocumentDirtyIdleTriggerEvent } from '../trackers/documentTracker'; +import type { GitDocumentState } from '../trackers/gitDocumentTracker'; export class GitCodeLensController implements Disposable { private _canToggle: boolean = false; diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts index ae3ecdd5ebd0f..053fc2ff36b8c 100644 --- a/src/env/node/git/localGitProvider.ts +++ b/src/env/node/git/localGitProvider.ts @@ -173,8 +173,9 @@ import { equalsIgnoreCase, getDurationMilliseconds, interpolate, splitSingle } f import { PathTrie } from '../../../system/trie'; import { compare, fromString } from '../../../system/version'; import { serializeWebviewItemContext } from '../../../system/webview'; -import type { CachedBlame, CachedDiff, CachedLog, TrackedDocument } from '../../../trackers/gitDocumentTracker'; +import type { CachedBlame, CachedDiff, CachedLog } from '../../../trackers/gitDocumentTracker'; import { GitDocumentState } from '../../../trackers/gitDocumentTracker'; +import type { TrackedDocument } from '../../../trackers/trackedDocument'; import type { Git } from './git'; import { getShaInLogRegex, diff --git a/src/hovers/lineHoverController.ts b/src/hovers/lineHoverController.ts index 15b589564aea5..73cc6ab322ecd 100644 --- a/src/hovers/lineHoverController.ts +++ b/src/hovers/lineHoverController.ts @@ -6,7 +6,7 @@ import { configuration } from '../system/configuration'; import { debug } from '../system/decorators/log'; import { once } from '../system/event'; import { Logger } from '../system/logger'; -import type { LinesChangeEvent } from '../trackers/gitLineTracker'; +import type { LinesChangeEvent } from '../trackers/lineTracker'; import { changesMessage, detailsMessage } from './hovers'; const maxSmallIntegerV8 = 2 ** 30; // Max number that can be stored in V8's smis (small integers) diff --git a/src/statusbar/statusBarController.ts b/src/statusbar/statusBarController.ts index 217716a4cf3c0..85600a3ee8d52 100644 --- a/src/statusbar/statusBarController.ts +++ b/src/statusbar/statusBarController.ts @@ -17,7 +17,8 @@ import { Logger } from '../system/logger'; import { getLogScope } from '../system/logger.scope'; import { getSettledValue } from '../system/promise'; import { isTextEditor } from '../system/utils'; -import type { GitLineState, LinesChangeEvent } from '../trackers/gitLineTracker'; +import type { GitLineState } from '../trackers/gitLineTracker'; +import type { LinesChangeEvent } from '../trackers/lineTracker'; export class StatusBarController implements Disposable { private _cancellation: CancellationTokenSource | undefined; diff --git a/src/trackers/documentTracker.ts b/src/trackers/documentTracker.ts index e35f851cc399c..067e9084e8520 100644 --- a/src/trackers/documentTracker.ts +++ b/src/trackers/documentTracker.ts @@ -24,17 +24,20 @@ import type { Deferrable } from '../system/function'; import { debounce } from '../system/function'; import { filter, join, map } from '../system/iterable'; import { findTextDocument, isActiveDocument, isTextEditor } from '../system/utils'; -import type { DocumentBlameStateChangeEvent } from './trackedDocument'; import { TrackedDocument } from './trackedDocument'; -export * from './trackedDocument'; - export interface DocumentContentChangeEvent { readonly editor: TextEditor; readonly document: TrackedDocument; readonly contentChanges: readonly TextDocumentContentChangeEvent[]; } +export interface DocumentBlameStateChangeEvent { + readonly editor: TextEditor; + readonly document: TrackedDocument; + readonly blameable: boolean; +} + export interface DocumentDirtyStateChangeEvent { readonly editor: TextEditor; readonly document: TrackedDocument; diff --git a/src/trackers/gitDocumentTracker.ts b/src/trackers/gitDocumentTracker.ts index 4f76867b3ddba..9f63fbf2210df 100644 --- a/src/trackers/gitDocumentTracker.ts +++ b/src/trackers/gitDocumentTracker.ts @@ -4,8 +4,6 @@ import type { GitDiffFile } from '../git/models/diff'; import type { GitLog } from '../git/models/log'; import { DocumentTracker } from './documentTracker'; -export * from './documentTracker'; - interface CachedItem { item: Promise; errorMessage?: string; diff --git a/src/trackers/gitLineTracker.ts b/src/trackers/gitLineTracker.ts index ab28fd00911af..d6fd18c7134cb 100644 --- a/src/trackers/gitLineTracker.ts +++ b/src/trackers/gitLineTracker.ts @@ -11,13 +11,11 @@ import type { DocumentContentChangeEvent, DocumentDirtyIdleTriggerEvent, DocumentDirtyStateChangeEvent, - GitDocumentState, -} from './gitDocumentTracker'; +} from './documentTracker'; +import type { GitDocumentState } from './gitDocumentTracker'; import type { LinesChangeEvent, LineSelection } from './lineTracker'; import { LineTracker } from './lineTracker'; -export * from './lineTracker'; - export interface GitLineState { commit: GitCommit; } diff --git a/src/trackers/trackedDocument.ts b/src/trackers/trackedDocument.ts index 3a990528ef8f4..63a8ef0383347 100644 --- a/src/trackers/trackedDocument.ts +++ b/src/trackers/trackedDocument.ts @@ -1,4 +1,4 @@ -import type { Disposable, Event, TextDocument, TextEditor } from 'vscode'; +import type { Disposable, Event, TextDocument } from 'vscode'; import { EventEmitter } from 'vscode'; import type { Container } from '../container'; import { GitUri } from '../git/gitUri'; @@ -8,12 +8,7 @@ import type { Deferrable } from '../system/function'; import { debounce } from '../system/function'; import { Logger } from '../system/logger'; import { getEditorIfActive, isActiveDocument } from '../system/utils'; - -export interface DocumentBlameStateChangeEvent { - readonly editor: TextEditor; - readonly document: TrackedDocument; - readonly blameable: boolean; -} +import type { DocumentBlameStateChangeEvent } from './documentTracker'; export class TrackedDocument implements Disposable { static async create( diff --git a/src/views/nodes/lineHistoryTrackerNode.ts b/src/views/nodes/lineHistoryTrackerNode.ts index d49bc62582ab2..2ec74458dfb2e 100644 --- a/src/views/nodes/lineHistoryTrackerNode.ts +++ b/src/views/nodes/lineHistoryTrackerNode.ts @@ -12,7 +12,7 @@ import { debug, log } from '../../system/decorators/log'; import { debounce } from '../../system/function'; import { Logger } from '../../system/logger'; import { getLogScope, setLogScopeExit } from '../../system/logger.scope'; -import type { LinesChangeEvent } from '../../trackers/gitLineTracker'; +import type { LinesChangeEvent } from '../../trackers/lineTracker'; import type { FileHistoryView } from '../fileHistoryView'; import type { LineHistoryView } from '../lineHistoryView'; import { LineHistoryNode } from './lineHistoryNode'; From 0efdc3e209b6e802ba3e657bb30ccdd38ed574e9 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 9 Oct 2023 23:49:42 -0400 Subject: [PATCH 0033/1012] Removes re-exports to limit import scopes --- src/commands/git/branch.ts | 10 ++++++---- src/commands/git/cherry-pick.ts | 13 ++----------- src/commands/git/coauthors.ts | 3 ++- src/commands/git/fetch.ts | 11 ++--------- src/commands/git/log.ts | 10 ++-------- src/commands/git/merge.ts | 14 +++----------- src/commands/git/pull.ts | 12 +++--------- src/commands/git/push.ts | 13 +++---------- src/commands/git/rebase.ts | 14 +++----------- src/commands/git/remote.ts | 10 ++++++---- src/commands/git/reset.ts | 11 ++--------- src/commands/git/revert.ts | 11 ++--------- src/commands/git/search.ts | 12 +++--------- src/commands/git/show.ts | 6 ++---- src/commands/git/stash.ts | 7 ++----- src/commands/git/status.ts | 3 ++- src/commands/git/switch.ts | 7 ++----- src/commands/git/tag.ts | 10 ++++++---- src/commands/git/worktree.ts | 10 ++++++---- src/commands/quickCommand.steps.ts | 6 ++++-- src/commands/quickCommand.ts | 3 --- src/quickpicks/referencePicker.ts | 7 ++----- 22 files changed, 65 insertions(+), 138 deletions(-) diff --git a/src/commands/git/branch.ts b/src/commands/git/branch.ts index 6e21781eeb16a..b6c8a6b939fe1 100644 --- a/src/commands/git/branch.ts +++ b/src/commands/git/branch.ts @@ -18,19 +18,21 @@ import type { StepState, } from '../quickCommand'; import { - appendReposToTitle, canPickStepContinue, createConfirmStep, createPickStep, endSteps, + QuickCommand, + StepResultBreak, +} from '../quickCommand'; +import { + appendReposToTitle, inputBranchNameStep, pickBranchesStep, pickBranchOrTagStep, pickBranchStep, pickRepositoryStep, - QuickCommand, - StepResultBreak, -} from '../quickCommand'; +} from '../quickCommand.steps'; interface Context { repos: Repository[]; diff --git a/src/commands/git/cherry-pick.ts b/src/commands/git/cherry-pick.ts index c3f1116581e7e..b1528a8c38e99 100644 --- a/src/commands/git/cherry-pick.ts +++ b/src/commands/git/cherry-pick.ts @@ -16,17 +16,8 @@ import type { StepSelection, StepState, } from '../quickCommand'; -import { - appendReposToTitle, - canPickStepContinue, - createConfirmStep, - endSteps, - pickBranchOrTagStep, - pickCommitsStep, - pickRepositoryStep, - QuickCommand, - StepResultBreak, -} from '../quickCommand'; +import { canPickStepContinue, createConfirmStep, endSteps, QuickCommand, StepResultBreak } from '../quickCommand'; +import { appendReposToTitle, pickBranchOrTagStep, pickCommitsStep, pickRepositoryStep } from '../quickCommand.steps'; interface Context { repos: Repository[]; diff --git a/src/commands/git/coauthors.ts b/src/commands/git/coauthors.ts index cc8b1430e61f0..e065c7b41a382 100644 --- a/src/commands/git/coauthors.ts +++ b/src/commands/git/coauthors.ts @@ -5,7 +5,8 @@ import { executeCoreCommand } from '../../system/command'; import { normalizePath } from '../../system/path'; import type { ViewsWithRepositoryFolders } from '../../views/viewBase'; import type { PartialStepState, StepGenerator, StepState } from '../quickCommand'; -import { endSteps, pickContributorsStep, pickRepositoryStep, QuickCommand, StepResultBreak } from '../quickCommand'; +import { endSteps, QuickCommand, StepResultBreak } from '../quickCommand'; +import { pickContributorsStep, pickRepositoryStep } from '../quickCommand.steps'; interface Context { repos: Repository[]; diff --git a/src/commands/git/fetch.ts b/src/commands/git/fetch.ts index f2d0b2512ac59..32657b68e77ce 100644 --- a/src/commands/git/fetch.ts +++ b/src/commands/git/fetch.ts @@ -17,15 +17,8 @@ import type { StepSelection, StepState, } from '../quickCommand'; -import { - appendReposToTitle, - canPickStepContinue, - createConfirmStep, - endSteps, - pickRepositoriesStep, - QuickCommand, - StepResultBreak, -} from '../quickCommand'; +import { canPickStepContinue, createConfirmStep, endSteps, QuickCommand, StepResultBreak } from '../quickCommand'; +import { appendReposToTitle, pickRepositoriesStep } from '../quickCommand.steps'; interface Context { repos: Repository[]; diff --git a/src/commands/git/log.ts b/src/commands/git/log.ts index a822b5221354b..fc6cb3d409bd5 100644 --- a/src/commands/git/log.ts +++ b/src/commands/git/log.ts @@ -11,14 +11,8 @@ import { pad } from '../../system/string'; import type { ViewsWithRepositoryFolders } from '../../views/viewBase'; import { getSteps } from '../gitCommands.utils'; import type { PartialStepState, StepGenerator, StepResult } from '../quickCommand'; -import { - endSteps, - pickBranchOrTagStep, - pickCommitStep, - pickRepositoryStep, - QuickCommand, - StepResultBreak, -} from '../quickCommand'; +import { endSteps, QuickCommand, StepResultBreak } from '../quickCommand'; +import { pickBranchOrTagStep, pickCommitStep, pickRepositoryStep } from '../quickCommand.steps'; interface Context { repos: Repository[]; diff --git a/src/commands/git/merge.ts b/src/commands/git/merge.ts index 176306c0386ef..dd3e742f6f32e 100644 --- a/src/commands/git/merge.ts +++ b/src/commands/git/merge.ts @@ -19,17 +19,9 @@ import type { StepSelection, StepState, } from '../quickCommand'; -import { - appendReposToTitle, - canPickStepContinue, - endSteps, - pickBranchOrTagStep, - pickCommitStep, - PickCommitToggleQuickInputButton, - pickRepositoryStep, - QuickCommand, - StepResultBreak, -} from '../quickCommand'; +import { canPickStepContinue, endSteps, QuickCommand, StepResultBreak } from '../quickCommand'; +import { PickCommitToggleQuickInputButton } from '../quickCommand.buttons'; +import { appendReposToTitle, pickBranchOrTagStep, pickCommitStep, pickRepositoryStep } from '../quickCommand.steps'; interface Context { repos: Repository[]; diff --git a/src/commands/git/pull.ts b/src/commands/git/pull.ts index 100d906244a63..73f6f731d5c53 100644 --- a/src/commands/git/pull.ts +++ b/src/commands/git/pull.ts @@ -19,15 +19,9 @@ import type { StepSelection, StepState, } from '../quickCommand'; -import { - appendReposToTitle, - canPickStepContinue, - endSteps, - FetchQuickInputButton, - pickRepositoriesStep, - QuickCommand, - StepResultBreak, -} from '../quickCommand'; +import { canPickStepContinue, endSteps, QuickCommand, StepResultBreak } from '../quickCommand'; +import { FetchQuickInputButton } from '../quickCommand.buttons'; +import { appendReposToTitle, pickRepositoriesStep } from '../quickCommand.steps'; interface Context { repos: Repository[]; diff --git a/src/commands/git/push.ts b/src/commands/git/push.ts index 96df8d58c9463..90568608d3b33 100644 --- a/src/commands/git/push.ts +++ b/src/commands/git/push.ts @@ -21,16 +21,9 @@ import type { StepSelection, StepState, } from '../quickCommand'; -import { - appendReposToTitle, - canPickStepContinue, - endSteps, - FetchQuickInputButton, - pickRepositoriesStep, - pickRepositoryStep, - QuickCommand, - StepResultBreak, -} from '../quickCommand'; +import { canPickStepContinue, endSteps, QuickCommand, StepResultBreak } from '../quickCommand'; +import { FetchQuickInputButton } from '../quickCommand.buttons'; +import { appendReposToTitle, pickRepositoriesStep, pickRepositoryStep } from '../quickCommand.steps'; interface Context { repos: Repository[]; diff --git a/src/commands/git/rebase.ts b/src/commands/git/rebase.ts index 5592d86ab9c8a..78f606abb4ff2 100644 --- a/src/commands/git/rebase.ts +++ b/src/commands/git/rebase.ts @@ -20,17 +20,9 @@ import type { StepSelection, StepState, } from '../quickCommand'; -import { - appendReposToTitle, - canPickStepContinue, - endSteps, - pickBranchOrTagStep, - pickCommitStep, - PickCommitToggleQuickInputButton, - pickRepositoryStep, - QuickCommand, - StepResultBreak, -} from '../quickCommand'; +import { canPickStepContinue, endSteps, QuickCommand, StepResultBreak } from '../quickCommand'; +import { PickCommitToggleQuickInputButton } from '../quickCommand.buttons'; +import { appendReposToTitle, pickBranchOrTagStep, pickCommitStep, pickRepositoryStep } from '../quickCommand.steps'; interface Context { repos: Repository[]; diff --git a/src/commands/git/remote.ts b/src/commands/git/remote.ts index ed9ca4619d630..188be17934abc 100644 --- a/src/commands/git/remote.ts +++ b/src/commands/git/remote.ts @@ -19,18 +19,20 @@ import type { StepState, } from '../quickCommand'; import { - appendReposToTitle, canPickStepContinue, createConfirmStep, createPickStep, endSteps, + QuickCommand, + StepResultBreak, +} from '../quickCommand'; +import { + appendReposToTitle, inputRemoteNameStep, inputRemoteUrlStep, pickRemoteStep, pickRepositoryStep, - QuickCommand, - StepResultBreak, -} from '../quickCommand'; +} from '../quickCommand.steps'; interface Context { repos: Repository[]; diff --git a/src/commands/git/reset.ts b/src/commands/git/reset.ts index f98aeac4e5483..c28640ca3706c 100644 --- a/src/commands/git/reset.ts +++ b/src/commands/git/reset.ts @@ -16,15 +16,8 @@ import type { StepSelection, StepState, } from '../quickCommand'; -import { - appendReposToTitle, - canPickStepContinue, - endSteps, - pickCommitStep, - pickRepositoryStep, - QuickCommand, - StepResultBreak, -} from '../quickCommand'; +import { canPickStepContinue, endSteps, QuickCommand, StepResultBreak } from '../quickCommand'; +import { appendReposToTitle, pickCommitStep, pickRepositoryStep } from '../quickCommand.steps'; interface Context { repos: Repository[]; diff --git a/src/commands/git/revert.ts b/src/commands/git/revert.ts index 6756d84e28568..0acf8e6cf298d 100644 --- a/src/commands/git/revert.ts +++ b/src/commands/git/revert.ts @@ -16,15 +16,8 @@ import type { StepSelection, StepState, } from '../quickCommand'; -import { - appendReposToTitle, - canPickStepContinue, - endSteps, - pickCommitsStep, - pickRepositoryStep, - QuickCommand, - StepResultBreak, -} from '../quickCommand'; +import { canPickStepContinue, endSteps, QuickCommand, StepResultBreak } from '../quickCommand'; +import { appendReposToTitle, pickCommitsStep, pickRepositoryStep } from '../quickCommand.steps'; interface Context { repos: Repository[]; diff --git a/src/commands/git/search.ts b/src/commands/git/search.ts index 60690fbc6edd3..2f75df2615980 100644 --- a/src/commands/git/search.ts +++ b/src/commands/git/search.ts @@ -22,20 +22,14 @@ import type { StepSelection, StepState, } from '../quickCommand'; +import { canPickStepContinue, createPickStep, endSteps, QuickCommand, StepResultBreak } from '../quickCommand'; import { - appendReposToTitle, - canPickStepContinue, - createPickStep, - endSteps, MatchAllToggleQuickInputButton, MatchCaseToggleQuickInputButton, MatchRegexToggleQuickInputButton, - pickCommitStep, - pickRepositoryStep, - QuickCommand, ShowResultsInSideBarQuickInputButton, - StepResultBreak, -} from '../quickCommand'; +} from '../quickCommand.buttons'; +import { appendReposToTitle, pickCommitStep, pickRepositoryStep } from '../quickCommand.steps'; interface Context { repos: Repository[]; diff --git a/src/commands/git/show.ts b/src/commands/git/show.ts index 4f9d24484c731..d6a389bb231e7 100644 --- a/src/commands/git/show.ts +++ b/src/commands/git/show.ts @@ -8,16 +8,14 @@ import { CommandQuickPickItem } from '../../quickpicks/items/common'; import { GitCommandQuickPickItem } from '../../quickpicks/items/gitCommands'; import type { ViewsWithRepositoryFolders } from '../../views/viewBase'; import type { PartialStepState, StepGenerator } from '../quickCommand'; +import { endSteps, QuickCommand, StepResultBreak } from '../quickCommand'; import { - endSteps, pickCommitStep, pickRepositoryStep, - QuickCommand, showCommitOrStashFilesStep, showCommitOrStashFileStep, showCommitOrStashStep, - StepResultBreak, -} from '../quickCommand'; +} from '../quickCommand.steps'; interface Context { repos: Repository[]; diff --git a/src/commands/git/stash.ts b/src/commands/git/stash.ts index 07b5a4c1d7752..cf5b97e47d75d 100644 --- a/src/commands/git/stash.ts +++ b/src/commands/git/stash.ts @@ -29,20 +29,17 @@ import type { StepState, } from '../quickCommand'; import { - appendReposToTitle, canInputStepContinue, canPickStepContinue, canStepContinue, createInputStep, createPickStep, endSteps, - pickRepositoryStep, - pickStashStep, QuickCommand, - RevealInSideBarQuickInputButton, - ShowDetailsViewQuickInputButton, StepResultBreak, } from '../quickCommand'; +import { RevealInSideBarQuickInputButton, ShowDetailsViewQuickInputButton } from '../quickCommand.buttons'; +import { appendReposToTitle, pickRepositoryStep, pickStashStep } from '../quickCommand.steps'; interface Context { repos: Repository[]; diff --git a/src/commands/git/status.ts b/src/commands/git/status.ts index 4735e43c9f064..b82ff4d1d1eb4 100644 --- a/src/commands/git/status.ts +++ b/src/commands/git/status.ts @@ -8,7 +8,8 @@ import { GitCommandQuickPickItem } from '../../quickpicks/items/gitCommands'; import { pad } from '../../system/string'; import type { ViewsWithRepositoryFolders } from '../../views/viewBase'; import type { PartialStepState, StepGenerator, StepState } from '../quickCommand'; -import { endSteps, pickRepositoryStep, QuickCommand, showRepositoryStatusStep, StepResultBreak } from '../quickCommand'; +import { endSteps, QuickCommand, StepResultBreak } from '../quickCommand'; +import { pickRepositoryStep, showRepositoryStatusStep } from '../quickCommand.steps'; interface Context { repos: Repository[]; diff --git a/src/commands/git/switch.ts b/src/commands/git/switch.ts index 4cb844526e034..90453cfdd6581 100644 --- a/src/commands/git/switch.ts +++ b/src/commands/git/switch.ts @@ -14,16 +14,13 @@ import type { StepSelection, StepState, } from '../quickCommand'; +import { canPickStepContinue, endSteps, QuickCommand, StepResultBreak } from '../quickCommand'; import { appendReposToTitle, - canPickStepContinue, - endSteps, inputBranchNameStep, pickBranchOrTagStepMultiRepo, pickRepositoriesStep, - QuickCommand, - StepResultBreak, -} from '../quickCommand'; +} from '../quickCommand.steps'; interface Context { repos: Repository[]; diff --git a/src/commands/git/tag.ts b/src/commands/git/tag.ts index 10d2a2fc657dd..3e45da570ce3a 100644 --- a/src/commands/git/tag.ts +++ b/src/commands/git/tag.ts @@ -18,7 +18,6 @@ import type { StepState, } from '../quickCommand'; import { - appendReposToTitle, canInputStepContinue, canPickStepContinue, canStepContinue, @@ -26,13 +25,16 @@ import { createInputStep, createPickStep, endSteps, + QuickCommand, + StepResultBreak, +} from '../quickCommand'; +import { + appendReposToTitle, inputTagNameStep, pickBranchOrTagStep, pickRepositoryStep, pickTagsStep, - QuickCommand, - StepResultBreak, -} from '../quickCommand'; +} from '../quickCommand.steps'; interface Context { repos: Repository[]; diff --git a/src/commands/git/worktree.ts b/src/commands/git/worktree.ts index be138f8f12be5..b90bff3bf3f83 100644 --- a/src/commands/git/worktree.ts +++ b/src/commands/git/worktree.ts @@ -36,7 +36,6 @@ import type { StepState, } from '../quickCommand'; import { - appendReposToTitle, canInputStepContinue, canPickStepContinue, canStepContinue, @@ -44,15 +43,18 @@ import { createCustomStep, createPickStep, endSteps, + QuickCommand, + StepResultBreak, +} from '../quickCommand'; +import { + appendReposToTitle, ensureAccessStep, inputBranchNameStep, pickBranchOrTagStep, pickRepositoryStep, pickWorktreesStep, pickWorktreeStep, - QuickCommand, - StepResultBreak, -} from '../quickCommand'; +} from '../quickCommand.steps'; interface Context { repos: Repository[]; diff --git a/src/commands/quickCommand.steps.ts b/src/commands/quickCommand.steps.ts index 4d7e1f4027c70..2a0aae893e1c4 100644 --- a/src/commands/quickCommand.steps.ts +++ b/src/commands/quickCommand.steps.ts @@ -117,6 +117,9 @@ import { createInputStep, createPickStep, endSteps, + StepResultBreak, +} from './quickCommand'; +import { LoadMoreQuickInputButton, OpenChangesViewQuickInputButton, OpenInNewWindowQuickInputButton, @@ -124,8 +127,7 @@ import { RevealInSideBarQuickInputButton, ShowDetailsViewQuickInputButton, ShowTagsToggleQuickInputButton, - StepResultBreak, -} from './quickCommand'; +} from './quickCommand.buttons'; export function appendReposToTitle< State extends { repo: Repository } | { repos: Repository[] }, diff --git a/src/commands/quickCommand.ts b/src/commands/quickCommand.ts index f2f655eeffe60..b2aa8553c337a 100644 --- a/src/commands/quickCommand.ts +++ b/src/commands/quickCommand.ts @@ -5,9 +5,6 @@ import type { DirectiveQuickPickItem } from '../quickpicks/items/directive'; import { createDirectiveQuickPickItem, Directive, isDirective } from '../quickpicks/items/directive'; import { configuration } from '../system/configuration'; -export * from './quickCommand.buttons'; -export * from './quickCommand.steps'; - export interface CustomStep { ignoreFocusOut?: boolean; diff --git a/src/quickpicks/referencePicker.ts b/src/quickpicks/referencePicker.ts index df4d3586f6a8b..7e083d86fd436 100644 --- a/src/quickpicks/referencePicker.ts +++ b/src/quickpicks/referencePicker.ts @@ -1,10 +1,7 @@ import type { Disposable, QuickPick } from 'vscode'; import { CancellationTokenSource, window } from 'vscode'; -import { - getBranchesAndOrTags, - getValidateGitReferenceFn, - RevealInSideBarQuickInputButton, -} from '../commands/quickCommand'; +import { RevealInSideBarQuickInputButton } from '../commands/quickCommand.buttons'; +import { getBranchesAndOrTags, getValidateGitReferenceFn } from '../commands/quickCommand.steps'; import type { Keys } from '../constants'; import { GlyphChars } from '../constants'; import { Container } from '../container'; From 56cdfe048d0e7fef7411fb4a5d2b339a4353455a Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 10 Oct 2023 00:01:50 -0400 Subject: [PATCH 0034/1012] Avoids using commands as a "barrel" file --- src/codelens/codeLensProvider.ts | 16 +-- src/commands.ts | 134 +++++++++--------- src/container.ts | 2 +- src/extension.ts | 4 +- src/git/actions.ts | 7 +- src/git/actions/commit.ts | 18 ++- src/git/formatters/commitFormatter.ts | 16 +-- src/hovers/hovers.ts | 3 +- src/partners.ts | 2 +- src/plus/webviews/focus/focusWebview.ts | 2 +- src/plus/webviews/graph/graphWebview.ts | 14 +- src/quickpicks/items/commits.ts | 2 +- src/quickpicks/remoteProviderPicker.ts | 2 +- src/terminal/linkProvider.ts | 10 +- src/views/nodes/UncommittedFileNode.ts | 2 +- src/views/nodes/commitFileNode.ts | 2 +- src/views/nodes/commitNode.ts | 2 +- src/views/nodes/fileRevisionAsCommitNode.ts | 2 +- .../nodes/mergeConflictCurrentChangesNode.ts | 2 +- .../nodes/mergeConflictIncomingChangesNode.ts | 2 +- src/views/nodes/resultsFileNode.ts | 2 +- src/views/nodes/statusFileNode.ts | 2 +- src/views/viewCommands.ts | 10 +- .../commitDetails/commitDetailsWebview.ts | 2 +- src/webviews/rebase/rebaseEditor.ts | 2 +- 25 files changed, 125 insertions(+), 137 deletions(-) diff --git a/src/codelens/codeLensProvider.ts b/src/codelens/codeLensProvider.ts index 4e7ed32e1b0ca..e2c8e416e2a98 100644 --- a/src/codelens/codeLensProvider.ts +++ b/src/codelens/codeLensProvider.ts @@ -9,15 +9,13 @@ import type { Uri, } from 'vscode'; import { CodeLens, EventEmitter, Location, Position, Range, SymbolInformation, SymbolKind } from 'vscode'; -import type { - DiffWithPreviousCommandArgs, - OpenOnRemoteCommandArgs, - ShowCommitsInViewCommandArgs, - ShowQuickCommitCommandArgs, - ShowQuickCommitFileCommandArgs, - ShowQuickFileHistoryCommandArgs, - ToggleFileChangesAnnotationCommandArgs, -} from '../commands'; +import type { DiffWithPreviousCommandArgs } from '../commands/diffWithPrevious'; +import type { OpenOnRemoteCommandArgs } from '../commands/openOnRemote'; +import type { ShowCommitsInViewCommandArgs } from '../commands/showCommitsInView'; +import type { ShowQuickCommitCommandArgs } from '../commands/showQuickCommit'; +import type { ShowQuickCommitFileCommandArgs } from '../commands/showQuickCommitFile'; +import type { ShowQuickFileHistoryCommandArgs } from '../commands/showQuickFileHistory'; +import type { ToggleFileChangesAnnotationCommandArgs } from '../commands/toggleFileAnnotations'; import type { CodeLensConfig, CodeLensLanguageScope } from '../config'; import { CodeLensCommand } from '../config'; import { Commands, Schemes } from '../constants'; diff --git a/src/commands.ts b/src/commands.ts index 8384f9c267e52..0f67c26b621de 100644 --- a/src/commands.ts +++ b/src/commands.ts @@ -1,67 +1,67 @@ -export * from './commands/addAuthors'; -export * from './commands/browseRepoAtRevision'; -export * from './commands/closeUnchangedFiles'; -export * from './commands/compareWith'; -export * from './commands/copyCurrentBranch'; -export * from './commands/copyDeepLink'; -export * from './commands/copyMessageToClipboard'; -export * from './commands/copyShaToClipboard'; -export * from './commands/copyRelativePathToClipboard'; -export * from './commands/createPullRequestOnRemote'; -export * from './commands/openDirectoryCompare'; -export * from './commands/diffLineWithPrevious'; -export * from './commands/diffLineWithWorking'; -export * from './commands/diffWith'; -export * from './commands/diffWithNext'; -export * from './commands/diffWithPrevious'; -export * from './commands/diffWithRevision'; -export * from './commands/diffWithRevisionFrom'; -export * from './commands/diffWithWorking'; -export * from './commands/externalDiff'; -export * from './commands/generateCommitMessage'; -export * from './commands/ghpr/openOrCreateWorktree'; -export * from './commands/gitCommands'; -export * from './commands/inviteToLiveShare'; -export * from './commands/logging'; -export * from './commands/openAssociatedPullRequestOnRemote'; -export * from './commands/openBranchesOnRemote'; -export * from './commands/openBranchOnRemote'; -export * from './commands/openCurrentBranchOnRemote'; -export * from './commands/openChangedFiles'; -export * from './commands/openCommitOnRemote'; -export * from './commands/openComparisonOnRemote'; -export * from './commands/openFileFromRemote'; -export * from './commands/openFileOnRemote'; -export * from './commands/openFileAtRevision'; -export * from './commands/openFileAtRevisionFrom'; -export * from './commands/openOnRemote'; -export * from './commands/openIssueOnRemote'; -export * from './commands/openPullRequestOnRemote'; -export * from './commands/openRepoOnRemote'; -export * from './commands/openRevisionFile'; -export * from './commands/openWorkingFile'; -export * from './commands/rebaseEditor'; -export * from './commands/refreshHover'; -export * from './commands/remoteProviders'; -export * from './commands/repositories'; -export * from './commands/resets'; -export * from './commands/resetViewsLayout'; -export * from './commands/searchCommits'; -export * from './commands/showCommitsInView'; -export * from './commands/showLastQuickPick'; -export * from './commands/openOnlyChangedFiles'; -export * from './commands/showQuickBranchHistory'; -export * from './commands/showQuickCommit'; -export * from './commands/showQuickCommitFile'; -export * from './commands/showQuickFileHistory'; -export * from './commands/showQuickRepoStatus'; -export * from './commands/showQuickStashList'; -export * from './commands/showView'; -export * from './commands/stashApply'; -export * from './commands/stashSave'; -export * from './commands/switchAIModel'; -export * from './commands/switchMode'; -export * from './commands/toggleCodeLens'; -export * from './commands/toggleFileAnnotations'; -export * from './commands/toggleLineBlame'; -export * from './commands/walkthroughs'; +import './commands/addAuthors'; +import './commands/browseRepoAtRevision'; +import './commands/closeUnchangedFiles'; +import './commands/compareWith'; +import './commands/copyCurrentBranch'; +import './commands/copyDeepLink'; +import './commands/copyMessageToClipboard'; +import './commands/copyShaToClipboard'; +import './commands/copyRelativePathToClipboard'; +import './commands/createPullRequestOnRemote'; +import './commands/openDirectoryCompare'; +import './commands/diffLineWithPrevious'; +import './commands/diffLineWithWorking'; +import './commands/diffWith'; +import './commands/diffWithNext'; +import './commands/diffWithPrevious'; +import './commands/diffWithRevision'; +import './commands/diffWithRevisionFrom'; +import './commands/diffWithWorking'; +import './commands/externalDiff'; +import './commands/generateCommitMessage'; +import './commands/ghpr/openOrCreateWorktree'; +import './commands/gitCommands'; +import './commands/inviteToLiveShare'; +import './commands/logging'; +import './commands/openAssociatedPullRequestOnRemote'; +import './commands/openBranchesOnRemote'; +import './commands/openBranchOnRemote'; +import './commands/openCurrentBranchOnRemote'; +import './commands/openChangedFiles'; +import './commands/openCommitOnRemote'; +import './commands/openComparisonOnRemote'; +import './commands/openFileFromRemote'; +import './commands/openFileOnRemote'; +import './commands/openFileAtRevision'; +import './commands/openFileAtRevisionFrom'; +import './commands/openOnRemote'; +import './commands/openIssueOnRemote'; +import './commands/openPullRequestOnRemote'; +import './commands/openRepoOnRemote'; +import './commands/openRevisionFile'; +import './commands/openWorkingFile'; +import './commands/rebaseEditor'; +import './commands/refreshHover'; +import './commands/remoteProviders'; +import './commands/repositories'; +import './commands/resets'; +import './commands/resetViewsLayout'; +import './commands/searchCommits'; +import './commands/showCommitsInView'; +import './commands/showLastQuickPick'; +import './commands/openOnlyChangedFiles'; +import './commands/showQuickBranchHistory'; +import './commands/showQuickCommit'; +import './commands/showQuickCommitFile'; +import './commands/showQuickFileHistory'; +import './commands/showQuickRepoStatus'; +import './commands/showQuickStashList'; +import './commands/showView'; +import './commands/stashApply'; +import './commands/stashSave'; +import './commands/switchAIModel'; +import './commands/switchMode'; +import './commands/toggleCodeLens'; +import './commands/toggleFileAnnotations'; +import './commands/toggleLineBlame'; +import './commands/walkthroughs'; diff --git a/src/container.ts b/src/container.ts index ff8014a711d2f..e7744880de8fb 100644 --- a/src/container.ts +++ b/src/container.ts @@ -9,7 +9,7 @@ import { ActionRunners } from './api/actionRunners'; import { setDefaultGravatarsStyle } from './avatars'; import { CacheProvider } from './cache'; import { GitCodeLensController } from './codelens/codeLensController'; -import type { ToggleFileAnnotationCommandArgs } from './commands'; +import type { ToggleFileAnnotationCommandArgs } from './commands/toggleFileAnnotations'; import type { DateStyle, FileAnnotationType, ModeConfig } from './config'; import { fromOutputLevel } from './config'; import { Commands, extensionPrefix } from './constants'; diff --git a/src/extension.ts b/src/extension.ts index 362eeaffbaa62..95d026bdc9f35 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -4,7 +4,8 @@ import { hrtime } from '@env/hrtime'; import { isWeb } from '@env/platform'; import { Api } from './api/api'; import type { CreatePullRequestActionContext, GitLensApi, OpenPullRequestActionContext } from './api/gitlens'; -import type { CreatePullRequestOnRemoteCommandArgs, OpenPullRequestOnRemoteCommandArgs } from './commands'; +import type { CreatePullRequestOnRemoteCommandArgs } from './commands/createPullRequestOnRemote'; +import type { OpenPullRequestOnRemoteCommandArgs } from './commands/openPullRequestOnRemote'; import { fromOutputLevel } from './config'; import { Commands, SyncedStorageKeys } from './constants'; import { Container } from './container'; @@ -26,6 +27,7 @@ import { Stopwatch } from './system/stopwatch'; import { Storage } from './system/storage'; import { compare, fromString, satisfies } from './system/version'; import { isViewNode } from './views/nodes/viewNode'; +import './commands'; export async function activate(context: ExtensionContext): Promise { const gitlensVersion: string = context.extension.packageJSON.version; diff --git a/src/git/actions.ts b/src/git/actions.ts index e3052e133a762..833500f8e6360 100644 --- a/src/git/actions.ts +++ b/src/git/actions.ts @@ -1,9 +1,6 @@ import type { Uri } from 'vscode'; -import type { - BrowseRepoAtRevisionCommandArgs, - GitCommandsCommandArgs, - GitCommandsCommandArgsWithCompletion, -} from '../commands'; +import type { BrowseRepoAtRevisionCommandArgs } from '../commands/browseRepoAtRevision'; +import type { GitCommandsCommandArgs, GitCommandsCommandArgsWithCompletion } from '../commands/gitCommands'; import { Commands } from '../constants'; import { executeCommand, executeEditorCommand } from '../system/command'; import { defer } from '../system/promise'; diff --git a/src/git/actions/commit.ts b/src/git/actions/commit.ts index 3393bf5e82240..f7e124dbc124b 100644 --- a/src/git/actions/commit.ts +++ b/src/git/actions/commit.ts @@ -1,15 +1,13 @@ import type { TextDocumentShowOptions } from 'vscode'; import { env, Range, Uri, window } from 'vscode'; -import type { - DiffWithCommandArgs, - DiffWithPreviousCommandArgs, - DiffWithWorkingCommandArgs, - OpenFileOnRemoteCommandArgs, - OpenOnlyChangedFilesCommandArgs, - OpenWorkingFileCommandArgs, - ShowQuickCommitCommandArgs, - ShowQuickCommitFileCommandArgs, -} from '../../commands'; +import type { DiffWithCommandArgs } from '../../commands/diffWith'; +import type { DiffWithPreviousCommandArgs } from '../../commands/diffWithPrevious'; +import type { DiffWithWorkingCommandArgs } from '../../commands/diffWithWorking'; +import type { OpenFileOnRemoteCommandArgs } from '../../commands/openFileOnRemote'; +import type { OpenOnlyChangedFilesCommandArgs } from '../../commands/openOnlyChangedFiles'; +import type { OpenWorkingFileCommandArgs } from '../../commands/openWorkingFile'; +import type { ShowQuickCommitCommandArgs } from '../../commands/showQuickCommit'; +import type { ShowQuickCommitFileCommandArgs } from '../../commands/showQuickCommitFile'; import type { FileAnnotationType } from '../../config'; import { Commands } from '../../constants'; import { Container } from '../../container'; diff --git a/src/git/formatters/commitFormatter.ts b/src/git/formatters/commitFormatter.ts index c85673df833e1..5b0b5b9e89c1d 100644 --- a/src/git/formatters/commitFormatter.ts +++ b/src/git/formatters/commitFormatter.ts @@ -7,16 +7,14 @@ import type { OpenPullRequestActionContext, } from '../../api/gitlens'; import { getPresenceDataUri } from '../../avatars'; -import type { ShowQuickCommitCommandArgs } from '../../commands'; -import { - ConnectRemoteProviderCommand, - DiffWithCommand, - OpenCommitOnRemoteCommand, - OpenFileAtRevisionCommand, - ShowCommitsInViewCommand, - ShowQuickCommitFileCommand, -} from '../../commands'; import { Command } from '../../commands/base'; +import { DiffWithCommand } from '../../commands/diffWith'; +import { OpenCommitOnRemoteCommand } from '../../commands/openCommitOnRemote'; +import { OpenFileAtRevisionCommand } from '../../commands/openFileAtRevision'; +import { ConnectRemoteProviderCommand } from '../../commands/remoteProviders'; +import { ShowCommitsInViewCommand } from '../../commands/showCommitsInView'; +import type { ShowQuickCommitCommandArgs } from '../../commands/showQuickCommit'; +import { ShowQuickCommitFileCommand } from '../../commands/showQuickCommitFile'; import type { DateStyle } from '../../config'; import { Commands, GlyphChars } from '../../constants'; import { Container } from '../../container'; diff --git a/src/hovers/hovers.ts b/src/hovers/hovers.ts index 6debcc6bc89fc..8a6071f316dda 100644 --- a/src/hovers/hovers.ts +++ b/src/hovers/hovers.ts @@ -1,7 +1,8 @@ import type { CancellationToken, TextDocument } from 'vscode'; import { MarkdownString } from 'vscode'; import type { EnrichedAutolink } from '../annotations/autolinks'; -import { DiffWithCommand, ShowQuickCommitCommand } from '../commands'; +import { DiffWithCommand } from '../commands/diffWith'; +import { ShowQuickCommitCommand } from '../commands/showQuickCommit'; import { GlyphChars } from '../constants'; import type { Container } from '../container'; import { CommitFormatter } from '../git/formatters/commitFormatter'; diff --git a/src/partners.ts b/src/partners.ts index 4be6fa2f06c77..64462177f2fe6 100644 --- a/src/partners.ts +++ b/src/partners.ts @@ -1,7 +1,7 @@ import type { CancellationTokenSource, Extension, ExtensionContext, Uri } from 'vscode'; import { extensions } from 'vscode'; import type { ActionContext, HoverCommandsActionContext } from './api/gitlens'; -import type { InviteToLiveShareCommandArgs } from './commands'; +import type { InviteToLiveShareCommandArgs } from './commands/inviteToLiveShare'; import { Commands } from './constants'; import { Container } from './container'; import { executeCommand, executeCoreCommand } from './system/command'; diff --git a/src/plus/webviews/focus/focusWebview.ts b/src/plus/webviews/focus/focusWebview.ts index 8d16b37b90d2f..71c84b1875391 100644 --- a/src/plus/webviews/focus/focusWebview.ts +++ b/src/plus/webviews/focus/focusWebview.ts @@ -1,5 +1,5 @@ import { Disposable, Uri, window } from 'vscode'; -import type { GHPRPullRequest } from '../../../commands'; +import type { GHPRPullRequest } from '../../../commands/ghpr/openOrCreateWorktree'; import { Commands } from '../../../constants'; import type { Container } from '../../../container'; import { PlusFeatures } from '../../../features'; diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts index e2783acff2c84..84a9993a7991f 100644 --- a/src/plus/webviews/graph/graphWebview.ts +++ b/src/plus/webviews/graph/graphWebview.ts @@ -2,15 +2,13 @@ import type { ColorTheme, ConfigurationChangeEvent, Uri, ViewColumn } from 'vsco import { CancellationTokenSource, Disposable, env, window } from 'vscode'; import type { CreatePullRequestActionContext } from '../../../api/gitlens'; import { getAvatarUri } from '../../../avatars'; -import type { - CopyDeepLinkCommandArgs, - CopyMessageToClipboardCommandArgs, - CopyShaToClipboardCommandArgs, - OpenOnRemoteCommandArgs, - OpenPullRequestOnRemoteCommandArgs, - ShowCommitsInViewCommandArgs, -} from '../../../commands'; import { parseCommandContext } from '../../../commands/base'; +import type { CopyDeepLinkCommandArgs } from '../../../commands/copyDeepLink'; +import type { CopyMessageToClipboardCommandArgs } from '../../../commands/copyMessageToClipboard'; +import type { CopyShaToClipboardCommandArgs } from '../../../commands/copyShaToClipboard'; +import type { OpenOnRemoteCommandArgs } from '../../../commands/openOnRemote'; +import type { OpenPullRequestOnRemoteCommandArgs } from '../../../commands/openPullRequestOnRemote'; +import type { ShowCommitsInViewCommandArgs } from '../../../commands/showCommitsInView'; import type { Config, GraphMinimapMarkersAdditionalTypes, GraphScrollMarkersAdditionalTypes } from '../../../config'; import type { StoredGraphFilters, StoredGraphIncludeOnlyRef, StoredGraphRefType } from '../../../constants'; import { Commands, GlyphChars } from '../../../constants'; diff --git a/src/quickpicks/items/commits.ts b/src/quickpicks/items/commits.ts index a2d80860a8a10..ad18b94243ad3 100644 --- a/src/quickpicks/items/commits.ts +++ b/src/quickpicks/items/commits.ts @@ -1,7 +1,7 @@ import type { QuickPickItem } from 'vscode'; import { window } from 'vscode'; -import type { OpenOnlyChangedFilesCommandArgs } from '../../commands'; import type { OpenChangedFilesCommandArgs } from '../../commands/openChangedFiles'; +import type { OpenOnlyChangedFilesCommandArgs } from '../../commands/openOnlyChangedFiles'; import { RevealInSideBarQuickInputButton, ShowDetailsViewQuickInputButton } from '../../commands/quickCommand.buttons'; import type { Keys } from '../../constants'; import { Commands, GlyphChars } from '../../constants'; diff --git a/src/quickpicks/remoteProviderPicker.ts b/src/quickpicks/remoteProviderPicker.ts index bc1aaf9a66ec6..f44f51e50b9eb 100644 --- a/src/quickpicks/remoteProviderPicker.ts +++ b/src/quickpicks/remoteProviderPicker.ts @@ -1,6 +1,6 @@ import type { Disposable, QuickInputButton } from 'vscode'; import { env, Uri, window } from 'vscode'; -import type { OpenOnRemoteCommandArgs } from '../commands'; +import type { OpenOnRemoteCommandArgs } from '../commands/openOnRemote'; import { SetRemoteAsDefaultQuickInputButton } from '../commands/quickCommand.buttons'; import type { Keys } from '../constants'; import { Commands, GlyphChars } from '../constants'; diff --git a/src/terminal/linkProvider.ts b/src/terminal/linkProvider.ts index 1e061fe09f39d..44c1f39aa07e0 100644 --- a/src/terminal/linkProvider.ts +++ b/src/terminal/linkProvider.ts @@ -1,11 +1,9 @@ import type { Disposable, TerminalLink, TerminalLinkContext, TerminalLinkProvider } from 'vscode'; import { commands, window } from 'vscode'; -import type { - GitCommandsCommandArgs, - ShowCommitsInViewCommandArgs, - ShowQuickBranchHistoryCommandArgs, - ShowQuickCommitCommandArgs, -} from '../commands'; +import type { GitCommandsCommandArgs } from '../commands/gitCommands'; +import type { ShowCommitsInViewCommandArgs } from '../commands/showCommitsInView'; +import type { ShowQuickBranchHistoryCommandArgs } from '../commands/showQuickBranchHistory'; +import type { ShowQuickCommitCommandArgs } from '../commands/showQuickCommit'; import { Commands } from '../constants'; import type { Container } from '../container'; import type { PagedResult } from '../git/gitProvider'; diff --git a/src/views/nodes/UncommittedFileNode.ts b/src/views/nodes/UncommittedFileNode.ts index 2cf23d743e7c4..8d9b25771f710 100644 --- a/src/views/nodes/UncommittedFileNode.ts +++ b/src/views/nodes/UncommittedFileNode.ts @@ -1,6 +1,6 @@ import type { Command } from 'vscode'; import { TreeItem, TreeItemCollapsibleState } from 'vscode'; -import type { DiffWithPreviousCommandArgs } from '../../commands'; +import type { DiffWithPreviousCommandArgs } from '../../commands/diffWithPrevious'; import { Commands } from '../../constants'; import { StatusFileFormatter } from '../../git/formatters/statusFormatter'; import { GitUri } from '../../git/gitUri'; diff --git a/src/views/nodes/commitFileNode.ts b/src/views/nodes/commitFileNode.ts index 84860c19462c9..299ec58e5c05c 100644 --- a/src/views/nodes/commitFileNode.ts +++ b/src/views/nodes/commitFileNode.ts @@ -1,6 +1,6 @@ import type { Command, Selection } from 'vscode'; import { MarkdownString, TreeItem, TreeItemCollapsibleState, Uri } from 'vscode'; -import type { DiffWithPreviousCommandArgs } from '../../commands'; +import type { DiffWithPreviousCommandArgs } from '../../commands/diffWithPrevious'; import { Commands, Schemes } from '../../constants'; import { StatusFileFormatter } from '../../git/formatters/statusFormatter'; import { GitUri } from '../../git/gitUri'; diff --git a/src/views/nodes/commitNode.ts b/src/views/nodes/commitNode.ts index 43c2113bf4b88..c2a3a60dd15f1 100644 --- a/src/views/nodes/commitNode.ts +++ b/src/views/nodes/commitNode.ts @@ -1,6 +1,6 @@ import type { Command } from 'vscode'; import { MarkdownString, ThemeColor, ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; -import type { DiffWithPreviousCommandArgs } from '../../commands'; +import type { DiffWithPreviousCommandArgs } from '../../commands/diffWithPrevious'; import type { Colors } from '../../constants'; import { Commands } from '../../constants'; import { CommitFormatter } from '../../git/formatters/commitFormatter'; diff --git a/src/views/nodes/fileRevisionAsCommitNode.ts b/src/views/nodes/fileRevisionAsCommitNode.ts index e358252c16457..5fd72fbbd735a 100644 --- a/src/views/nodes/fileRevisionAsCommitNode.ts +++ b/src/views/nodes/fileRevisionAsCommitNode.ts @@ -1,6 +1,6 @@ import type { Command, Selection } from 'vscode'; import { MarkdownString, ThemeColor, ThemeIcon, TreeItem, TreeItemCollapsibleState, Uri } from 'vscode'; -import type { DiffWithPreviousCommandArgs } from '../../commands'; +import type { DiffWithPreviousCommandArgs } from '../../commands/diffWithPrevious'; import type { Colors } from '../../constants'; import { Commands } from '../../constants'; import type { Container } from '../../container'; diff --git a/src/views/nodes/mergeConflictCurrentChangesNode.ts b/src/views/nodes/mergeConflictCurrentChangesNode.ts index 796ea794684f4..601be5b683a0f 100644 --- a/src/views/nodes/mergeConflictCurrentChangesNode.ts +++ b/src/views/nodes/mergeConflictCurrentChangesNode.ts @@ -1,6 +1,6 @@ import type { Command } from 'vscode'; import { MarkdownString, ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; -import type { DiffWithCommandArgs } from '../../commands'; +import type { DiffWithCommandArgs } from '../../commands/diffWith'; import { Commands, GlyphChars } from '../../constants'; import { GitUri } from '../../git/gitUri'; import type { GitCommit } from '../../git/models/commit'; diff --git a/src/views/nodes/mergeConflictIncomingChangesNode.ts b/src/views/nodes/mergeConflictIncomingChangesNode.ts index 28406b248fa46..a8f3047b9cc28 100644 --- a/src/views/nodes/mergeConflictIncomingChangesNode.ts +++ b/src/views/nodes/mergeConflictIncomingChangesNode.ts @@ -1,6 +1,6 @@ import type { Command } from 'vscode'; import { MarkdownString, ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; -import type { DiffWithCommandArgs } from '../../commands'; +import type { DiffWithCommandArgs } from '../../commands/diffWith'; import { Commands, GlyphChars } from '../../constants'; import { GitUri } from '../../git/gitUri'; import type { GitCommit } from '../../git/models/commit'; diff --git a/src/views/nodes/resultsFileNode.ts b/src/views/nodes/resultsFileNode.ts index 74d57c84b61ef..da974ff214e6c 100644 --- a/src/views/nodes/resultsFileNode.ts +++ b/src/views/nodes/resultsFileNode.ts @@ -1,6 +1,6 @@ import type { Command } from 'vscode'; import { TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState } from 'vscode'; -import type { DiffWithCommandArgs } from '../../commands'; +import type { DiffWithCommandArgs } from '../../commands/diffWith'; import { Commands } from '../../constants'; import { StatusFileFormatter } from '../../git/formatters/statusFormatter'; import { GitUri } from '../../git/gitUri'; diff --git a/src/views/nodes/statusFileNode.ts b/src/views/nodes/statusFileNode.ts index eec927a202665..834f21edd6423 100644 --- a/src/views/nodes/statusFileNode.ts +++ b/src/views/nodes/statusFileNode.ts @@ -1,6 +1,6 @@ import type { Command } from 'vscode'; import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; -import type { DiffWithCommandArgs } from '../../commands'; +import type { DiffWithCommandArgs } from '../../commands/diffWith'; import type { DiffWithPreviousCommandArgs } from '../../commands/diffWithPrevious'; import { Commands } from '../../constants'; import { StatusFileFormatter } from '../../git/formatters/statusFormatter'; diff --git a/src/views/viewCommands.ts b/src/views/viewCommands.ts index 66d9e727d822e..8326aec363d24 100644 --- a/src/views/viewCommands.ts +++ b/src/views/viewCommands.ts @@ -1,12 +1,10 @@ import type { Disposable, TextDocumentShowOptions } from 'vscode'; import { env, Uri, window } from 'vscode'; import type { CreatePullRequestActionContext, OpenPullRequestActionContext } from '../api/gitlens'; -import type { - DiffWithCommandArgs, - DiffWithPreviousCommandArgs, - DiffWithWorkingCommandArgs, - OpenFileAtRevisionCommandArgs, -} from '../commands'; +import type { DiffWithCommandArgs } from '../commands/diffWith'; +import type { DiffWithPreviousCommandArgs } from '../commands/diffWithPrevious'; +import type { DiffWithWorkingCommandArgs } from '../commands/diffWithWorking'; +import type { OpenFileAtRevisionCommandArgs } from '../commands/openFileAtRevision'; import type { ViewShowBranchComparison } from '../config'; import { Commands } from '../constants'; import type { Container } from '../container'; diff --git a/src/webviews/commitDetails/commitDetailsWebview.ts b/src/webviews/commitDetails/commitDetailsWebview.ts index e61216f0104be..e108f3ecae58e 100644 --- a/src/webviews/commitDetails/commitDetailsWebview.ts +++ b/src/webviews/commitDetails/commitDetailsWebview.ts @@ -2,7 +2,7 @@ import type { CancellationToken, ConfigurationChangeEvent, TextDocumentShowOptio import { CancellationTokenSource, Disposable, Uri, window } from 'vscode'; import type { MaybeEnrichedAutolink } from '../../annotations/autolinks'; import { serializeAutolink } from '../../annotations/autolinks'; -import type { CopyShaToClipboardCommandArgs } from '../../commands'; +import type { CopyShaToClipboardCommandArgs } from '../../commands/copyShaToClipboard'; import type { CoreConfiguration } from '../../constants'; import { Commands } from '../../constants'; import type { Container } from '../../container'; diff --git a/src/webviews/rebase/rebaseEditor.ts b/src/webviews/rebase/rebaseEditor.ts index 48a3859f0317b..1085a86d99428 100644 --- a/src/webviews/rebase/rebaseEditor.ts +++ b/src/webviews/rebase/rebaseEditor.ts @@ -7,7 +7,7 @@ import type { } from 'vscode'; import { ConfigurationTarget, Disposable, Position, Range, Uri, window, workspace, WorkspaceEdit } from 'vscode'; import { getNonce } from '@env/crypto'; -import { ShowCommitsInViewCommand } from '../../commands'; +import { ShowCommitsInViewCommand } from '../../commands/showCommitsInView'; import type { CoreConfiguration } from '../../constants'; import type { Container } from '../../container'; import { emojify } from '../../emojis'; From 77598859d1d9b123b7de93771076b6626f58ee4f Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 10 Oct 2023 13:33:02 -0400 Subject: [PATCH 0035/1012] Updates dependencies --- ThirdPartyNotices.txt | 6 +- package.json | 22 +-- yarn.lock | 380 +++++++++++++++++++++--------------------- 3 files changed, 206 insertions(+), 202 deletions(-) diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index c63263d6fa585..ea8988ae6e39e 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -6,10 +6,10 @@ This project incorporates components from the projects listed below. 1. @microsoft/fast-element version 1.12.0 (https://github.com/Microsoft/fast) 2. @microsoft/fast-react-wrapper version 0.3.19 (https://github.com/Microsoft/fast) 3. @octokit/graphql version 7.0.2 (https://github.com/octokit/graphql.js) -4. @octokit/request version 8.1.2 (https://github.com/octokit/request.js) +4. @octokit/request version 8.1.4 (https://github.com/octokit/request.js) 5. @opentelemetry/api version 1.6.0 (https://github.com/open-telemetry/opentelemetry-js) -6. @opentelemetry/exporter-trace-otlp-http version 0.43.0 (https://github.com/open-telemetry/opentelemetry-js) -7. @opentelemetry/sdk-trace-base version 1.17.0 (https://github.com/open-telemetry/opentelemetry-js) +6. @opentelemetry/exporter-trace-otlp-http version 0.44.0 (https://github.com/open-telemetry/opentelemetry-js) +7. @opentelemetry/sdk-trace-base version 1.17.1 (https://github.com/open-telemetry/opentelemetry-js) 8. @vscode/codicons version 0.0.33 (https://github.com/microsoft/vscode-codicons) 9. @vscode/webview-ui-toolkit version 1.2.2 (https://github.com/microsoft/vscode-webview-ui-toolkit) 10. ansi-regex version 6.0.1 (https://github.com/chalk/ansi-regex) diff --git a/package.json b/package.json index 94d6d0f2152f6..51452738ab756 100644 --- a/package.json +++ b/package.json @@ -14855,10 +14855,10 @@ "@microsoft/fast-element": "1.12.0", "@microsoft/fast-react-wrapper": "0.3.19", "@octokit/graphql": "7.0.2", - "@octokit/request": "8.1.2", + "@octokit/request": "8.1.4", "@opentelemetry/api": "1.6.0", - "@opentelemetry/exporter-trace-otlp-http": "0.43.0", - "@opentelemetry/sdk-trace-base": "1.17.0", + "@opentelemetry/exporter-trace-otlp-http": "0.44.0", + "@opentelemetry/sdk-trace-base": "1.17.1", "@vscode/codicons": "0.0.33", "@vscode/webview-ui-toolkit": "1.2.2", "ansi-regex": "6.0.1", @@ -14876,12 +14876,12 @@ "devDependencies": { "@types/mocha": "10.0.1", "@types/node": "16.11.47", - "@types/react": "17.0.47", - "@types/react-dom": "17.0.17", - "@types/sortablejs": "1.15.2", + "@types/react": "17.0.67", + "@types/react-dom": "17.0.21", + "@types/sortablejs": "1.15.3", "@types/vscode": "1.80.0", - "@typescript-eslint/eslint-plugin": "6.7.4", - "@typescript-eslint/parser": "6.7.4", + "@typescript-eslint/eslint-plugin": "6.7.5", + "@typescript-eslint/parser": "6.7.5", "@vscode/test-electron": "2.3.5", "@vscode/test-web": "0.0.46", "@vscode/vsce": "2.21.1", @@ -14896,7 +14896,7 @@ "esbuild": "0.19.4", "esbuild-loader": "4.0.2", "esbuild-sass-plugin": "2.16.0", - "eslint": "8.50.0", + "eslint": "8.51.0", "eslint-cli": "1.1.1", "eslint-config-prettier": "9.0.0", "eslint-import-resolver-typescript": "3.6.1", @@ -14915,13 +14915,13 @@ "mini-css-extract-plugin": "2.7.6", "mocha": "10.2.0", "prettier": "3.0.3", - "sass": "1.69.0", + "sass": "1.69.1", "sass-loader": "13.3.2", "schema-utils": "4.2.0", "sharp": "0.32.6", "svgo": "3.0.2", "terser-webpack-plugin": "5.3.9", - "ts-loader": "9.4.4", + "ts-loader": "9.5.0", "tsc-alias": "1.8.8", "typescript": "5.3.0-beta", "webpack": "5.88.2", diff --git a/yarn.lock b/yarn.lock index 5574288dfb238..6413bf22cec5c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -198,10 +198,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.50.0": - version "8.50.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.50.0.tgz#9e93b850f0f3fa35f5fa59adfd03adae8488e484" - integrity sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ== +"@eslint/js@8.51.0": + version "8.51.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.51.0.tgz#6d419c240cfb2b66da37df230f7e7eef801c32fa" + integrity sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg== "@floating-ui/core@^1.4.2": version "1.5.0" @@ -353,9 +353,9 @@ path-to-regexp "^6.2.1" "@lit-labs/ssr-dom-shim@^1.0.0", "@lit-labs/ssr-dom-shim@^1.1.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.1.tgz#64df34e2f12e68e78ac57e571d25ec07fa460ca9" - integrity sha512-kXOeFbfCm4fFf2A3WwVEeQj55tMZa8c8/f9AKHMobQMkzNUfUj+antR3fRPaZJawsa1aZiP/Da3ndpZrwEe4rQ== + version "1.1.2" + resolved "https://registry.yarnpkg.com/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.2.tgz#d693d972974a354034454ec1317eb6afd0b00312" + integrity sha512-jnOD+/+dSrfTWYfSXBXlo5l5f0q1UuJo3tkbMDCYA2lKUYq79jaxqtGEvnRoh049nt1vdo1+45RinipU6FGY2g== "@lit/reactive-element@^1.3.0", "@lit/reactive-element@^1.6.0": version "1.6.3" @@ -462,10 +462,10 @@ deprecation "^2.0.0" once "^1.4.0" -"@octokit/request@8.1.2", "@octokit/request@^8.0.1": - version "8.1.2" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-8.1.2.tgz#26763e2001da1c98fa89c7df4d6414246bb1564b" - integrity sha512-A0RJJfzjlZQwb+39eDm5UM23dkxbp28WEG4p2ueH+Q2yY4p349aRK/vcUlEuIB//ggcrHJceoYYkBP/LYCoXEg== +"@octokit/request@8.1.4", "@octokit/request@^8.0.1": + version "8.1.4" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-8.1.4.tgz#12dfaebdb2ea375eaabb41d39d45182531ac2857" + integrity sha512-M0aaFfpGPEKrg7XoA/gwgRvc9MSXHRO2Ioki1qrPDbl1e9YhjIwVoHE7HIKmv/m3idzldj//xBujcFNqGX6ENA== dependencies: "@octokit/endpoint" "^9.0.0" "@octokit/request-error" "^5.0.0" @@ -480,10 +480,10 @@ dependencies: "@octokit/openapi-types" "^19.0.0" -"@opentelemetry/api-logs@0.43.0": - version "0.43.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.43.0.tgz#472dacbf91488ad6f6b9de39a6f5038b450bdbc6" - integrity sha512-0CXMOYPXgAdLM2OzVkiUfAL6QQwWVhnMfUXCqLsITY42FZ9TxAhZIHkoc4mfVxvPuXsBnRYGR8UQZX86p87z4A== +"@opentelemetry/api-logs@0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.44.0.tgz#4bbb04e9043234c240b3a9129732281f1ceae759" + integrity sha512-OctojdKGmXHKAJa4/Ml+Nf7MD9jtYXvZyP64xTh0pNTmtgaTdWW3FURri2DdB/+l7YxRy0tYYZS3/tYEM1pj3w== dependencies: "@opentelemetry/api" "^1.0.0" @@ -492,81 +492,81 @@ resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.6.0.tgz#de2c6823203d6f319511898bb5de7e70f5267e19" integrity sha512-OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g== -"@opentelemetry/core@1.17.0": - version "1.17.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.17.0.tgz#6a72425f5f953dc68b4c7c66d947c018173d30d2" - integrity sha512-tfnl3h+UefCgx1aeN2xtrmr6BmdWGKXypk0pflQR0urFS40aE88trnkOMc2HTJZbMrqEEl4HsaBeFhwLVXsrJg== - dependencies: - "@opentelemetry/semantic-conventions" "1.17.0" - -"@opentelemetry/exporter-trace-otlp-http@0.43.0": - version "0.43.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.43.0.tgz#4d0a3587a1d372d19c883d9a4720f6eeb7dc9671" - integrity sha512-X6RGl4RTWC13EBrFstAbTh4vKqVqf6afpvFcud9qYhvl2A53OZ5RTAQP+9MrAMhthiKQaftNsEDdB2/0Sq+Xkw== - dependencies: - "@opentelemetry/core" "1.17.0" - "@opentelemetry/otlp-exporter-base" "0.43.0" - "@opentelemetry/otlp-transformer" "0.43.0" - "@opentelemetry/resources" "1.17.0" - "@opentelemetry/sdk-trace-base" "1.17.0" - -"@opentelemetry/otlp-exporter-base@0.43.0": - version "0.43.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.43.0.tgz#3ac36e959897050ceba8838bb2af7145a9e73d2c" - integrity sha512-LXNtRFVuPRXB9q0qdvrLikQ3NtT9Jmv255Idryz3RJPhOh/Fa03sBASQoj3D55OH3xazmA90KFHfhJ/d8D8y4A== - dependencies: - "@opentelemetry/core" "1.17.0" - -"@opentelemetry/otlp-transformer@0.43.0": - version "0.43.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-transformer/-/otlp-transformer-0.43.0.tgz#d4b12ba52d5193a35840d9e1a5e646c4e7e06a5b" - integrity sha512-KXYmgzWdVBOD5NvPmGW1nEMJjyQ8gK3N8r6pi4HvmEhTp0v4T13qDSax4q0HfsqmbPJR355oqQSJUnu1dHNutw== - dependencies: - "@opentelemetry/api-logs" "0.43.0" - "@opentelemetry/core" "1.17.0" - "@opentelemetry/resources" "1.17.0" - "@opentelemetry/sdk-logs" "0.43.0" - "@opentelemetry/sdk-metrics" "1.17.0" - "@opentelemetry/sdk-trace-base" "1.17.0" - -"@opentelemetry/resources@1.17.0": - version "1.17.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.17.0.tgz#ee29144cfd7d194c69698c8153dbadec7fe6819f" - integrity sha512-+u0ciVnj8lhuL/qGRBPeVYvk7fL+H/vOddfvmOeJaA1KC+5/3UED1c9KoZQlRsNT5Kw1FaK8LkY2NVLYfOVZQw== - dependencies: - "@opentelemetry/core" "1.17.0" - "@opentelemetry/semantic-conventions" "1.17.0" - -"@opentelemetry/sdk-logs@0.43.0": - version "0.43.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-logs/-/sdk-logs-0.43.0.tgz#ad40803f0e8893d1839af3a32756d5f46f0f7bbe" - integrity sha512-JyJ2BBRKm37Mc4cSEhFmsMl5ASQn1dkGhEWzAAMSlhPtLRTv5PfvJwhR+Mboaic/eDLAlciwsgijq8IFlf6IgQ== - dependencies: - "@opentelemetry/core" "1.17.0" - "@opentelemetry/resources" "1.17.0" - -"@opentelemetry/sdk-metrics@1.17.0": - version "1.17.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-metrics/-/sdk-metrics-1.17.0.tgz#e51d39e0bb749780d17f9b1df12f0490438dec1a" - integrity sha512-HlWM27yGmYuwCoVRe3yg2PqKnIsq0kEF0HQgvkeDWz2NYkq9fFaSspR6kvjxUTbghAlZrabiqbgyKoYpYaXS3w== - dependencies: - "@opentelemetry/core" "1.17.0" - "@opentelemetry/resources" "1.17.0" +"@opentelemetry/core@1.17.1": + version "1.17.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.17.1.tgz#10c5e09c63aeb1836b34d80baf7113760fb19d96" + integrity sha512-I6LrZvl1FF97FQXPR0iieWQmKnGxYtMbWA1GrAXnLUR+B1Hn2m8KqQNEIlZAucyv00GBgpWkpllmULmZfG8P3g== + dependencies: + "@opentelemetry/semantic-conventions" "1.17.1" + +"@opentelemetry/exporter-trace-otlp-http@0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.44.0.tgz#1dfe24b87fa3e1f5edd2109da28d489029f90171" + integrity sha512-RkorGE6wf6PF5OjMUGBnbUDyaVgmN+vL7OgClJJUTxqbE7WqgbW8dkU04O+1mcB1znXZ1Aej1uDm0pS+eW/upA== + dependencies: + "@opentelemetry/core" "1.17.1" + "@opentelemetry/otlp-exporter-base" "0.44.0" + "@opentelemetry/otlp-transformer" "0.44.0" + "@opentelemetry/resources" "1.17.1" + "@opentelemetry/sdk-trace-base" "1.17.1" + +"@opentelemetry/otlp-exporter-base@0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.44.0.tgz#10563cbe3ed89d7c8d422b513b819026f00ba038" + integrity sha512-DKQqRrfVMe96aSLZiCgIesLcMLfnWH8d4bTpLB1JbU+SAQJ7nVCAfS9U36mjFCVhvNDD7gwfCNrxqFMCHq6FUw== + dependencies: + "@opentelemetry/core" "1.17.1" + +"@opentelemetry/otlp-transformer@0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-transformer/-/otlp-transformer-0.44.0.tgz#4f7eb2f6e4624b2110dfb3a5dda8cfebbd80225a" + integrity sha512-1/KC+aHM1oGEsXyNy7QoxpvErxGdzt26bg9VHyNb4TDILkUFdwrnywnxPc6lXZ6h/8T8Mt718UWOKjNHC514kQ== + dependencies: + "@opentelemetry/api-logs" "0.44.0" + "@opentelemetry/core" "1.17.1" + "@opentelemetry/resources" "1.17.1" + "@opentelemetry/sdk-logs" "0.44.0" + "@opentelemetry/sdk-metrics" "1.17.1" + "@opentelemetry/sdk-trace-base" "1.17.1" + +"@opentelemetry/resources@1.17.1": + version "1.17.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.17.1.tgz#932f70f58c0e03fb1d38f0cba12672fd70804d99" + integrity sha512-M2e5emqg5I7qRKqlzKx0ROkcPyF8PbcSaWEdsm72od9txP7Z/Pl8PDYOyu80xWvbHAWk5mDxOF6v3vNdifzclA== + dependencies: + "@opentelemetry/core" "1.17.1" + "@opentelemetry/semantic-conventions" "1.17.1" + +"@opentelemetry/sdk-logs@0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-logs/-/sdk-logs-0.44.0.tgz#a46e0a013432f266fb7ef16d703c968898ae89c5" + integrity sha512-UN3ofh9Jj54gIgrSXNRWAoaH6iPvrrjed5YAtqO9cW65U+5QPzk1Rv95vjAcY9VTrmMWvuqgEK1CYObG6Hu4OQ== + dependencies: + "@opentelemetry/core" "1.17.1" + "@opentelemetry/resources" "1.17.1" + +"@opentelemetry/sdk-metrics@1.17.1": + version "1.17.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-metrics/-/sdk-metrics-1.17.1.tgz#9c4d13d845bcc82be8684050d9db7cce10f61580" + integrity sha512-eHdpsMCKhKhwznxvEfls8Wv3y4ZBWkkXlD3m7vtHIiWBqsMHspWSfie1s07mM45i/bBCf6YBMgz17FUxIXwmZA== + dependencies: + "@opentelemetry/core" "1.17.1" + "@opentelemetry/resources" "1.17.1" lodash.merge "^4.6.2" -"@opentelemetry/sdk-trace-base@1.17.0": - version "1.17.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.17.0.tgz#05a21763c9efa72903c20b8930293cdde344b681" - integrity sha512-2T5HA1/1iE36Q9eg6D4zYlC4Y4GcycI1J6NsHPKZY9oWfAxWsoYnRlkPfUqyY5XVtocCo/xHpnJvGNHwzT70oQ== +"@opentelemetry/sdk-trace-base@1.17.1": + version "1.17.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.17.1.tgz#8ede213df8b0c957028a869c66964e535193a4fd" + integrity sha512-pfSJJSjZj5jkCJUQZicSpzN8Iz9UKMryPWikZRGObPnJo6cUSoKkjZh6BM3j+D47G4olMBN+YZKYqkFM1L6zNA== dependencies: - "@opentelemetry/core" "1.17.0" - "@opentelemetry/resources" "1.17.0" - "@opentelemetry/semantic-conventions" "1.17.0" + "@opentelemetry/core" "1.17.1" + "@opentelemetry/resources" "1.17.1" + "@opentelemetry/semantic-conventions" "1.17.1" -"@opentelemetry/semantic-conventions@1.17.0": - version "1.17.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.17.0.tgz#af10baa9f05ce1e64a14065fc138b5739bfb65f6" - integrity sha512-+fguCd2d8d2qruk0H0DsCEy2CTK3t0Tugg7MhZ/UQMvmewbZLNnJ6heSYyzIZWG5IPfAXzoj4f4F/qpM7l4VBA== +"@opentelemetry/semantic-conventions@1.17.1": + version "1.17.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.17.1.tgz#93d219935e967fbb9aa0592cc96b2c0ec817a56f" + integrity sha512-xbR2U+2YjauIuo42qmE8XyJK6dYeRMLJuOlUP5SO4auET4VtOHOzgkRVOq+Ik18N+Xf3YPcqJs9dZMiDddz1eQ== "@pkgjs/parseargs@^0.11.0": version "0.11.0" @@ -696,9 +696,11 @@ integrity sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q== "@types/node@*": - version "20.8.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.2.tgz#d76fb80d87d0d8abfe334fc6d292e83e5524efc4" - integrity sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w== + version "20.8.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.4.tgz#0e9ebb2ff29d5c3302fc84477d066fa7c6b441aa" + integrity sha512-ZVPnqU58giiCjSxjVUESDtdPk4QR5WQhhINbc9UBrKLU68MX5BF6kbQzTrkwbolyr0X8ChBpXfavr5mZFKZQ5A== + dependencies: + undici-types "~5.25.1" "@types/node@16.11.47": version "16.11.47" @@ -720,26 +722,17 @@ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.8.tgz#805eae6e8f41bd19e88917d2ea200dc992f405d3" integrity sha512-kMpQpfZKSCBqltAJwskgePRaYRFukDkm1oItcAbC3gNELR20XIBcN9VRgg4+m8DKsTfkWeA4m4Imp4DDuWy7FQ== -"@types/react-dom@17.0.17": - version "17.0.17" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.17.tgz#2e3743277a793a96a99f1bf87614598289da68a1" - integrity sha512-VjnqEmqGnasQKV0CWLevqMTXBYG9GbwuE6x3VetERLh0cq2LTptFE73MrQi2S7GkKXCf2GgwItB/melLnxfnsg== +"@types/react-dom@17.0.21": + version "17.0.21" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.21.tgz#85d56965483ce4850f5f03f9234e54a1f47786e5" + integrity sha512-3rQEFUNUUz2MYiRwJJj6UekcW7rFLOtmK7ajQP7qJpjNdggInl3I/xM4I3Hq1yYPdCGVMgax1gZsB7BBTtayXg== dependencies: "@types/react" "^17" -"@types/react@17.0.47": - version "17.0.47" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.47.tgz#4ee71aaf4c5a9e290e03aa4d0d313c5d666b3b78" - integrity sha512-mk0BL8zBinf2ozNr3qPnlu1oyVTYq+4V7WA76RgxUAtf0Em/Wbid38KN6n4abEkvO4xMTBWmnP1FtQzgkEiJoA== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - -"@types/react@^17": - version "17.0.66" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.66.tgz#4b3bfd6dd5ee37835f60d4a9325cff974b064126" - integrity sha512-azQzO1tuioq9M4vVKzzdBgG5KfLhyocYkRlJMBDcrJ7bUzyjR7QIGbZk2zH7sB5KpXRWoZJQ3CznVyhDS/swxA== +"@types/react@17.0.67", "@types/react@^17": + version "17.0.67" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.67.tgz#1c224738f203829a4692aa48e33a732c34fd014a" + integrity sha512-zE76EIJ0Y58Oy9yDX/9csb/NuKjt0Eq2YgWb/8Wxo91YmuLzzbyiRoaqJE9h8iDlsT7n35GdpoLomHlaB1kFbg== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -755,10 +748,10 @@ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.3.tgz#9a726e116beb26c24f1ccd6850201e1246122e04" integrity sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw== -"@types/sortablejs@1.15.2": - version "1.15.2" - resolved "https://registry.yarnpkg.com/@types/sortablejs/-/sortablejs-1.15.2.tgz#d51e5ecac00a9782aa256c1401309ce1c4031ba2" - integrity sha512-mOIv/EnPMzAZAVbuh9uGjOZ1BBdimP9Y6IPGntsvQJtko5yapSDKB7GwB3AOlF5N3bkpk4sBwQRpS3aEkiUbaA== +"@types/sortablejs@1.15.3": + version "1.15.3" + resolved "https://registry.yarnpkg.com/@types/sortablejs/-/sortablejs-1.15.3.tgz#b9c0e2740100ae94919c9f138a38600c8f8124ea" + integrity sha512-v+zh6TZP/cLeMUK0MDx1onp8e7Jk2/4iTQ7sb/n80rTAvBm14yJkpOEfJdrTCkHiF7IZbPjxGX2NRJfogRoYIg== "@types/trusted-types@^2.0.2": version "2.0.4" @@ -776,22 +769,22 @@ integrity sha512-axdPBuLuEJt0c4yI5OZssC19K2Mq1uKdrfZBzuxLvaztgqUtFYZUNw7lETExPYJR9jdEoIg4mb7RQKRQzOkeGQ== "@types/yargs@^17.0.8": - version "17.0.26" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.26.tgz#388e5002a8b284ad7b4599ba89920a6d74d8d79a" - integrity sha512-Y3vDy2X6zw/ZCumcwLpdhM5L7jmyGpmBCTYMHDLqT2IKVMYRRLdv6ZakA+wxhra6Z/3bwhNbNl9bDGXaFU+6rw== + version "17.0.28" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.28.tgz#d106e4301fbacde3d1796ab27374dd16588ec851" + integrity sha512-N3e3fkS86hNhtk6BEnc0rj3zcehaxx8QWhCROJkqpl5Zaoi7nAic3jH8q94jVD3zu5LGk+PUB6KAiDmimYOEQw== dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@6.7.4": - version "6.7.4" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.4.tgz#057338df21b6062c2f2fc5999fbea8af9973ac6d" - integrity sha512-DAbgDXwtX+pDkAHwiGhqP3zWUGpW49B7eqmgpPtg+BKJXwdct79ut9+ifqOFPJGClGKSHXn2PTBatCnldJRUoA== +"@typescript-eslint/eslint-plugin@6.7.5": + version "6.7.5" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.5.tgz#f4024b9f63593d0c2b5bd6e4ca027e6f30934d4f" + integrity sha512-JhtAwTRhOUcP96D0Y6KYnwig/MRQbOoLGXTON2+LlyB/N35SP9j1boai2zzwXb7ypKELXMx3DVk9UTaEq1vHEw== dependencies: "@eslint-community/regexpp" "^4.5.1" - "@typescript-eslint/scope-manager" "6.7.4" - "@typescript-eslint/type-utils" "6.7.4" - "@typescript-eslint/utils" "6.7.4" - "@typescript-eslint/visitor-keys" "6.7.4" + "@typescript-eslint/scope-manager" "6.7.5" + "@typescript-eslint/type-utils" "6.7.5" + "@typescript-eslint/utils" "6.7.5" + "@typescript-eslint/visitor-keys" "6.7.5" debug "^4.3.4" graphemer "^1.4.0" ignore "^5.2.4" @@ -799,72 +792,72 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/parser@6.7.4": - version "6.7.4" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.7.4.tgz#23d1dd4fe5d295c7fa2ab651f5406cd9ad0bd435" - integrity sha512-I5zVZFY+cw4IMZUeNCU7Sh2PO5O57F7Lr0uyhgCJmhN/BuTlnc55KxPonR4+EM3GBdfiCyGZye6DgMjtubQkmA== +"@typescript-eslint/parser@6.7.5": + version "6.7.5" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.7.5.tgz#8d7ca3d1fbd9d5a58cc4d30b2aa797a760137886" + integrity sha512-bIZVSGx2UME/lmhLcjdVc7ePBwn7CLqKarUBL4me1C5feOd663liTGjMBGVcGr+BhnSLeP4SgwdvNnnkbIdkCw== dependencies: - "@typescript-eslint/scope-manager" "6.7.4" - "@typescript-eslint/types" "6.7.4" - "@typescript-eslint/typescript-estree" "6.7.4" - "@typescript-eslint/visitor-keys" "6.7.4" + "@typescript-eslint/scope-manager" "6.7.5" + "@typescript-eslint/types" "6.7.5" + "@typescript-eslint/typescript-estree" "6.7.5" + "@typescript-eslint/visitor-keys" "6.7.5" debug "^4.3.4" -"@typescript-eslint/scope-manager@6.7.4": - version "6.7.4" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.7.4.tgz#a484a17aa219e96044db40813429eb7214d7b386" - integrity sha512-SdGqSLUPTXAXi7c3Ob7peAGVnmMoGzZ361VswK2Mqf8UOYcODiYvs8rs5ILqEdfvX1lE7wEZbLyELCW+Yrql1A== +"@typescript-eslint/scope-manager@6.7.5": + version "6.7.5" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.7.5.tgz#1cf33b991043886cd67f4f3600b8e122fc14e711" + integrity sha512-GAlk3eQIwWOJeb9F7MKQ6Jbah/vx1zETSDw8likab/eFcqkjSD7BI75SDAeC5N2L0MmConMoPvTsmkrg71+B1A== dependencies: - "@typescript-eslint/types" "6.7.4" - "@typescript-eslint/visitor-keys" "6.7.4" + "@typescript-eslint/types" "6.7.5" + "@typescript-eslint/visitor-keys" "6.7.5" -"@typescript-eslint/type-utils@6.7.4": - version "6.7.4" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.7.4.tgz#847cd3b59baf948984499be3e0a12ff07373e321" - integrity sha512-n+g3zi1QzpcAdHFP9KQF+rEFxMb2KxtnJGID3teA/nxKHOVi3ylKovaqEzGBbVY2pBttU6z85gp0D00ufLzViQ== +"@typescript-eslint/type-utils@6.7.5": + version "6.7.5" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.7.5.tgz#0a65949ec16588d8956f6d967f7d9c84ddb2d72a" + integrity sha512-Gs0qos5wqxnQrvpYv+pf3XfcRXW6jiAn9zE/K+DlmYf6FcpxeNYN0AIETaPR7rHO4K2UY+D0CIbDP9Ut0U4m1g== dependencies: - "@typescript-eslint/typescript-estree" "6.7.4" - "@typescript-eslint/utils" "6.7.4" + "@typescript-eslint/typescript-estree" "6.7.5" + "@typescript-eslint/utils" "6.7.5" debug "^4.3.4" ts-api-utils "^1.0.1" -"@typescript-eslint/types@6.7.4": - version "6.7.4" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.7.4.tgz#5d358484d2be986980c039de68e9f1eb62ea7897" - integrity sha512-o9XWK2FLW6eSS/0r/tgjAGsYasLAnOWg7hvZ/dGYSSNjCh+49k5ocPN8OmG5aZcSJ8pclSOyVKP2x03Sj+RrCA== +"@typescript-eslint/types@6.7.5": + version "6.7.5" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.7.5.tgz#4571320fb9cf669de9a95d9849f922c3af809790" + integrity sha512-WboQBlOXtdj1tDFPyIthpKrUb+kZf2VroLZhxKa/VlwLlLyqv/PwUNgL30BlTVZV1Wu4Asu2mMYPqarSO4L5ZQ== -"@typescript-eslint/typescript-estree@6.7.4": - version "6.7.4" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.4.tgz#f2baece09f7bb1df9296e32638b2e1130014ef1a" - integrity sha512-ty8b5qHKatlNYd9vmpHooQz3Vki3gG+3PchmtsA4TgrZBKWHNjWfkQid7K7xQogBqqc7/BhGazxMD5vr6Ha+iQ== +"@typescript-eslint/typescript-estree@6.7.5": + version "6.7.5" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.5.tgz#4578de1a26e9f24950f029a4f00d1bfe41f15a39" + integrity sha512-NhJiJ4KdtwBIxrKl0BqG1Ur+uw7FiOnOThcYx9DpOGJ/Abc9z2xNzLeirCG02Ig3vkvrc2qFLmYSSsaITbKjlg== dependencies: - "@typescript-eslint/types" "6.7.4" - "@typescript-eslint/visitor-keys" "6.7.4" + "@typescript-eslint/types" "6.7.5" + "@typescript-eslint/visitor-keys" "6.7.5" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/utils@6.7.4": - version "6.7.4" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.7.4.tgz#2236f72b10e38277ee05ef06142522e1de470ff2" - integrity sha512-PRQAs+HUn85Qdk+khAxsVV+oULy3VkbH3hQ8hxLRJXWBEd7iI+GbQxH5SEUSH7kbEoTp6oT1bOwyga24ELALTA== +"@typescript-eslint/utils@6.7.5": + version "6.7.5" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.7.5.tgz#ab847b53d6b65e029314b8247c2336843dba81ab" + integrity sha512-pfRRrH20thJbzPPlPc4j0UNGvH1PjPlhlCMq4Yx7EGjV7lvEeGX0U6MJYe8+SyFutWgSHsdbJ3BXzZccYggezA== dependencies: "@eslint-community/eslint-utils" "^4.4.0" "@types/json-schema" "^7.0.12" "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "6.7.4" - "@typescript-eslint/types" "6.7.4" - "@typescript-eslint/typescript-estree" "6.7.4" + "@typescript-eslint/scope-manager" "6.7.5" + "@typescript-eslint/types" "6.7.5" + "@typescript-eslint/typescript-estree" "6.7.5" semver "^7.5.4" -"@typescript-eslint/visitor-keys@6.7.4": - version "6.7.4" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.4.tgz#80dfecf820fc67574012375859085f91a4dff043" - integrity sha512-pOW37DUhlTZbvph50x5zZCkFn3xzwkGtNoJHzIM3svpiSkJzwOYr/kVBaXmf+RAQiUDs1AHEZVNPg6UJCJpwRA== +"@typescript-eslint/visitor-keys@6.7.5": + version "6.7.5" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.5.tgz#84c68d6ceb5b12d5246b918b84f2b79affd6c2f1" + integrity sha512-3MaWdDZtLlsexZzDSdQWsFQ9l9nL8B80Z4fImSpyllFC/KLqWQRdEcB+gGGO+N3Q2uL40EsG66wZLsohPxNXvg== dependencies: - "@typescript-eslint/types" "6.7.4" + "@typescript-eslint/types" "6.7.5" eslint-visitor-keys "^3.4.1" "@vscode/codicons@0.0.33": @@ -1612,9 +1605,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001541: - version "1.0.30001546" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001546.tgz#10fdad03436cfe3cc632d3af7a99a0fb497407f0" - integrity sha512-zvtSJwuQFpewSyRrI3AsftF6rM0X80mZkChIt1spBGEvRglCrjTniXvinc8JKRoqTwXAgvqTImaN9igfSMtUBw== + version "1.0.30001547" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001547.tgz#d4f92efc488aab3c7f92c738d3977c2a3180472b" + integrity sha512-W7CrtIModMAxobGhz8iXmDfuJiiKg1WADMO/9x7/CLNin5cpSbuBjooyoIUVB5eyCc36QuTVlkVa1iB2S5+/eA== capital-case@^1.0.4: version "1.0.4" @@ -2595,9 +2588,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.4.535: - version "1.4.543" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.543.tgz#51116ffc9fba1ee93514d6a40d34676aa6d7d1c4" - integrity sha512-t2ZP4AcGE0iKCCQCBx/K2426crYdxD3YU6l0uK2EO3FZH0pbC4pFz/sZm2ruZsND6hQBTcDWWlo/MLpiOdif5g== + version "1.4.548" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.548.tgz#e695d769e0e801fa6d438b63f6bc9b80372000d6" + integrity sha512-R77KD6mXv37DOyKLN/eW1rGS61N6yHOfapNSX9w+y9DdPG83l9Gkuv7qkCFZ4Ta4JPhrjgQfYbv4Y3TnM1Hi2Q== emoji-regex@^8.0.0: version "8.0.0" @@ -2966,15 +2959,15 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4 resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== -eslint@8.50.0: - version "8.50.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.50.0.tgz#2ae6015fee0240fcd3f83e1e25df0287f487d6b2" - integrity sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg== +eslint@8.51.0: + version "8.51.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.51.0.tgz#4a82dae60d209ac89a5cff1604fea978ba4950f3" + integrity sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" "@eslint/eslintrc" "^2.1.2" - "@eslint/js" "8.50.0" + "@eslint/js" "8.51.0" "@humanwhocodes/config-array" "^0.11.11" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" @@ -4298,9 +4291,9 @@ keytar@^7.7.0: prebuild-install "^7.0.1" keyv@^4.5.3: - version "4.5.3" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.3.tgz#00873d2b046df737963157bd04f294ca818c9c25" - integrity sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug== + version "4.5.4" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" + integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw== dependencies: json-buffer "3.0.1" @@ -4992,9 +4985,9 @@ no-case@^3.0.4: tslib "^2.0.3" node-abi@^3.3.0: - version "3.47.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.47.0.tgz#6cbfa2916805ae25c2b7156ca640131632eb05e8" - integrity sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A== + version "3.48.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.48.0.tgz#122d132ae1ac097b0d711144560b17922de026ab" + integrity sha512-uWR/uwQyVV2iN5+Wkf1/oQxOR9YjU7gBclJLg2qK7GDvVohcnY6LaBXKV89N79EQFyN4/e43O32yQYE5QdFYTA== dependencies: semver "^7.3.5" @@ -6247,10 +6240,10 @@ sass-loader@13.3.2: dependencies: neo-async "^2.6.2" -sass@1.69.0, sass@^1.7.3: - version "1.69.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.0.tgz#5195075371c239ed556280cf2f5944d234f42679" - integrity sha512-l3bbFpfTOGgQZCLU/gvm1lbsQ5mC/WnLz3djL2v4WCJBDrWm58PO+jgngcGRNnKUh6wSsdm50YaovTqskZ0xDQ== +sass@1.69.1, sass@^1.7.3: + version "1.69.1" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.1.tgz#659b3b04452245dcf82f731684831e990ddb0c89" + integrity sha512-nc969GvTVz38oqKgYYVHM/Iq7Yl33IILy5uqaH2CWSiSUmRCvw+UR7tA3845Sp4BD5ykCUimvrT3k1EjTwpVUA== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -6536,6 +6529,11 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== +source-map@^0.7.4: + version "0.7.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" + integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== + spawn-command@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2.tgz#9544e1a43ca045f8531aac1a48cb29bdae62338e" @@ -6968,15 +6966,16 @@ ts-api-utils@^1.0.1: resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331" integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg== -ts-loader@9.4.4: - version "9.4.4" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.4.tgz#6ceaf4d58dcc6979f84125335904920884b7cee4" - integrity sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w== +ts-loader@9.5.0: + version "9.5.0" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.5.0.tgz#f0a51dda37cc4d8e43e6cb14edebbc599b0c3aa2" + integrity sha512-LLlB/pkB4q9mW2yLdFMnK3dEHbrBjeZTYguaaIfusyojBgAGf5kF+O6KcWqiGzWqHk0LBsoolrp4VftEURhybg== dependencies: chalk "^4.1.0" enhanced-resolve "^5.0.0" micromatch "^4.0.0" semver "^7.3.4" + source-map "^0.7.4" tsc-alias@1.8.8: version "1.8.8" @@ -7178,6 +7177,11 @@ underscore@^1.12.1: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441" integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A== +undici-types@~5.25.1: + version "5.25.3" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.25.3.tgz#e044115914c85f0bcbb229f346ab739f064998c3" + integrity sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA== + unique-filename@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea" From 1c77db5c0a797f34763936b7daad76ade19e0712 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 10 Oct 2023 16:06:29 -0400 Subject: [PATCH 0036/1012] Fixes missing `folder` prop on Repository - Fixes issue when using folder tokens in `worktrees.defaultLocation` --- src/env/node/git/localGitProvider.ts | 6 +++--- src/git/models/repository.ts | 1 - src/plus/github/githubGitProvider.ts | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts index 053fc2ff36b8c..3fdf45262caa2 100644 --- a/src/env/node/git/localGitProvider.ts +++ b/src/env/node/git/localGitProvider.ts @@ -503,7 +503,7 @@ export class LocalGitProvider implements GitProvider, Disposable { this.container, this.onRepositoryChanged.bind(this), this.descriptor, - folder, + folder ?? workspace.getWorkspaceFolder(uri), uri, root, suspended ?? !window.state.focused, @@ -514,7 +514,7 @@ export class LocalGitProvider implements GitProvider, Disposable { this.container, this.onRepositoryChanged.bind(this), this.descriptor, - folder, + folder ?? workspace.getWorkspaceFolder(canonicalUri), canonicalUri, root, suspended ?? !window.state.focused, @@ -529,7 +529,7 @@ export class LocalGitProvider implements GitProvider, Disposable { this.container, this.onRepositoryChanged.bind(this), this.descriptor, - folder, + folder ?? workspace.getWorkspaceFolder(uri), uri, root, suspended ?? !window.state.focused, diff --git a/src/git/models/repository.ts b/src/git/models/repository.ts index 5975f8e6f8e92..1b431ed0434d5 100644 --- a/src/git/models/repository.ts +++ b/src/git/models/repository.ts @@ -226,7 +226,6 @@ export class Repository implements Disposable { suspended: boolean, closed: boolean = false, ) { - folder = workspace.getWorkspaceFolder(uri) ?? folder; if (folder != null) { if (root) { this.name = folder.name; diff --git a/src/plus/github/githubGitProvider.ts b/src/plus/github/githubGitProvider.ts index 6832633347fa1..5c73bea6779ac 100644 --- a/src/plus/github/githubGitProvider.ts +++ b/src/plus/github/githubGitProvider.ts @@ -261,7 +261,7 @@ export class GitHubGitProvider implements GitProvider, Disposable { this.container, this.onRepositoryChanged.bind(this), this.descriptor, - folder, + folder ?? workspace.getWorkspaceFolder(uri), uri, root, suspended ?? !window.state.focused, From fe6b26928ac77ed73f5066bf14398a205627b41e Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Tue, 10 Oct 2023 13:24:07 -0700 Subject: [PATCH 0037/1012] Fixes remote name in graph 'Open Branch on Remote' --- src/plus/webviews/graph/graphWebview.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts index 84a9993a7991f..7c9eb816beac5 100644 --- a/src/plus/webviews/graph/graphWebview.ts +++ b/src/plus/webviews/graph/graphWebview.ts @@ -2180,13 +2180,20 @@ export class GraphWebviewProvider implements WebviewProvider { private openBranchOnRemote(item?: GraphItemContext, clipboard?: boolean) { if (isGraphItemRefContext(item, 'branch')) { const { ref } = item.webviewItemValue; + let remote; + if (ref.remote) { + remote = getRemoteNameFromBranchName(ref.name); + } else if (ref.upstream != null) { + remote = getRemoteNameFromBranchName(ref.upstream.name); + } + return executeCommand(Commands.OpenOnRemote, { repoPath: ref.repoPath, resource: { type: RemoteResourceType.Branch, branch: ref.name, }, - remote: ref.upstream?.name, + remote: remote, clipboard: clipboard, }); } From b48021f1fdca08f0fd8b6cb2587cd8968d15c861 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Tue, 10 Oct 2023 14:11:56 -0700 Subject: [PATCH 0038/1012] Updates graph dependency --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 51452738ab756..ebb216213737d 100644 --- a/package.json +++ b/package.json @@ -14850,7 +14850,7 @@ "vscode:prepublish": "yarn run bundle" }, "dependencies": { - "@gitkraken/gitkraken-components": "10.1.27", + "@gitkraken/gitkraken-components": "10.1.29", "@gitkraken/shared-web-components": "0.1.1-rc.11", "@microsoft/fast-element": "1.12.0", "@microsoft/fast-react-wrapper": "0.3.19", diff --git a/yarn.lock b/yarn.lock index 6413bf22cec5c..d4cfff6a1409c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -223,10 +223,10 @@ resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.1.6.tgz#22958c042e10b67463997bd6ea7115fe28cbcaf9" integrity sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A== -"@gitkraken/gitkraken-components@10.1.27": - version "10.1.27" - resolved "https://registry.yarnpkg.com/@gitkraken/gitkraken-components/-/gitkraken-components-10.1.27.tgz#18a9430678d7cef6a6476f8fcab956ea26dca76e" - integrity sha512-NiQ6M7J2sfrGfB2RRaIzMuM9l67GXY5BbgNVnQJajHa3zmuPN3ImLZ92Qxn0nn/0ZsrvVDaY6ZShnPRBNnbmeA== +"@gitkraken/gitkraken-components@10.1.29": + version "10.1.29" + resolved "https://registry.yarnpkg.com/@gitkraken/gitkraken-components/-/gitkraken-components-10.1.29.tgz#4d539e1bc9c343e8167bb4165f91246953725837" + integrity sha512-cqu9Mg8X6AERpdNIe+ux9CFLglkMejgRq3E6pIDG5lyMsEmLiISYr4trrTFc0DTyGfRwmbagCbqNodXeTOU6Fw== dependencies: "@axosoft/react-virtualized" "9.22.3-gitkraken.3" classnames "2.3.2" From 3bce79a8d8097fa7c50c792a2f57251dc9abbfe7 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 10 Oct 2023 17:47:17 -0400 Subject: [PATCH 0039/1012] Splits out new `getFirstCommitSha` Aligns with eventual cloud patch changes --- src/env/node/git/localGitProvider.ts | 12 +-- src/git/gitProvider.ts | 2 +- src/git/gitProviderService.ts | 16 ++-- src/plus/github/githubGitProvider.ts | 5 -- src/telemetry/usageTracker.ts | 6 +- src/uris/deepLinks/deepLink.ts | 106 +++++++++++++------------- src/uris/deepLinks/deepLinkService.ts | 26 +++---- 7 files changed, 87 insertions(+), 86 deletions(-) diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts index 3fdf45262caa2..c3509b96a14d6 100644 --- a/src/env/node/git/localGitProvider.ts +++ b/src/env/node/git/localGitProvider.ts @@ -2917,6 +2917,12 @@ export class LocalGitProvider implements GitProvider, Disposable { return files[0]; } + @log() + async getFirstCommitSha(repoPath: string): Promise { + const data = await this.git.rev_list(repoPath, 'HEAD', { maxParents: 0 }); + return data?.[0]; + } + @gate() @debug() async getGitDir(repoPath: string): Promise { @@ -4442,12 +4448,6 @@ export class LocalGitProvider implements GitProvider, Disposable { return GitTreeParser.parse(data) ?? []; } - @log() - async getUniqueRepositoryId(repoPath: string): Promise { - const data = await this.git.rev_list(repoPath, 'HEAD', { maxParents: 0 }); - return data?.[0]; - } - @log({ args: { 1: false } }) async hasBranchOrTag( repoPath: string | undefined, diff --git a/src/git/gitProvider.ts b/src/git/gitProvider.ts index 8ad2b5cf119c8..508f97606c3fd 100644 --- a/src/git/gitProvider.ts +++ b/src/git/gitProvider.ts @@ -308,6 +308,7 @@ export interface GitProvider extends Disposable { options?: { filters?: GitDiffFilter[] | undefined; similarityThreshold?: number | undefined }, ): Promise; getFileStatusForCommit(repoPath: string, uri: Uri, ref: string): Promise; + getFirstCommitSha?(repoPath: string): Promise; getGitDir?(repoPath: string): Promise; getLastFetchedTimestamp(repoPath: string): Promise; getLog( @@ -406,7 +407,6 @@ export interface GitProvider extends Disposable { ): Promise>; getTreeEntryForRevision(repoPath: string, path: string, ref: string): Promise; getTreeForRevision(repoPath: string, ref: string): Promise; - getUniqueRepositoryId(repoPath: string): Promise; hasBranchOrTag( repoPath: string | undefined, options?: { diff --git a/src/git/gitProviderService.ts b/src/git/gitProviderService.ts index ec811edc09766..0eb207a374bed 100644 --- a/src/git/gitProviderService.ts +++ b/src/git/gitProviderService.ts @@ -97,8 +97,6 @@ const weightedDefaultBranches = new Map([ ['development', 1], ]); -const missingRepositoryId = '-'; - export type GitProvidersChangeEvent = { readonly added: readonly GitProvider[]; readonly removed: readonly GitProvider[]; @@ -2438,12 +2436,18 @@ export class GitProviderService implements Disposable { } @log() - async getUniqueRepositoryId(repoPath: string | Uri): Promise { + async getFirstCommitSha(repoPath: string | Uri): Promise { const { provider, path } = this.getProvider(repoPath); - const id = await provider.getUniqueRepositoryId(path); - if (id != null) return id; + try { + return await provider.getFirstCommitSha?.(path); + } catch { + return undefined; + } + } - return missingRepositoryId; + @log() + getUniqueRepositoryId(repoPath: string | Uri): Promise { + return this.getFirstCommitSha(repoPath); } @log({ args: { 1: false } }) diff --git a/src/plus/github/githubGitProvider.ts b/src/plus/github/githubGitProvider.ts index 5c73bea6779ac..c057f661b1403 100644 --- a/src/plus/github/githubGitProvider.ts +++ b/src/plus/github/githubGitProvider.ts @@ -2771,11 +2771,6 @@ export class GitHubGitProvider implements GitProvider, Disposable { return []; } - async getUniqueRepositoryId(_repoPath: string): Promise { - // TODO@ramint implement this if there is a way. - return undefined; - } - @log() async hasBranchOrTag( repoPath: string | undefined, diff --git a/src/telemetry/usageTracker.ts b/src/telemetry/usageTracker.ts index 8981debf38bac..6d520e6d6a9dd 100644 --- a/src/telemetry/usageTracker.ts +++ b/src/telemetry/usageTracker.ts @@ -11,11 +11,13 @@ export interface TrackedUsage { } export type TrackedUsageFeatures = + | 'accountView' | 'branchesView' | 'commitDetailsView' | 'commitsView' | 'contributorsView' | 'fileHistoryView' + | 'focusWebview' | 'graphDetailsView' | 'graphView' | 'graphWebview' @@ -31,9 +33,7 @@ export type TrackedUsageFeatures = | 'timelineWebview' | 'timelineView' | 'welcomeWebview' - | 'workspaceView' - | 'focusWebview' - | 'accountView'; + | 'workspaceView'; export type TrackedUsageKeys = `${TrackedUsageFeatures}:shown`; export type UsageChangeEvent = { diff --git a/src/uris/deepLinks/deepLink.ts b/src/uris/deepLinks/deepLink.ts index 4b7910dbfe541..901f32b1cd1cb 100644 --- a/src/uris/deepLinks/deepLink.ts +++ b/src/uris/deepLinks/deepLink.ts @@ -62,65 +62,69 @@ export function parseDeepLinkUri(uri: Uri): DeepLink | undefined { // For example, if the uri is /link/r/{repoId}/b/{branchName}?url={remoteUrl}, // the link target id is {branchName} const [, type, prefix, mainId, target, ...rest] = uri.path.split('/'); - if (type !== 'link' || (prefix !== DeepLinkType.Repository && prefix !== DeepLinkType.Workspace)) { - return undefined; - } + if (type !== 'link') return undefined; const urlParams = new URLSearchParams(uri.query); - let remoteUrl = urlParams.get('url') ?? undefined; - if (remoteUrl != null) { - remoteUrl = decodeURIComponent(remoteUrl); - } - let repoPath = urlParams.get('path') ?? undefined; - if (repoPath != null) { - repoPath = decodeURIComponent(repoPath); - } - if (!remoteUrl && !repoPath && prefix !== DeepLinkType.Workspace) return undefined; - if (prefix === DeepLinkType.Workspace) { - return { - type: DeepLinkType.Workspace, - mainId: mainId, - }; - } + switch (prefix) { + case DeepLinkType.Repository: { + let remoteUrl = urlParams.get('url') ?? undefined; + if (remoteUrl != null) { + remoteUrl = decodeURIComponent(remoteUrl); + } + let repoPath = urlParams.get('path') ?? undefined; + if (repoPath != null) { + repoPath = decodeURIComponent(repoPath); + } + if (!remoteUrl && !repoPath) return undefined; - if (target == null) { - return { - type: DeepLinkType.Repository, - mainId: mainId, - remoteUrl: remoteUrl, - repoPath: repoPath, - }; - } + if (target == null) { + return { + type: DeepLinkType.Repository, + mainId: mainId, + remoteUrl: remoteUrl, + repoPath: repoPath, + }; + } - if (rest == null || rest.length === 0) return undefined; + if (rest == null || rest.length === 0) return undefined; - let targetId: string; - let secondaryTargetId: string | undefined; - let secondaryRemoteUrl: string | undefined; - const joined = rest.join('/'); + let targetId: string; + let secondaryTargetId: string | undefined; + let secondaryRemoteUrl: string | undefined; + const joined = rest.join('/'); - if (target === DeepLinkType.Comparison) { - const split = joined.split(/(\.\.\.|\.\.)/); - if (split.length !== 3) return undefined; - targetId = split[0]; - secondaryTargetId = split[2]; - secondaryRemoteUrl = urlParams.get('prRepoUrl') ?? undefined; - if (secondaryRemoteUrl != null) { - secondaryRemoteUrl = decodeURIComponent(secondaryRemoteUrl); + if (target === DeepLinkType.Comparison) { + const split = joined.split(/(\.\.\.|\.\.)/); + if (split.length !== 3) return undefined; + targetId = split[0]; + secondaryTargetId = split[2]; + secondaryRemoteUrl = urlParams.get('prRepoUrl') ?? undefined; + if (secondaryRemoteUrl != null) { + secondaryRemoteUrl = decodeURIComponent(secondaryRemoteUrl); + } + } else { + targetId = joined; + } + + return { + type: target as DeepLinkType, + mainId: mainId, + remoteUrl: remoteUrl, + repoPath: repoPath, + targetId: targetId, + secondaryTargetId: secondaryTargetId, + secondaryRemoteUrl: secondaryRemoteUrl, + }; } - } else { - targetId = joined; - } + case DeepLinkType.Workspace: + return { + type: DeepLinkType.Workspace, + mainId: mainId, + }; - return { - type: target as DeepLinkType, - mainId: mainId, - remoteUrl: remoteUrl, - repoPath: repoPath, - targetId: targetId, - secondaryTargetId: secondaryTargetId, - secondaryRemoteUrl: secondaryRemoteUrl, - }; + default: + return undefined; + } } export const enum DeepLinkServiceState { diff --git a/src/uris/deepLinks/deepLinkService.ts b/src/uris/deepLinks/deepLinkService.ts index 3a9cfd27155bb..cc544044cdd86 100644 --- a/src/uris/deepLinks/deepLinkService.ts +++ b/src/uris/deepLinks/deepLinkService.ts @@ -25,18 +25,18 @@ import { parseDeepLinkUri, } from './deepLink'; +const missingRepositoryId = '-'; + export class DeepLinkService implements Disposable { private readonly _disposables: Disposable[] = []; private _context: DeepLinkServiceContext; - private readonly _onDeepLinkProgressUpdated: EventEmitter; + private readonly _onDeepLinkProgressUpdated = new EventEmitter(); constructor(private readonly container: Container) { this._context = { state: DeepLinkServiceState.Idle, }; - this._onDeepLinkProgressUpdated = new EventEmitter(); - this._disposables.push( container.uri.onDidReceiveUri(async (uri: Uri) => { const link = parseDeepLinkUri(uri); @@ -426,10 +426,13 @@ export class DeepLinkService implements Disposable { return; } case DeepLinkServiceState.TypeMatch: { - if (targetType === DeepLinkType.Workspace) { - action = DeepLinkServiceAction.LinkIsWorkspaceType; - } else { - action = DeepLinkServiceAction.LinkIsRepoType; + switch (targetType) { + case DeepLinkType.Workspace: + action = DeepLinkServiceAction.LinkIsWorkspaceType; + break; + default: + action = DeepLinkServiceAction.LinkIsRepoType; + break; } break; @@ -471,7 +474,7 @@ export class DeepLinkService implements Disposable { } } - if (mainId != null && mainId !== '-') { + if (mainId != null && mainId !== missingRepositoryId) { // Repo ID can be any valid SHA in the repo, though standard practice is to use the // first commit SHA. if (await this.container.git.validateReference(repo.path, mainId)) { @@ -945,7 +948,6 @@ export class DeepLinkService implements Disposable { compareRef?: StoredNamedRef, compareWithRef?: StoredNamedRef, ): Promise { - let repoId: string | undefined; let targetType: DeepLinkType | undefined; let targetId: string | undefined; let compareWithTargetId: string | undefined; @@ -963,11 +965,7 @@ export class DeepLinkService implements Disposable { } const repoPath = typeof refOrIdOrRepoPath !== 'string' ? refOrIdOrRepoPath.repoPath : refOrIdOrRepoPath; - try { - repoId = await this.container.git.getUniqueRepositoryId(repoPath); - } catch { - repoId = '-'; - } + const repoId = (await this.container.git.getUniqueRepositoryId(repoPath)) ?? missingRepositoryId; if (typeof refOrIdOrRepoPath !== 'string') { switch (refOrIdOrRepoPath.refType) { From 0448e1ba5a4eda3001e58f58f7dceaa831e63464 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 10 Oct 2023 18:31:11 -0400 Subject: [PATCH 0040/1012] Improves apply/restore for deleted files --- src/git/actions/commit.ts | 47 ++++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/src/git/actions/commit.ts b/src/git/actions/commit.ts index f7e124dbc124b..d464fcda9367d 100644 --- a/src/git/actions/commit.ts +++ b/src/git/actions/commit.ts @@ -1,5 +1,5 @@ import type { TextDocumentShowOptions } from 'vscode'; -import { env, Range, Uri, window } from 'vscode'; +import { env, Range, Uri, window, workspace } from 'vscode'; import type { DiffWithCommandArgs } from '../../commands/diffWith'; import type { DiffWithPreviousCommandArgs } from '../../commands/diffWithPrevious'; import type { DiffWithWorkingCommandArgs } from '../../commands/diffWithWorking'; @@ -22,31 +22,39 @@ import type { GitFile } from '../models/file'; import type { GitRevisionReference } from '../models/reference'; import { getReferenceFromRevision, isUncommitted, isUncommittedStaged } from '../models/reference'; -export async function applyChanges(file: string | GitFile, ref1: GitRevisionReference, ref2?: GitRevisionReference) { +export async function applyChanges(file: string | GitFile, rev1: GitRevisionReference, rev2?: GitRevisionReference) { let create = false; - let ref = ref1.ref; + let ref1 = rev1.ref; + let ref2 = rev2?.ref; if (typeof file !== 'string') { // If the file is `?` (untracked), then this must be a stash, so get the ^3 commit to access the untracked file if (file.status === '?') { - ref = `${ref}^3`; + ref1 = `${ref1}^3`; create = true; } else if (file.status === 'A') { create = true; + } else if (file.status === 'D') { + // If the file is deleted, check to see if it exists, if so, apply the delete, otherwise restore it from the previous commit + const uri = GitUri.fromFile(file, rev1.repoPath); + try { + await workspace.fs.stat(uri); + } catch { + create = true; + + ref2 = ref1; + ref1 = `${ref1}^`; + } } } if (create) { - const uri = GitUri.fromFile(file, ref1.repoPath); - await Container.instance.git.applyChangesToWorkingFile(uri, ref, ref2?.ref); + const uri = GitUri.fromFile(file, rev1.repoPath); + await Container.instance.git.applyChangesToWorkingFile(uri, ref1, ref2); await openFile(uri, { preserveFocus: true, preview: false }); } else { // Open the working file to ensure undo will work - await openFile(file, ref1, { preserveFocus: true, preview: false }); - await Container.instance.git.applyChangesToWorkingFile( - GitUri.fromFile(file, ref1.repoPath, ref), - ref, - ref2?.ref, - ); + await openFile(file, rev1, { preserveFocus: true, preview: false }); + await Container.instance.git.applyChangesToWorkingFile(GitUri.fromFile(file, rev1.repoPath, ref1), ref1, ref2); } } @@ -550,7 +558,20 @@ export async function restoreFile(file: string | GitFile, revision: GitRevisionR ref = revision.ref; } else { path = file.path; - ref = file.status === `?` ? `${revision.ref}^3` : file.status === 'D' ? `${revision.ref}^` : revision.ref; + if (file.status === 'D') { + // If the file is deleted, check to see if it exists, if so, restore it from the previous commit, otherwise restore it from the current commit + const uri = GitUri.fromFile(file, revision.repoPath); + try { + await workspace.fs.stat(uri); + ref = `${revision.ref}^`; + } catch { + ref = revision.ref; + } + } else if (file.status === '?') { + ref = `${revision.ref}^3`; + } else { + ref = revision.ref; + } } await Container.instance.git.checkout(revision.repoPath, ref, { path: path }); From e19b9cfaa939d9c4a38cc127b3ad3a58fd959c4a Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 11 Oct 2023 12:00:51 -0400 Subject: [PATCH 0041/1012] Ensures WIP node gets selected properly --- src/plus/webviews/graph/graphWebview.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts index 7c9eb816beac5..e4f58fe6a2a06 100644 --- a/src/plus/webviews/graph/graphWebview.ts +++ b/src/plus/webviews/graph/graphWebview.ts @@ -1895,7 +1895,8 @@ export class GraphWebviewProvider implements WebviewProvider { // If we have a set of data refresh to the same set const limit = Math.max(defaultItemLimit, this._graph?.ids.size ?? defaultItemLimit); - const ref = this._selectedId == null || this._selectedId === uncommitted ? 'HEAD' : this._selectedId; + const selectedId = this._selectedId; + const ref = selectedId == null || selectedId === uncommitted ? 'HEAD' : selectedId; const columns = this.getColumns(); const columnSettings = this.getColumnSettings(columns); @@ -1928,7 +1929,9 @@ export class GraphWebviewProvider implements WebviewProvider { queueMicrotask(async () => { const data = await dataPromise; this.setGraph(data); - this.setSelectedRows(data.id); + if (selectedId !== uncommitted) { + this.setSelectedRows(data.id); + } void this.notifyDidChangeRefsVisibility(); void this.notifyDidChangeRows(true); @@ -1936,7 +1939,9 @@ export class GraphWebviewProvider implements WebviewProvider { } else { data = await dataPromise; this.setGraph(data); - this.setSelectedRows(data.id); + if (selectedId !== uncommitted) { + this.setSelectedRows(data.id); + } } const [accessResult, workingStatsResult, branchResult, lastFetchedResult] = await promises; From a70e2b930a9e10697b919b158dbf3e244a8bdd5c Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 11 Oct 2023 17:18:38 -0400 Subject: [PATCH 0042/1012] Adds Working Changes tab to Commit/Graph Details - Adds stage/unstage support --- CHANGELOG.md | 2 + src/trackers/gitLineTracker.ts | 2 +- src/trackers/lineTracker.ts | 1 + .../apps/commitDetails/commitDetails.scss | 103 ++- .../apps/commitDetails/commitDetails.ts | 71 +- .../components/commit-details-app.ts | 733 ++---------------- .../components/gl-commit-details.ts | 523 +++++++++++++ .../components/gl-details-base.ts | 235 ++++++ .../components/gl-wip-details.ts | 67 ++ .../components/commit/commit-identity.ts | 9 +- .../components/list/file-change-list-item.ts | 83 +- .../shared/components/list/list-container.ts | 1 - .../apps/shared/components/list/list-item.ts | 2 + .../shared/components/status/git-status.ts | 237 ++++++ .../commitDetails/commitDetailsWebview.ts | 518 +++++++++---- src/webviews/commitDetails/protocol.ts | 80 +- src/webviews/commitDetails/registration.ts | 4 +- 17 files changed, 1727 insertions(+), 944 deletions(-) create mode 100644 src/webviews/apps/commitDetails/components/gl-commit-details.ts create mode 100644 src/webviews/apps/commitDetails/components/gl-details-base.ts create mode 100644 src/webviews/apps/commitDetails/components/gl-wip-details.ts create mode 100644 src/webviews/apps/shared/components/status/git-status.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index fd868b81cb6cf..282871f57824d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Added +- Adds a _Working Changes_ tab to the _Commit Details_ and _Graph Details_ views to show your working tree changes + - Adds _Stage Changes_ and _Unstage Changes_ commands to files on the _Working Changes_ tab - Adds a _[Show|Hide] Merge Commits_ toggle to the _File History_ view — closes [#2104](https://github.com/gitkraken/vscode-gitlens/issues/2104) & [#2944](https://github.com/gitkraken/vscode-gitlens/issues/2944) - Adds a `gitlens.advanced.fileHistoryShowMergeCommits` setting to specify whether merge commits will be show in file histories - Adds deep link support for workspaces in the _GitKraken Workspaces_ view diff --git a/src/trackers/gitLineTracker.ts b/src/trackers/gitLineTracker.ts index d6fd18c7134cb..945117891bda7 100644 --- a/src/trackers/gitLineTracker.ts +++ b/src/trackers/gitLineTracker.ts @@ -31,7 +31,7 @@ export class GitLineTracker extends LineTracker { updated = await this.updateState(e.selections, e.editor); } - super.fireLinesChanged(updated ? e : { ...e, selections: undefined }); + super.fireLinesChanged(updated ? e : { ...e, selections: undefined, suspended: this.suspended }); } private _subscriptionOnlyWhenActive: Disposable | undefined; diff --git a/src/trackers/lineTracker.ts b/src/trackers/lineTracker.ts index 1490e5476580d..b797aad51fe70 100644 --- a/src/trackers/lineTracker.ts +++ b/src/trackers/lineTracker.ts @@ -13,6 +13,7 @@ export interface LinesChangeEvent { readonly reason: 'editor' | 'selection'; readonly pending?: boolean; + readonly suspended?: boolean; } export interface LineSelection { diff --git a/src/webviews/apps/commitDetails/commitDetails.scss b/src/webviews/apps/commitDetails/commitDetails.scss index 3240b960fc458..a9586370ccc07 100644 --- a/src/webviews/apps/commitDetails/commitDetails.scss +++ b/src/webviews/apps/commitDetails/commitDetails.scss @@ -5,6 +5,24 @@ --gitlens-scrollbar-gutter-width: 10px; } +.vscode-high-contrast, +.vscode-dark { + --color-background--level-05: var(--color-background--lighten-05); + --color-background--level-075: var(--color-background--lighten-075); + --color-background--level-10: var(--color-background--lighten-10); + --color-background--level-15: var(--color-background--lighten-15); + --color-background--level-30: var(--color-background--lighten-30); +} + +.vscode-high-contrast-light, +.vscode-light { + --color-background--level-05: var(--color-background--darken-05); + --color-background--level-075: var(--color-background--darken-075); + --color-background--level-10: var(--color-background--darken-10); + --color-background--level-15: var(--color-background--darken-15); + --color-background--level-30: var(--color-background--darken-30); +} + // generic resets html { font-size: 62.5%; @@ -19,6 +37,9 @@ html { } body { + --gk-badge-outline-color: var(--vscode-badge-foreground); + --gk-badge-filled-background-color: var(--vscode-badge-background); + --gk-badge-filled-color: var(--vscode-badge-foreground); font-family: var(--font-family); font-size: var(--font-size); color: var(--color-foreground); @@ -250,13 +271,6 @@ ul { margin-bottom: 1rem; } -.gl-actionbar { -} -.gl-actionbar__group { -} -.gl-action { -} - .message-block { font-size: 1.3rem; border: 1px solid var(--vscode-input-border); @@ -305,6 +319,14 @@ ul { flex: none; } + &--highlight { + margin-left: 0.25em; + padding: 0 4px 2px 4px; + border: 1px solid var(--color-background--level-15); + border-radius: 0.3rem; + font-family: var(--vscode-editor-font-family); + } + &.is-pinned { background-color: var(--color-alert-warningBackground); box-shadow: 0 0 0 0.1rem var(--color-alert-warningBorder); @@ -378,3 +400,70 @@ ul { } } } + +.wip-details { + display: flex; + padding: 0.4rem 0.8rem; + background: var(--color-alert-infoBackground); + border-left: 0.3rem solid var(--color-alert-infoBorder); + align-items: center; + justify-content: space-between; + + .wip-changes { + display: inline-flex; + align-items: baseline; + } + + .wip-branch { + display: inline-block; + padding: 0 0.3rem 0.2rem; + margin-left: 0.4rem; + // background: var(--color-background--level-05); + border: 1px solid var(--color-foreground--50); + border-radius: 0.3rem; + } + + gl-button { + padding: 0.2rem 0.8rem; + opacity: 0.8; + } +} + +.details-tab { + display: flex; + justify-content: stretch; + align-items: center; + margin-bottom: 0.4rem; + gap: 0.2rem; + + & > * { + flex: 1; + } + + &__item { + appearance: none; + padding: 0.4rem; + color: var(--color-foreground--85); + background-color: transparent; + border: none; + border-bottom: 0.2rem solid transparent; + cursor: pointer; + // background-color: #00000030; + line-height: 1.8rem; + + gk-badge { + line-height: 1.36rem; + } + + &:hover { + color: var(--color-foreground); + // background-color: var(--vscode-button-hoverBackground); + background-color: #00000020; + } + + &.is-active { + color: var(--color-foreground); + border-bottom-color: var(--vscode-button-hoverBackground); + } + } +} diff --git a/src/webviews/apps/commitDetails/commitDetails.ts b/src/webviews/apps/commitDetails/commitDetails.ts index a5c5d0922ac79..110a8470a5bf0 100644 --- a/src/webviews/apps/commitDetails/commitDetails.ts +++ b/src/webviews/apps/commitDetails/commitDetails.ts @@ -1,13 +1,14 @@ /*global*/ import type { ViewFilesLayout } from '../../../config'; import type { Serialized } from '../../../system/serialize'; -import type { CommitActionsParams, State } from '../../commitDetails/protocol'; +import type { CommitActionsParams, Mode, State } from '../../commitDetails/protocol'; import { AutolinkSettingsCommandType, CommitActionsCommandType, DidChangeNotificationType, - DidExplainCommitCommandType, - ExplainCommitCommandType, + DidChangeWipStateNotificationType, + DidExplainCommandType, + ExplainCommandType, FileActionsCommandType, NavigateCommitCommandType, OpenFileCommandType, @@ -16,8 +17,11 @@ import { OpenFileOnRemoteCommandType, PickCommitCommandType, PinCommitCommandType, - PreferencesCommandType, SearchCommitCommandType, + StageFileCommandType, + SwitchModeCommandType, + UnstageFileCommandType, + UpdatePreferencesCommandType, } from '../../commitDetails/protocol'; import type { IpcMessage } from '../../protocol'; import { ExecuteCommandType, onIpc } from '../../protocol'; @@ -44,7 +48,7 @@ import './components/commit-details-app'; export const uncommittedSha = '0000000000000000000000000000000000000000'; -export type CommitState = SomeNonNullable, 'selected'>; +export type CommitState = SomeNonNullable, 'commit'>; export class CommitDetailsApp extends App> { constructor() { super('CommitDetailsApp'); @@ -71,8 +75,16 @@ export class CommitDetailsApp extends App> { DOM.on('file-change-list-item', 'file-more-actions', e => this.onFileMoreActions(e.detail), ), + DOM.on('file-change-list-item', 'file-stage', e => + this.onStageFile(e.detail), + ), + DOM.on('file-change-list-item', 'file-unstage', e => + this.onUnstageFile(e.detail), + ), DOM.on('[data-action="commit-actions"]', 'click', e => this.onCommitActions(e)), DOM.on('[data-action="pick-commit"]', 'click', e => this.onPickCommit(e)), + DOM.on('[data-action="wip"]', 'click', e => this.onSwitchMode(e, 'wip')), + DOM.on('[data-action="details"]', 'click', e => this.onSwitchMode(e, 'commit')), DOM.on('[data-action="search-commit"]', 'click', e => this.onSearchCommit(e)), DOM.on('[data-action="autolink-settings"]', 'click', e => this.onAutolinkSettings(e)), DOM.on('[data-action="files-layout"]', 'click', e => this.onToggleFilesLayout(e)), @@ -129,6 +141,14 @@ export class CommitDetailsApp extends App> { }); break; + case DidChangeWipStateNotificationType.method: + onIpc(DidChangeWipStateNotificationType, msg, params => { + this.state = { ...this.state, ...params }; + this.setState(this.state); + this.attachState(); + }); + break; + default: super.onMessageReceived?.(e); } @@ -147,11 +167,7 @@ export class CommitDetailsApp extends App> { async onExplainCommit(_e: MouseEvent) { try { - const result = await this.sendCommandWithCompletion( - ExplainCommitCommandType, - undefined, - DidExplainCommitCommandType, - ); + const result = await this.sendCommandWithCompletion(ExplainCommandType, undefined, DidExplainCommandType); if (result.error) { this.component.explain = { error: { message: result.error.message ?? 'Error retrieving content' } }; @@ -159,7 +175,6 @@ export class CommitDetailsApp extends App> { this.component.explain = { summary: result.summary }; } else { this.component.explain = undefined; - this.component.explainBusy = false; } } catch (ex) { this.component.explain = { error: { message: 'Error retrieving content' } }; @@ -173,24 +188,19 @@ export class CommitDetailsApp extends App> { const files = { ...this.state.preferences?.files, layout: layout ?? 'auto', - compact: this.state.preferences?.files?.compact ?? true, - threshold: this.state.preferences?.files?.threshold ?? 5, - icon: this.state.preferences?.files?.icon ?? 'type', }; this.state = { ...this.state, preferences: { ...this.state.preferences, files: files } }; this.attachState(); - this.sendCommand(PreferencesCommandType, { files: files }); + this.sendCommand(UpdatePreferencesCommandType, { files: files }); } private onExpandedChange(e: WebviewPaneExpandedChangeEventDetail) { - this.state.preferences = { - ...this.state.preferences, - autolinksExpanded: e.expanded, - }; + this.state = { ...this.state, preferences: { ...this.state.preferences, autolinksExpanded: e.expanded } }; + this.attachState(); - this.sendCommand(PreferencesCommandType, { autolinksExpanded: e.expanded }); + this.sendCommand(UpdatePreferencesCommandType, { autolinksExpanded: e.expanded }); } private onNavigate(direction: 'back' | 'forward', e: Event) { @@ -208,12 +218,19 @@ export class CommitDetailsApp extends App> { this.sendCommand(AutolinkSettingsCommandType, undefined); } + private onPickCommit(_e: MouseEvent) { + this.sendCommand(PickCommitCommandType, undefined); + } + private onSearchCommit(_e: MouseEvent) { this.sendCommand(SearchCommitCommandType, undefined); } - private onPickCommit(_e: MouseEvent) { - this.sendCommand(PickCommitCommandType, undefined); + private onSwitchMode(_e: MouseEvent, mode: Mode) { + this.state = { ...this.state, mode: mode }; + this.attachState(); + + this.sendCommand(SwitchModeCommandType, { mode: mode, repoPath: this.state.commit?.repoPath }); } private onOpenFileOnRemote(e: FileChangeListItemDetail) { @@ -236,9 +253,17 @@ export class CommitDetailsApp extends App> { this.sendCommand(FileActionsCommandType, e); } + onStageFile(e: FileChangeListItemDetail): void { + this.sendCommand(StageFileCommandType, e); + } + + onUnstageFile(e: FileChangeListItemDetail): void { + this.sendCommand(UnstageFileCommandType, e); + } + private onCommitActions(e: MouseEvent) { e.preventDefault(); - if (this.state.selected === undefined) { + if (this.state.commit === undefined) { e.stopPropagation(); return; } diff --git a/src/webviews/apps/commitDetails/components/commit-details-app.ts b/src/webviews/apps/commitDetails/components/commit-details-app.ts index c32661b11adbe..545b60167e9f4 100644 --- a/src/webviews/apps/commitDetails/components/commit-details-app.ts +++ b/src/webviews/apps/commitDetails/components/commit-details-app.ts @@ -1,21 +1,16 @@ -import type { TemplateResult } from 'lit'; -import { html, LitElement, nothing } from 'lit'; +import { Badge, defineGkElement } from '@gitkraken/shared-web-components'; +import { html, LitElement } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { unsafeHTML } from 'lit/directives/unsafe-html.js'; +import { ifDefined } from 'lit/directives/if-defined.js'; import { when } from 'lit/directives/when.js'; -import type { Autolink } from '../../../../annotations/autolinks'; -import type { IssueOrPullRequest } from '../../../../git/models/issue'; -import type { PullRequestShape } from '../../../../git/models/pullRequest'; -import type { HierarchicalItem } from '../../../../system/array'; -import { makeHierarchical } from '../../../../system/array'; import type { Serialized } from '../../../../system/serialize'; +import { pluralize } from '../../../../system/string'; import type { State } from '../../../commitDetails/protocol'; -import { messageHeadlineSplitterToken } from '../../../commitDetails/protocol'; +import '../../shared/components/button'; +import './gl-commit-details'; +import './gl-wip-details'; import { uncommittedSha } from '../commitDetails'; -type Files = NonNullable['files']>; -type File = Files[0]; - interface ExplainState { cancelled?: boolean; error?: { message: string }; @@ -27,22 +22,17 @@ export class GlCommitDetailsApp extends LitElement { @property({ type: Object }) state?: Serialized; - @state() - explainBusy = false; - @property({ type: Object }) explain?: ExplainState; + @state() get isUncommitted() { - return this.state?.selected?.sha === uncommittedSha; + return this.state?.commit?.sha === uncommittedSha; } + @state() get isStash() { - return this.state?.selected?.stashNumber != null; - } - - get shortSha() { - return this.state?.selected?.shortSha ?? ''; + return this.state?.commit?.stashNumber != null; } get navigation() { @@ -72,628 +62,65 @@ export class GlCommitDetailsApp extends LitElement { return actions; } - override updated(changedProperties: Map) { - if (changedProperties.has('explain')) { - this.explainBusy = false; - this.querySelector('[data-region="commit-explanation"]')?.scrollIntoView(); - } - } - - private renderEmptyContent() { - return html` -
-

Rich details for commits and stashes are shown as you navigate:

+ constructor() { + super(); - + defineGkElement(Badge); + } -

Alternatively, search for or choose a commit

+ override render() { + const wip = this.state?.wip; -

- - - -

-
- `; - } - - private renderCommitMessage() { - if (this.state?.selected == null) { - return undefined; - } - - const message = this.state.selected.message; - const index = message.indexOf(messageHeadlineSplitterToken); - return html` -
-
+ ${when( - index === -1, + this.state?.mode === 'commit', () => - html`

- ${unsafeHTML(message)} -

`, + html``, () => - html`

- ${unsafeHTML(message.substring(0, index))}
${unsafeHTML(message.substring(index + 3))} -

`, + html``, )} -
-
- `; - } - - private renderAutoLinks() { - if (this.isUncommitted) { - return undefined; - } - - const deduped = new Map< - string, - | { type: 'autolink'; value: Serialized } - | { type: 'issue'; value: Serialized } - | { type: 'pr'; value: Serialized } - >(); - - if (this.state?.selected?.autolinks != null) { - for (const autolink of this.state.selected.autolinks) { - deduped.set(autolink.id, { type: 'autolink', value: autolink }); - } - } - - if (this.state?.autolinkedIssues != null) { - for (const issue of this.state.autolinkedIssues) { - deduped.set(issue.id, { type: 'issue', value: issue }); - } - } - - if (this.state?.pullRequest != null) { - deduped.set(this.state.pullRequest.id, { type: 'pr', value: this.state.pullRequest }); - } - - const autolinks: Serialized[] = []; - const issues: Serialized[] = []; - const prs: Serialized[] = []; - - for (const item of deduped.values()) { - switch (item.type) { - case 'autolink': - autolinks.push(item.value); - break; - case 'issue': - issues.push(item.value); - break; - case 'pr': - prs.push(item.value); - break; - } - } - - return html` - - Autolinks - ${this.state?.includeRichContent || deduped.size ? `${deduped.size} found ` : ''}${this.state - ?.includeRichContent - ? '' - : '…'} - ${when( - this.state == null, - () => html` -
-
- -
-
- -
-
- -
-
- `, - () => { - if (deduped.size === 0) { - return html` -
-

-  Use - autolinks - to linkify external references, like Jira issues or Zendesk tickets, in commit - messages. -

-
- `; - } - return html` -
- ${autolinks.length - ? html` -
- ${autolinks.map(autolink => { - let name = autolink.description ?? autolink.title; - if (name === undefined) { - name = `Custom Autolink ${autolink.prefix}${autolink.id}`; - } - return html` - - `; - })} -
- ` - : undefined} - ${prs.length - ? html` -
- ${prs.map( - pr => html` - -
- `, - )} - - ` - : undefined} - ${issues.length - ? html` -
- ${issues.map( - issue => html` - - `, - )} -
- ` - : undefined} -
- `; - }, - )} - - `; - } - - private renderExplainAi() { - // TODO: add loading and response states - return html` - - Explain (AI) - - - - - -
-

Let AI assist in understanding the changes made with this commit.

-

- - - -

- ${when( - this.explain, - () => html` -
- ${when( - this.explain?.error, - () => - html`

- ${this.explain!.error!.message ?? 'Error retrieving content'} -

`, - )} - ${when( - this.explain?.summary, - () => html`

${this.explain!.summary}

`, - )} -
- `, - )} -
- - `; - } - - private renderCommitStats() { - if (this.state?.selected?.stats?.changedFiles == null) { - return undefined; - } - - if (typeof this.state.selected.stats.changedFiles === 'number') { - return html``; - } - - const { added, deleted, changed } = this.state.selected.stats.changedFiles; - return html``; - } - - private renderFileList() { - const files = this.state!.selected!.files!; - - let items; - let classes; - - if (this.isUncommitted) { - items = []; - classes = `indentGuides-${this.state!.indentGuides}`; - - const staged = files.filter(f => f.staged); - if (staged.length) { - items.push(html`Staged Changes`); - - for (const f of staged) { - items.push(this.renderFile(f, 2, true)); - } - } - - const unstaged = files.filter(f => !f.staged); - if (unstaged.length) { - items.push(html`Unstaged Changes`); - - for (const f of unstaged) { - items.push(this.renderFile(f, 2, true)); - } - } - } else { - items = files.map(f => this.renderFile(f)); - } - - return html`${items}`; - } - - private renderFileTree() { - const files = this.state!.selected!.files!; - const compact = this.state!.preferences?.files?.compact ?? true; - - let items; - - if (this.isUncommitted) { - items = []; - - const staged = files.filter(f => f.staged); - if (staged.length) { - items.push(html`Staged Changes`); - items.push(...this.renderFileSubtree(staged, 1, compact)); - } - - const unstaged = files.filter(f => !f.staged); - if (unstaged.length) { - items.push(html`Unstaged Changes`); - items.push(...this.renderFileSubtree(unstaged, 1, compact)); - } - } else { - items = this.renderFileSubtree(files, 0, compact); - } - - return html`${items}`; - } - - private renderFileSubtree(files: Files, rootLevel: number, compact: boolean) { - const tree = makeHierarchical( - files, - n => n.path.split('/'), - (...parts: string[]) => parts.join('/'), - compact, - ); - const flatTree = flattenHeirarchy(tree); - return flatTree.map(({ level, item }) => { - if (item.name === '') return undefined; - - if (item.value == null) { - return html` - - - ${item.name} - - `; - } - - return this.renderFile(item.value, rootLevel + level, true); - }); - } - - private renderFile(file: File, level: number = 1, tree: boolean = false): TemplateResult<1> { - return html` - - `; - } - - private renderChangedFiles() { - const layout = this.state?.preferences?.files?.layout ?? 'auto'; - - let value = 'tree'; - let icon = 'list-tree'; - let label = 'View as Tree'; - let isTree = false; - if (this.state?.selected?.files != null) { - if (layout === 'auto') { - isTree = this.state.selected.files.length > (this.state.preferences?.files?.threshold ?? 5); - } else { - isTree = layout === 'tree'; - } - - switch (layout) { - case 'auto': - value = 'list'; - icon = 'gl-list-auto'; - label = 'View as List'; - break; - case 'list': - value = 'tree'; - icon = 'list-flat'; - label = 'View as Tree'; - break; - case 'tree': - value = 'auto'; - icon = 'list-tree'; - label = 'View as Auto'; - break; - } - } - - return html` - - Files changed - ${this.renderCommitStats()} - - - - -
- ${when( - this.state?.selected?.files == null, - () => html` -
- -
-
- -
-
- -
- `, - () => (isTree ? this.renderFileTree() : this.renderFileList()), - )} -
- - `; - } - - override render() { - if (this.state?.selected == null) { - return html`
${this.renderEmptyContent()}
`; - } - - const pinLabel = this.state.pinned - ? 'Unpin this Commit\nRestores Automatic Following' - : 'Pin this Commit\nSuspends Automatic Following'; - return html` -
-
-
-
-
-
- - - ${when( - this.navigation.forward, - () => html` - - `, - )} - ${when( - this.state.navigationStack.hint, - () => html` - ${this.state!.navigationStack.hint} - `, - )} -
-
- ${when( - !this.isUncommitted, - () => html` - - - ${this.shortSha} - `, - () => html` - - `, - )} - - ${when( - !this.isUncommitted, - () => html` - - `, - )} -
-
- ${when( - this.state.selected && this.state.selected.stashNumber == null, - () => html` -
    -
  • - -
    • -
- `, - )} -
-
- ${this.renderCommitMessage()} ${this.renderAutoLinks()} ${this.renderChangedFiles()} - ${this.renderExplainAi()}
`; @@ -702,46 +129,4 @@ export class GlCommitDetailsApp extends LitElement { protected override createRenderRoot() { return this; } - - onExplainChanges(e: MouseEvent | KeyboardEvent) { - if (this.explainBusy === true || (e instanceof KeyboardEvent && e.key !== 'Enter')) { - e.preventDefault(); - e.stopPropagation(); - return; - } - - this.explainBusy = true; - } -} - -function flattenHeirarchy(item: HierarchicalItem, level = 0): { level: number; item: HierarchicalItem }[] { - const flattened: { level: number; item: HierarchicalItem }[] = []; - if (item == null) return flattened; - - flattened.push({ level: level, item: item }); - - if (item.children != null) { - const children = Array.from(item.children.values()); - children.sort((a, b) => { - if (!a.value || !b.value) { - return (a.value ? 1 : -1) - (b.value ? 1 : -1); - } - - if (a.relativePath < b.relativePath) { - return -1; - } - - if (a.relativePath > b.relativePath) { - return 1; - } - - return 0; - }); - - children.forEach(child => { - flattened.push(...flattenHeirarchy(child, level + 1)); - }); - } - - return flattened; } diff --git a/src/webviews/apps/commitDetails/components/gl-commit-details.ts b/src/webviews/apps/commitDetails/components/gl-commit-details.ts new file mode 100644 index 0000000000000..391c934c40fad --- /dev/null +++ b/src/webviews/apps/commitDetails/components/gl-commit-details.ts @@ -0,0 +1,523 @@ +import { html, nothing } from 'lit'; +import { customElement, property, state } from 'lit/decorators.js'; +import { unsafeHTML } from 'lit/directives/unsafe-html.js'; +import { when } from 'lit/directives/when.js'; +import type { Autolink } from '../../../../annotations/autolinks'; +import type { IssueOrPullRequest } from '../../../../git/models/issue'; +import type { PullRequestShape } from '../../../../git/models/pullRequest'; +import type { Serialized } from '../../../../system/serialize'; +import type { State } from '../../../commitDetails/protocol'; +import { messageHeadlineSplitterToken } from '../../../commitDetails/protocol'; +import { uncommittedSha } from '../commitDetails'; +import { GlDetailsBase } from './gl-details-base'; + +interface ExplainState { + cancelled?: boolean; + error?: { message: string }; + summary?: string; +} + +@customElement('gl-commit-details') +export class GlCommitDetails extends GlDetailsBase { + @property({ type: Object }) + state?: Serialized; + + @state() + get isStash() { + return this.state?.commit?.stashNumber != null; + } + + @state() + get shortSha() { + return this.state?.commit?.shortSha ?? ''; + } + + @state() + explainBusy = false; + + @property({ type: Object }) + explain?: ExplainState; + + get navigation() { + if (this.state?.navigationStack == null) { + return { + back: false, + forward: false, + }; + } + + const actions = { + back: true, + forward: true, + }; + + if (this.state.navigationStack.count <= 1) { + actions.back = false; + actions.forward = false; + } else if (this.state.navigationStack.position === 0) { + actions.back = true; + actions.forward = false; + } else if (this.state.navigationStack.position === this.state.navigationStack.count - 1) { + actions.back = false; + actions.forward = true; + } + + return actions; + } + + override updated(changedProperties: Map) { + if (changedProperties.has('explain')) { + this.explainBusy = false; + this.querySelector('[data-region="commit-explanation"]')?.scrollIntoView(); + } + } + + private renderEmptyContent() { + return html` +
+

Rich details for commits and stashes are shown as you navigate:

+ + + +

Alternatively, show your work-in-progress, or search for or choose a commit

+ +

+ +

+

+ + + + +

+
+ `; + } + + private renderCommitMessage() { + if (this.state?.commit == null) return undefined; + + const message = this.state.commit.message; + const index = message.indexOf(messageHeadlineSplitterToken); + return html` +
+
+ ${when( + index === -1, + () => + html`

+ ${unsafeHTML(message)} +

`, + () => + html`

+ ${unsafeHTML(message.substring(0, index))}
${unsafeHTML(message.substring(index + 3))} +

`, + )} +
+
+ `; + } + + private renderAutoLinks() { + if (this.isUncommitted) return undefined; + + const deduped = new Map< + string, + | { type: 'autolink'; value: Serialized } + | { type: 'issue'; value: Serialized } + | { type: 'pr'; value: Serialized } + >(); + + if (this.state?.commit?.autolinks != null) { + for (const autolink of this.state.commit.autolinks) { + deduped.set(autolink.id, { type: 'autolink', value: autolink }); + } + } + + if (this.state?.autolinkedIssues != null) { + for (const issue of this.state.autolinkedIssues) { + deduped.set(issue.id, { type: 'issue', value: issue }); + } + } + + if (this.state?.pullRequest != null) { + deduped.set(this.state.pullRequest.id, { type: 'pr', value: this.state.pullRequest }); + } + + const autolinks: Serialized[] = []; + const issues: Serialized[] = []; + const prs: Serialized[] = []; + + for (const item of deduped.values()) { + switch (item.type) { + case 'autolink': + autolinks.push(item.value); + break; + case 'issue': + issues.push(item.value); + break; + case 'pr': + prs.push(item.value); + break; + } + } + + return html` + + Autolinks + ${this.state?.includeRichContent || deduped.size ? `${deduped.size} found ` : ''}${this.state + ?.includeRichContent + ? '' + : '…'} + ${when( + this.state == null, + () => html` +
+
+ +
+
+ +
+
+ +
+
+ `, + () => { + if (deduped.size === 0) { + return html` +
+

+  Use + autolinks + to linkify external references, like Jira issues or Zendesk tickets, in commit + messages. +

+
+ `; + } + return html` +
+ ${autolinks.length + ? html` +
+ ${autolinks.map(autolink => { + let name = autolink.description ?? autolink.title; + if (name === undefined) { + name = `Custom Autolink ${autolink.prefix}${autolink.id}`; + } + return html` + + `; + })} +
+ ` + : undefined} + ${prs.length + ? html` +
+ ${prs.map( + pr => html` + +
+ `, + )} + + ` + : undefined} + ${issues.length + ? html` +
+ ${issues.map( + issue => html` + + `, + )} +
+ ` + : undefined} +
+ `; + }, + )} + + `; + } + + private renderExplainAi() { + // TODO: add loading and response states + return html` + + Explain (AI) + + + + + +
+

Let AI assist in understanding the changes made with this commit.

+

+ + + +

+ ${when( + this.explain, + () => html` +
+ ${when( + this.explain?.error, + () => + html`

+ ${this.explain!.error!.message ?? 'Error retrieving content'} +

`, + )} + ${when( + this.explain?.summary, + () => html`

${this.explain!.summary}

`, + )} +
+ `, + )} +
+ + `; + } + + override render() { + if (this.state?.commit == null) { + return this.renderEmptyContent(); + } + + const details = this.state.commit; + + const pinLabel = this.state.pinned + ? 'Unpin this Commit\nRestores Automatic Following' + : 'Pin this Commit\nSuspends Automatic Following'; + + return html` +
+
+
+
+ + + ${when( + this.navigation.forward, + () => html` + + `, + )} + ${when( + this.state.navigationStack?.hint, + () => html` + ${this.state!.navigationStack?.hint} + `, + )} +
+
+ ${when( + !this.isUncommitted, + () => html` + + + ${this.shortSha} + `, + () => html` + + `, + )} + + ${when( + !this.isUncommitted, + () => html` + + `, + )} +
+
+ ${when( + details != null && !this.isStash, + () => html` +
    +
  • + +
    • +
+ `, + )} +
+
+ ${this.renderCommitMessage()} ${this.renderAutoLinks()} + ${this.renderChangedFiles(this.isStash ? 'stash' : 'commit', this.renderCommitStats(details?.stats))} + ${this.renderExplainAi()} + `; + } + + onExplainChanges(e: MouseEvent | KeyboardEvent) { + if (this.explainBusy === true || (e instanceof KeyboardEvent && e.key !== 'Enter')) { + e.preventDefault(); + e.stopPropagation(); + return; + } + + this.explainBusy = true; + } + + private renderCommitStats(stats?: NonNullable['commit']>['stats']) { + if (stats?.changedFiles == null) return undefined; + + if (typeof stats.changedFiles === 'number') { + return html``; + } + + const { added, deleted, changed } = stats.changedFiles; + return html``; + } +} diff --git a/src/webviews/apps/commitDetails/components/gl-details-base.ts b/src/webviews/apps/commitDetails/components/gl-details-base.ts new file mode 100644 index 0000000000000..3f566798cd2e8 --- /dev/null +++ b/src/webviews/apps/commitDetails/components/gl-details-base.ts @@ -0,0 +1,235 @@ +import type { TemplateResult } from 'lit'; +import { html, LitElement } from 'lit'; +import { property } from 'lit/decorators.js'; +import { ifDefined } from 'lit/directives/if-defined.js'; +import { when } from 'lit/directives/when.js'; +import type { HierarchicalItem } from '../../../../system/array'; +import { makeHierarchical } from '../../../../system/array'; +import type { Preferences, State } from '../../../commitDetails/protocol'; + +type Files = Mutable['files']>>; +type File = Files[0]; +type Mode = 'commit' | 'stash' | 'wip'; + +export class GlDetailsBase extends LitElement { + @property({ type: Array }) + files?: Files; + + @property({ type: Boolean }) + isUncommitted = false; + + @property({ type: Object }) + preferences?: Preferences; + + @property({ attribute: 'empty-text' }) + emptyText? = 'No Files'; + + private renderFileList(mode: Mode, files: Files) { + let items; + let classes; + + if (this.isUncommitted) { + items = []; + classes = `indentGuides-${this.preferences?.indentGuides}`; + + const staged = files.filter(f => f.staged); + if (staged.length) { + items.push(html`Staged Changes`); + + for (const f of staged) { + items.push(this.renderFile(mode, f, 2, true)); + } + } + + const unstaged = files.filter(f => !f.staged); + if (unstaged.length) { + items.push(html`Unstaged Changes`); + + for (const f of unstaged) { + items.push(this.renderFile(mode, f, 2, true)); + } + } + } else { + items = files.map(f => this.renderFile(mode, f)); + } + + return html`${items}`; + } + + private renderFileTree(mode: Mode, files: Files) { + const compact = this.preferences?.files?.compact ?? true; + + let items; + + if (this.isUncommitted) { + items = []; + + const staged = files.filter(f => f.staged); + if (staged.length) { + items.push(html`Staged Changes`); + items.push(...this.renderFileSubtree(mode, staged, 1, compact)); + } + + const unstaged = files.filter(f => !f.staged); + if (unstaged.length) { + items.push(html`Unstaged Changes`); + items.push(...this.renderFileSubtree(mode, unstaged, 1, compact)); + } + } else { + items = this.renderFileSubtree(mode, files, 0, compact); + } + + return html`${items}`; + } + + private renderFileSubtree(mode: Mode, files: Files, rootLevel: number, compact: boolean) { + const tree = makeHierarchical( + files, + n => n.path.split('/'), + (...parts: string[]) => parts.join('/'), + compact, + ); + const flatTree = flattenHeirarchy(tree); + return flatTree.map(({ level, item }) => { + if (item.name === '') return undefined; + + if (item.value == null) { + return html` + + + ${item.name} + + `; + } + + return this.renderFile(mode, item.value, rootLevel + level, true); + }); + } + + private renderFile(mode: Mode, file: File, level: number = 1, tree: boolean = false): TemplateResult<1> { + return html` + + `; + } + + protected renderChangedFiles(mode: Mode, subtitle?: TemplateResult<1>) { + const layout = this.preferences?.files?.layout ?? 'auto'; + + let value = 'tree'; + let icon = 'list-tree'; + let label = 'View as Tree'; + let isTree = false; + if (this.preferences != null && this.files != null) { + if (layout === 'auto') { + isTree = this.files.length > (this.preferences.files?.threshold ?? 5); + } else { + isTree = layout === 'tree'; + } + + switch (layout) { + case 'auto': + value = 'list'; + icon = 'gl-list-auto'; + label = 'View as List'; + break; + case 'list': + value = 'tree'; + icon = 'list-flat'; + label = 'View as Tree'; + break; + case 'tree': + value = 'auto'; + icon = 'list-tree'; + label = 'View as Auto'; + break; + } + } + + return html` + + Files changed + ${subtitle} + + + + +
+ ${when( + this.files == null, + () => html` +
+ +
+
+ +
+
+ +
+ `, + () => + when( + this.files!.length > 0, + () => + isTree + ? this.renderFileTree(mode, this.files!) + : this.renderFileList(mode, this.files!), + () => html`

${this.emptyText}

`, + ), + )} +
+ + `; + } + + protected override createRenderRoot() { + return this; + } +} + +function flattenHeirarchy(item: HierarchicalItem, level = 0): { level: number; item: HierarchicalItem }[] { + const flattened: { level: number; item: HierarchicalItem }[] = []; + if (item == null) return flattened; + + flattened.push({ level: level, item: item }); + + if (item.children != null) { + const children = Array.from(item.children.values()); + children.sort((a, b) => { + if (!a.value || !b.value) { + return (a.value ? 1 : -1) - (b.value ? 1 : -1); + } + + if (a.relativePath < b.relativePath) { + return -1; + } + + if (a.relativePath > b.relativePath) { + return 1; + } + + return 0; + }); + + children.forEach(child => { + flattened.push(...flattenHeirarchy(child, level + 1)); + }); + } + + return flattened; +} diff --git a/src/webviews/apps/commitDetails/components/gl-wip-details.ts b/src/webviews/apps/commitDetails/components/gl-wip-details.ts new file mode 100644 index 0000000000000..b3851d019f34f --- /dev/null +++ b/src/webviews/apps/commitDetails/components/gl-wip-details.ts @@ -0,0 +1,67 @@ +import { html } from 'lit'; +import { customElement, property } from 'lit/decorators.js'; +import { when } from 'lit/directives/when.js'; +import { pluralize } from '../../../../system/string'; +import type { Wip } from '../../../commitDetails/protocol'; +import { GlDetailsBase } from './gl-details-base'; + +@customElement('gl-wip-details') +export class GlWipDetails extends GlDetailsBase { + @property({ type: Object }) + wip?: Wip; + + override render() { + return html` +
+
+
+
+ ${when( + this.wip?.changes == null || this.files == null, + () => 'Loading...', + () => + html`${pluralize('change', this.files!.length)} on + ${this.wip!.repositoryCount > 1 + ? `${this.wip!.changes!.repository.name}:${ + this.wip!.changes!.branchName + }` + : this.wip!.changes!.branchName}`, + )} +
+
+ + +
+
+
+
+ ${this.renderChangedFiles('wip')} + `; + } +} diff --git a/src/webviews/apps/shared/components/commit/commit-identity.ts b/src/webviews/apps/shared/components/commit/commit-identity.ts index 331e97cc56800..77da398d51df2 100644 --- a/src/webviews/apps/shared/components/commit/commit-identity.ts +++ b/src/webviews/apps/shared/components/commit/commit-identity.ts @@ -1,5 +1,6 @@ import { css, html, LitElement } from 'lit'; import { customElement, property } from 'lit/decorators.js'; +import { dateConverter } from '../converters/date-converter'; import '../code-icon'; import '../formatted-date'; @@ -48,8 +49,8 @@ export class CommitIdentity extends LitElement { @property() email = ''; - @property() - date = ''; + @property({ converter: dateConverter(), reflect: true }) + date: Date | undefined; @property() avatarUrl = 'https://www.gravatar.com/avatar/?s=64&d=robohash'; @@ -60,7 +61,7 @@ export class CommitIdentity extends LitElement { @property() dateFormat = 'MMMM Do, YYYY h:mma'; - @property() + @property({ type: Boolean }) committer = false; @property() @@ -76,7 +77,7 @@ export class CommitIdentity extends LitElement { ${this.name} ${this.actionLabel} - + `; } diff --git a/src/webviews/apps/shared/components/list/file-change-list-item.ts b/src/webviews/apps/shared/components/list/file-change-list-item.ts index 59a4511eca7b8..406c0bfd8ae02 100644 --- a/src/webviews/apps/shared/components/list/file-change-list-item.ts +++ b/src/webviews/apps/shared/components/list/file-change-list-item.ts @@ -3,6 +3,7 @@ import { customElement, property, query, state } from 'lit/decorators.js'; import type { TextDocumentShowOptions } from 'vscode'; import type { ListItem, ListItemSelectedEvent } from './list-item'; import '../code-icon'; +import '../status/git-status'; // Can only import types from 'vscode' const BesideViewColumn = -2; /*ViewColumn.Beside*/ @@ -17,27 +18,6 @@ export interface FileChangeListItemDetail { // TODO: "change-list__action" should be a separate component -// TODO: use the model version -const statusTextMap: Record = { - '.': 'Unchanged', - '!': 'Ignored', - '?': 'Untracked', - A: 'Added', - D: 'Deleted', - M: 'Modified', - R: 'Renamed', - C: 'Copied', - AA: 'Conflict', - AU: 'Conflict', - UA: 'Conflict', - DD: 'Conflict', - DU: 'Conflict', - UD: 'Conflict', - UU: 'Conflict', - T: 'Modified', - U: 'Updated but Unmerged', -}; - @customElement('file-change-list-item') export class FileChangeListItem extends LitElement { static override styles = css` @@ -81,6 +61,9 @@ export class FileChangeListItem extends LitElement { @property({ type: Number }) level = 1; + @property({ type: Boolean, reflect: true }) checkable = false; + @property({ type: Boolean, reflect: true }) checked = false; + @property({ type: Boolean }) active = false; @@ -90,6 +73,9 @@ export class FileChangeListItem extends LitElement { @property({ type: Boolean }) uncommitted = false; + @property({ type: Boolean }) + readonly = false; + @property({ type: String }) icon = ''; @@ -137,11 +123,6 @@ export class FileChangeListItem extends LitElement { return !this.tree && this.pathIndex > -1 ? this.path.substring(0, this.pathIndex) : ''; } - @state() - get statusName() { - return this.status !== '' ? statusTextMap[this.status] : ''; - } - override render() { return html` - + ${this.fileName} ${this.tree ? nothing : html`${this.filePath}`} - ${this.uncommitted - ? nothing - : html` + ${this.uncommitted && !this.readonly + ? this.staged + ? html` + + + + ` + : html` + + + + ` + : !this.uncommitted + ? html` `} - `} + ` + : nothing} `; @@ -239,6 +246,20 @@ export class FileChangeListItem extends LitElement { this.dispatchEvent(event); } + onStageFile(_e: MouseEvent) { + const event = new CustomEvent('file-stage', { + detail: this.getEventDetail(), + }); + this.dispatchEvent(event); + } + + onUnstageFile(_e: MouseEvent) { + const event = new CustomEvent('file-unstage', { + detail: this.getEventDetail(), + }); + this.dispatchEvent(event); + } + private getEventDetail(showOptions?: TextDocumentShowOptions): FileChangeListItemDetail { return { path: this.path, diff --git a/src/webviews/apps/shared/components/list/list-container.ts b/src/webviews/apps/shared/components/list/list-container.ts index 0688c03dc5f02..73c3fbbc3a0fa 100644 --- a/src/webviews/apps/shared/components/list/list-container.ts +++ b/src/webviews/apps/shared/components/list/list-container.ts @@ -63,7 +63,6 @@ export class ListContainer extends LitElement { if (!e.target || !e.detail.branch) return; function getLevel(el: ListItem) { - // return el.level ?? 0; return parseInt(el.getAttribute('level') ?? '0', 10); } diff --git a/src/webviews/apps/shared/components/list/list-item.ts b/src/webviews/apps/shared/components/list/list-item.ts index 32afe778e5d57..f160017001657 100644 --- a/src/webviews/apps/shared/components/list/list-item.ts +++ b/src/webviews/apps/shared/components/list/list-item.ts @@ -77,6 +77,7 @@ export class ListItem extends LitElement { display: flex; flex-direction: row; justify-content: flex-start; + align-items: center; gap: 0.6rem; width: 100%; padding: 0; @@ -130,6 +131,7 @@ export class ListItem extends LitElement { } .text { + line-height: 1.6rem; overflow: hidden; white-space: nowrap; text-align: left; diff --git a/src/webviews/apps/shared/components/status/git-status.ts b/src/webviews/apps/shared/components/status/git-status.ts new file mode 100644 index 0000000000000..f2cbaca9cc02e --- /dev/null +++ b/src/webviews/apps/shared/components/status/git-status.ts @@ -0,0 +1,237 @@ +import type { PropertyValueMap } from 'lit'; +import { css, html, LitElement } from 'lit'; +import { customElement, property, state } from 'lit/decorators.js'; +import type { GitFileStatus } from '../../../../../git/models/file'; + +// TODO: use the model version +const statusTextMap: Record = { + '.': 'Unchanged', + '!': 'Ignored', + '?': 'Untracked', + A: 'Added', + D: 'Deleted', + M: 'Modified', + R: 'Renamed', + C: 'Copied', + AA: 'Conflict', + AU: 'Conflict', + UA: 'Conflict', + DD: 'Conflict', + DU: 'Conflict', + UD: 'Conflict', + UU: 'Conflict', + T: 'Modified', + U: 'Updated but Unmerged', +}; + +@customElement('gl-git-status') +export class GlGitStatus extends LitElement { + static override styles = [ + css` + :host-context(.vscode-high-contrast), + :host-context(.vscode-dark) { + --gl-git-status-ignored: #969696; + --gl-git-status-untracked: #6c6c6c; + --gl-git-status-added: #388a34; + --gl-git-status-deleted: #9e121d; + --gl-git-status-modified: #1b80b2; + --gl-git-status-renamed: #c63; + --gl-git-status-copied: #692c77; + --gl-git-status-conflict: #7f4e7e; + --gl-git-status-unknown: #6c6c6c; + } + + :host-context(.vscode-high-contrast-light), + :host-context(.vscode-light) { + --gl-git-status-ignored: #969696; + --gl-git-status-untracked: #6c6c6c; + --gl-git-status-added: #388a34; + --gl-git-status-deleted: #9e121d; + --gl-git-status-modified: #1b80b2; + --gl-git-status-renamed: #c63; + --gl-git-status-copied: #692c77; + --gl-git-status-conflict: #7f4e7e; + --gl-git-status-unknown: #6c6c6c; + } + + :host { + display: inline-block; + width: 16px; + aspect-ratio: 1 / 1; + } + + svg { + display: inline-block; + vertical-align: text-bottom; + } + `, + ]; + + @property() + status?: GitFileStatus | 'T'; + + @state() + get statusName() { + if (!this.status) return ''; + return statusTextMap[this.status]; + } + + override updated(changedProperties: PropertyValueMap | Map): void { + super.updated(changedProperties); + if (changedProperties.has('status')) { + if (this.statusName) { + this.setAttribute('title', this.statusName); + } else { + this.removeAttribute('title'); + } + } + } + + renderIgnored() { + return html` + + + + `; + } + + renderUntracked() { + return html` + + + + `; + } + + renderAdded() { + return html` + + + + `; + } + + renderDeleted() { + return html` + + + + `; + } + + renderModified() { + return html` + + + + `; + } + + renderRenamed() { + return html` + + + + `; + } + + renderCopied() { + return html` + + + + `; + } + + renderConflict() { + return html` + + + + `; + } + + renderUnknown() { + return html` + + + + `; + } + + override render() { + switch (this.status) { + case '!': + return this.renderIgnored(); + case '?': + return this.renderUntracked(); + case 'A': + return this.renderAdded(); + case 'D': + return this.renderDeleted(); + case 'M': + case 'T': + case 'U': + return this.renderModified(); + case 'R': + return this.renderRenamed(); + case 'C': + return this.renderCopied(); + case 'AA': + case 'AU': + case 'UA': + case 'DD': + case 'DU': + case 'UD': + case 'UU': + return this.renderConflict(); + } + + return this.renderUnknown(); + } +} diff --git a/src/webviews/commitDetails/commitDetailsWebview.ts b/src/webviews/commitDetails/commitDetailsWebview.ts index e108f3ecae58e..1ba4136b2697e 100644 --- a/src/webviews/commitDetails/commitDetailsWebview.ts +++ b/src/webviews/commitDetails/commitDetailsWebview.ts @@ -18,8 +18,8 @@ import { import { CommitFormatter } from '../../git/formatters/commitFormatter'; import type { GitCommit } from '../../git/models/commit'; import { isCommit } from '../../git/models/commit'; -import type { GitFileChange } from '../../git/models/file'; -import { getGitFileStatusIcon } from '../../git/models/file'; +import { uncommitted } from '../../git/models/constants'; +import type { GitFileChange, GitFileChangeShape } from '../../git/models/file'; import type { IssueOrPullRequest } from '../../git/models/issue'; import { serializeIssueOrPullRequest } from '../../git/models/issue'; import type { PullRequest } from '../../git/models/pullRequest'; @@ -27,12 +27,13 @@ import { serializePullRequest } from '../../git/models/pullRequest'; import type { GitRevisionReference } from '../../git/models/reference'; import { createReference, getReferenceFromRevision, shortenRevision } from '../../git/models/reference'; import type { GitRemote } from '../../git/models/remote'; +import type { Repository } from '../../git/models/repository'; +import { RepositoryChange, RepositoryChangeComparisonMode } from '../../git/models/repository'; import type { ShowInCommitGraphCommandArgs } from '../../plus/webviews/graph/protocol'; import { pauseOnCancelOrTimeoutMapTuplePromise } from '../../system/cancellation'; import { executeCommand, executeCoreCommand, registerCommand } from '../../system/command'; import { configuration } from '../../system/configuration'; import { getContext } from '../../system/context'; -import type { DateTimeFormat } from '../../system/date'; import { debug } from '../../system/decorators/log'; import type { Deferrable } from '../../system/function'; import { debounce } from '../../system/function'; @@ -49,13 +50,25 @@ import { onIpc } from '../protocol'; import type { WebviewController, WebviewProvider } from '../webviewController'; import { updatePendingContext } from '../webviewController'; import { isSerializedState } from '../webviewsController'; -import type { CommitDetails, DidExplainCommitParams, FileActionParams, Preferences, State } from './protocol'; +import type { + CommitDetails, + DidExplainParams, + FileActionParams, + Mode, + Preferences, + State, + SwitchModeParams, + UpdateablePreferences, + Wip, + WipChange, +} from './protocol'; import { AutolinkSettingsCommandType, CommitActionsCommandType, DidChangeNotificationType, - DidExplainCommitCommandType, - ExplainCommitCommandType, + DidChangeWipStateNotificationType, + DidExplainCommandType, + ExplainCommandType, FileActionsCommandType, messageHeadlineSplitterToken, NavigateCommitCommandType, @@ -65,30 +78,32 @@ import { OpenFileOnRemoteCommandType, PickCommitCommandType, PinCommitCommandType, - PreferencesCommandType, SearchCommitCommandType, + StageFileCommandType, + SwitchModeCommandType, + UnstageFileCommandType, + UpdatePreferencesCommandType, } from './protocol'; -interface Context { - pinned: boolean; - commit: GitCommit | undefined; - preferences: Preferences | undefined; - richStateLoaded: boolean; - formattedMessage: string | undefined; - autolinkedIssues: IssueOrPullRequest[] | undefined; - pullRequest: PullRequest | undefined; +type RepositorySubscription = { repo: Repository; subscription: Disposable }; - // commits: GitCommit[] | undefined; - dateFormat: DateTimeFormat | string; - // indent: number; - indentGuides: 'none' | 'onHover' | 'always'; +interface Context { + mode: Mode; navigationStack: { count: number; position: number; hint?: string; }; - + pinned: boolean; + preferences: Preferences; visible: boolean; + + commit: GitCommit | undefined; + richStateLoaded: boolean; + formattedMessage: string | undefined; + autolinkedIssues: IssueOrPullRequest[] | undefined; + pullRequest: PullRequest | undefined; + wip: Wip | undefined; } export class CommitDetailsWebviewProvider implements WebviewProvider> { @@ -105,30 +120,34 @@ export class CommitDetailsWebviewProvider implements WebviewProvider>, - private readonly options: { mode: 'default' | 'graph' }, + private readonly options: { attachedTo: 'default' | 'graph' }, ) { this._context = { + mode: 'commit', + navigationStack: { + count: 0, + position: 0, + }, pinned: false, - commit: undefined, preferences: { - autolinksExpanded: this.container.storage.getWorkspace('views:commitDetails:autolinksExpanded'), + autolinksExpanded: this.container.storage.getWorkspace('views:commitDetails:autolinksExpanded') ?? true, avatars: configuration.get('views.commitDetails.avatars'), + dateFormat: configuration.get('defaultDateFormat') ?? 'MMMM Do, YYYY h:mma', files: configuration.get('views.commitDetails.files'), + // indent: configuration.getAny('workbench.tree.indent') ?? 8, + indentGuides: + configuration.getAny( + 'workbench.tree.renderIndentGuides', + ) ?? 'onHover', }, + visible: false, + + commit: undefined, richStateLoaded: false, formattedMessage: undefined, autolinkedIssues: undefined, pullRequest: undefined, - dateFormat: configuration.get('defaultDateFormat') ?? 'MMMM Do, YYYY h:mma', - // indent: configuration.getAny('workbench.tree.indent') ?? 8, - indentGuides: - configuration.getAny('workbench.tree.renderIndentGuides') ?? - 'onHover', - navigationStack: { - count: 0, - position: 0, - }, - visible: false, + wip: undefined, }; this._disposable = configuration.onDidChangeAny(this.onAnyConfigurationChanged, this); @@ -136,6 +155,10 @@ export class CommitDetailsWebviewProvider implements WebviewProvider>(arg)) { - const { selected } = arg.state; + const { commit: selected } = arg.state; if (selected?.repoPath != null && selected?.sha != null) { if (selected.stashNumber != null) { data = { @@ -184,11 +207,16 @@ export class CommitDetailsWebviewProvider implements WebviewProvider(e, 'workbench.tree.renderIndentGuides') + ) { + this.updatePendingContext({ + preferences: { + ...this._context.preferences, + ...this._pendingContext?.preferences, + avatars: configuration.get('views.commitDetails.avatars'), + dateFormat: configuration.get('defaultDateFormat') ?? 'MMMM Do, YYYY h:mma', + files: configuration.get('views.commitDetails.files'), + indentGuides: + configuration.getAny( + 'workbench.tree.renderIndentGuides', + ) ?? 'onHover', + }, + }); this.updateState(); } - // if (configuration.changedAny(e, 'workbench.tree.indent')) { - // this.updatePendingContext({ indent: configuration.getAny('workbench.tree.indent') ?? 8 }); - // this.updateState(); - // } - - if (configuration.changedAny(e, 'workbench.tree.renderIndentGuides')) { - this.updatePendingContext({ - indentGuides: - configuration.getAny( - 'workbench.tree.renderIndentGuides', - ) ?? 'onHover', - }); + if ( + this._context.commit != null && + configuration.changed(e, ['views.commitDetails.autolinks', 'views.commitDetails.pullRequests']) + ) { + void this.updateCommit(this._context.commit, { force: true }); this.updateState(); } } @@ -315,7 +339,7 @@ export class CommitDetailsWebviewProvider implements WebviewProvider { switch (params.action) { - case 'graph': - if (this._context.commit == null) return; + case 'graph': { + let ref: GitRevisionReference | undefined; + if (this._context.mode === 'wip') { + ref = + this._context.wip?.changes != null + ? createReference(uncommitted, this._context.wip.changes.repository.path, { + refType: 'revision', + }) + : undefined; + } else { + ref = + this._context.commit != null + ? getReferenceFromRevision(this._context.commit) + : undefined; + } + if (ref == null) return; void executeCommand( - this.options.mode === 'graph' + this.options.attachedTo === 'graph' ? Commands.ShowInCommitGraphView : Commands.ShowInCommitGraph, - { - ref: getReferenceFromRevision(this._context.commit), - }, + { ref: ref }, ); break; + } case 'more': this.showCommitActions(); break; @@ -403,6 +447,9 @@ export class CommitDetailsWebviewProvider implements WebviewProvider this.showCommitSearch()); break; + case SwitchModeCommandType.method: + onIpc(SwitchModeCommandType, e, params => this.switchMode(params)); + break; case AutolinkSettingsCommandType.method: onIpc(AutolinkSettingsCommandType, e, _params => this.showAutolinkSettings()); break; @@ -412,16 +459,56 @@ export class CommitDetailsWebviewProvider implements WebviewProvider this.navigateStack(params.direction)); break; - case PreferencesCommandType.method: - onIpc(PreferencesCommandType, e, params => this.updatePreferences(params)); + case UpdatePreferencesCommandType.method: + onIpc(UpdatePreferencesCommandType, e, params => this.updatePreferences(params)); + break; + case ExplainCommandType.method: + onIpc(ExplainCommandType, e, () => this.explainCommit(e.completionId)); break; - case ExplainCommitCommandType.method: - onIpc(ExplainCommitCommandType, e, () => this.explainCommit(e.completionId)); + case StageFileCommandType.method: + onIpc(StageFileCommandType, e, params => this.stageFile(params)); + break; + case UnstageFileCommandType.method: + onIpc(UnstageFileCommandType, e, params => this.unstageFile(params)); + break; + } + } + + private onActiveEditorLinesChanged(e: LinesChangeEvent) { + if (e.pending || e.editor == null || e.suspended) return; + + if (this.mode === 'wip') { + const repo = this.container.git.getBestRepositoryOrFirst(e.editor); + void this.updateWipState(repo); + + return; + } + + const line = e.selections?.[0]?.active; + const commit = line != null ? this.container.lineTracker.getState(line)?.commit : undefined; + void this.updateCommit(commit); + } + + private _wipSubscription: RepositorySubscription | undefined; + + private get mode(): Mode { + return this._pendingContext?.mode ?? this._context.mode; + } + + private setMode(mode: Mode, repository?: Repository) { + this.updatePendingContext({ mode: mode }); + if (mode === 'commit') { + this._wipSubscription?.subscription.dispose(); + this._wipSubscription = undefined; + + this.updateState(true); + } else { + void this.updateWipState(repository ?? this.container.git.getBestRepositoryOrFirst()); } } private async explainCommit(completionId?: string) { - let params: DidExplainCommitParams; + let params: DidExplainParams; try { const summary = await this.container.ai.explainCommit(this._context.commit!, { progress: { location: { viewId: this.host.id } }, @@ -431,7 +518,7 @@ export class CommitDetailsWebviewProvider implements WebviewProvider summaryModel(commit))); - const state = serialize({ + mode: current.mode, webviewId: this.host.id, timestamp: Date.now(), + commit: details, + navigationStack: current.navigationStack, pinned: current.pinned, - includeRichContent: current.richStateLoaded, - // commits: commitChoices, preferences: current.preferences, - selected: details, + includeRichContent: current.richStateLoaded, autolinkedIssues: current.autolinkedIssues?.map(serializeIssueOrPullRequest), pullRequest: current.pullRequest != null ? serializePullRequest(current.pullRequest) : undefined, - dateFormat: current.dateFormat, - // indent: current.indent, - indentGuides: current.indentGuides, - navigationStack: current.navigationStack, + wip: current.wip, }); return state; } + @debug({ args: false }) + private async updateWipState(repository: Repository | undefined): Promise { + if (this._wipSubscription != null) { + const { repo, subscription } = this._wipSubscription; + if (repository?.path !== repo.path) { + subscription.dispose(); + this._wipSubscription = undefined; + } + } + + let wip: Wip | undefined = undefined; + + if (repository != null) { + if (this._wipSubscription == null) { + this._wipSubscription = { repo: repository, subscription: this.subscribeToRepositoryWip(repository) }; + } + + const changes = await this.getWipChange(repository); + wip = { changes: changes, repositoryCount: this.container.git.openRepositoryCount }; + + if (this._pendingContext == null) { + const success = await this.host.notify(DidChangeWipStateNotificationType, { wip: wip }); + if (success) { + this._context.wip = wip; + return; + } + } + } + + this.updatePendingContext({ wip: wip }); + this.updateState(true); + } + @debug({ args: false }) private async updateRichState(current: Context, cancellation: CancellationToken): Promise { const { commit } = current; @@ -545,7 +652,7 @@ export class CommitDetailsWebviewProvider implements WebviewProvider { - // this.updatePendingContext({ commit: undefined }); - this.updatePendingContext({ commit: commit }, true); - this.updateState(); - }), - ); + let wip = this._pendingContext?.wip ?? this._context.wip; + + if (this._repositorySubscription != null) { + const { repo, subscription } = this._repositorySubscription; + if (commit?.repoPath !== repo.path) { + subscription.dispose(); + this._repositorySubscription = undefined; + wip = undefined; + } + } + + if (this._repositorySubscription == null && commit != null) { + const repo = await this.container.git.getOrOpenRepository(commit.repoPath); + if (repo != null) { + this._repositorySubscription = { repo: repo, subscription: this.subscribeToRepositoryWip(repo) }; + + if (this.mode === 'wip') { + void this.updateWipState(repo); + } else { + wip = undefined; + } } } @@ -589,6 +704,7 @@ export class CommitDetailsWebviewProvider implements WebviewProvider this.onWipChanged(repo)), + repo.onDidChange(e => { + if (e.changed(RepositoryChange.Index, RepositoryChangeComparisonMode.Any)) { + this.onWipChanged(repo); + } + }), + ); + } + + private onWipChanged(repository: Repository) { + void this.updateWipState(repository); + } + + private async getWipChange(repository: Repository): Promise { + const status = await this.container.git.getStatusForRepo(repository.path); + if (status == null) return undefined; + + const files: GitFileChangeShape[] = []; + for (const file of status.files) { + const change = { + repoPath: file.repoPath, + path: file.path, + status: file.status, + originalPath: file.originalPath, + staged: file.staged, + }; + + files.push(change); + if (file.staged && file.wip) { + files.push({ + ...change, + staged: false, + }); + } + } + + return { + repository: { + name: repository.name, + path: repository.path, + uri: repository.uri.toString(), + }, + branchName: status.branch, + files: files, + }; + } + private updatePinned(pinned: boolean, immediate?: boolean) { if (pinned === this._context.pinned) return; @@ -621,11 +787,9 @@ export class CommitDetailsWebviewProvider implements WebviewProvider { - const icon = getGitFileStatusIcon(status); - return { - path: path, - originalPath: originalPath, - status: status, - repoPath: repoPath, - icon: { - dark: this.host - .asWebviewUri(Uri.joinPath(this.host.getRootUri(), 'images', 'dark', icon)) - .toString(), - light: this.host - .asWebviewUri(Uri.joinPath(this.host.getRootUri(), 'images', 'light', icon)) - .toString(), - }, - staged: staged, - }; - }), + files: commit.files, stats: commit.stats, autolinks: autolinks != null ? [...map(autolinks.values(), serializeAutolink)] : undefined, }; @@ -848,7 +981,17 @@ export class CommitDetailsWebviewProvider implements WebviewProvider { - const commit = await this._context.commit?.getCommitForFile(params.path, params.staged); + let commit: GitCommit | undefined; + if (this.mode === 'wip') { + const uri = this._context.wip?.changes?.repository.uri; + if (uri == null) return; + + commit = await this.container.git.getCommit(Uri.parse(uri), uncommitted); + } else { + commit = this._context.commit; + } + + commit = await commit?.getCommitForFile(params.path, params.staged); return commit != null ? [commit, commit.file!] : undefined; } @@ -856,10 +999,6 @@ export class CommitDetailsWebviewProvider implements WebviewProvider>; + +export interface WipChange { + branchName: string; + repository: { name: string; path: string; uri: string }; + files: GitFileChangeShape[]; +} + +export type Mode = 'commit' | 'wip'; + +export interface Wip { + changes: WipChange | undefined; + repositoryCount: number; } export interface State { webviewId: WebviewIds | WebviewViewIds; timestamp: number; + mode: Mode; pinned: boolean; - preferences?: Preferences; - // commits?: CommitSummary[]; - includeRichContent?: boolean; - - selected?: CommitDetails; - autolinkedIssues?: IssueOrPullRequest[]; - pullRequest?: PullRequestShape; - - dateFormat: string; - // indent: number; - indentGuides: 'none' | 'onHover' | 'always'; navigationStack: { count: number; position: number; hint?: string; }; + preferences: Preferences; + includeRichContent?: boolean; + + commit?: CommitDetails; + autolinkedIssues?: IssueOrPullRequest[]; + pullRequest?: PullRequestShape; + wip?: Wip; } export type ShowCommitDetailsViewCommandArgs = string[]; @@ -82,11 +98,21 @@ export const OpenFileOnRemoteCommandType = new IpcCommandType( export const OpenFileCompareWorkingCommandType = new IpcCommandType('commit/file/compareWorking'); export const OpenFileComparePreviousCommandType = new IpcCommandType('commit/file/comparePrevious'); +export const StageFileCommandType = new IpcCommandType('commit/file/stage'); +export const UnstageFileCommandType = new IpcCommandType('commit/file/unstage'); + export const PickCommitCommandType = new IpcCommandType('commit/pickCommit'); export const SearchCommitCommandType = new IpcCommandType('commit/searchCommit'); + +export interface SwitchModeParams { + repoPath?: string; + mode: Mode; +} +export const SwitchModeCommandType = new IpcCommandType('commit/switchMode'); + export const AutolinkSettingsCommandType = new IpcCommandType('commit/autolinkSettings'); -export const ExplainCommitCommandType = new IpcCommandType('commit/explain'); +export const ExplainCommandType = new IpcCommandType('commit/explain'); export interface PinParams { pin: boolean; @@ -98,12 +124,8 @@ export interface NavigateParams { } export const NavigateCommitCommandType = new IpcCommandType('commit/navigate'); -export interface PreferenceParams { - autolinksExpanded?: boolean; - avatars?: boolean; - files?: Config['views']['commitDetails']['files']; -} -export const PreferencesCommandType = new IpcCommandType('commit/preferences'); +export type UpdatePreferenceParams = UpdateablePreferences; +export const UpdatePreferencesCommandType = new IpcCommandType('commit/preferences/update'); // NOTIFICATIONS @@ -112,19 +134,15 @@ export interface DidChangeParams { } export const DidChangeNotificationType = new IpcNotificationType('commit/didChange', true); -export type DidChangeRichStateParams = { - formattedMessage?: string; - autolinkedIssues?: IssueOrPullRequest[]; - pullRequest?: PullRequestShape; -}; -export const DidChangeRichStateNotificationType = new IpcNotificationType( - 'commit/didChange/rich', +export type DidChangeWipStateParams = Pick, 'wip'>; +export const DidChangeWipStateNotificationType = new IpcNotificationType( + 'commit/didChange/wip', ); -export type DidExplainCommitParams = +export type DidExplainParams = | { summary: string | undefined; error?: undefined; } | { error: { message: string } }; -export const DidExplainCommitCommandType = new IpcNotificationType('commit/didExplain'); +export const DidExplainCommandType = new IpcNotificationType('commit/didExplain'); diff --git a/src/webviews/commitDetails/registration.ts b/src/webviews/commitDetails/registration.ts index b863af495dff9..39bdd000e03b9 100644 --- a/src/webviews/commitDetails/registration.ts +++ b/src/webviews/commitDetails/registration.ts @@ -19,7 +19,7 @@ export function registerCommitDetailsWebviewView(controller: WebviewsController) const { CommitDetailsWebviewProvider } = await import( /* webpackChunkName: "commitDetails" */ './commitDetailsWebview' ); - return new CommitDetailsWebviewProvider(container, host, { mode: 'default' }); + return new CommitDetailsWebviewProvider(container, host, { attachedTo: 'default' }); }, ); } @@ -41,7 +41,7 @@ export function registerGraphDetailsWebviewView(controller: WebviewsController) const { CommitDetailsWebviewProvider } = await import( /* webpackChunkName: "commitDetails" */ './commitDetailsWebview' ); - return new CommitDetailsWebviewProvider(container, host, { mode: 'graph' }); + return new CommitDetailsWebviewProvider(container, host, { attachedTo: 'graph' }); }, ); } From e03275f0b83f18df76c97f7f732e850bf95ab636 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon <67011668+axosoft-ramint@users.noreply.github.com> Date: Wed, 11 Oct 2023 16:21:20 -0700 Subject: [PATCH 0043/1012] Trial reactivation UX (#2962) * Updates account messaging to support trial reactivation * Polishes and improved messaging --- src/commands/showView.ts | 1 + src/plus/subscription/subscriptionService.ts | 31 ++++++++++++++---- src/subscription.ts | 3 ++ src/webviews/apps/plus/account/account.scss | 2 +- src/webviews/apps/plus/account/account.ts | 1 + .../account/components/account-content.ts | 32 ++++++++++++++++--- 6 files changed, 58 insertions(+), 12 deletions(-) diff --git a/src/commands/showView.ts b/src/commands/showView.ts index 4679979d95b22..53362916243d7 100644 --- a/src/commands/showView.ts +++ b/src/commands/showView.ts @@ -15,6 +15,7 @@ export class ShowViewCommand extends Command { Commands.ShowFileHistoryView, Commands.ShowGraphView, Commands.ShowHomeView, + Commands.ShowAccountView, Commands.ShowLineHistoryView, Commands.ShowRemotesView, Commands.ShowRepositoriesView, diff --git a/src/plus/subscription/subscriptionService.ts b/src/plus/subscription/subscriptionService.ts index 759bf4d53cbeb..6ba224f5de0cf 100644 --- a/src/plus/subscription/subscriptionService.ts +++ b/src/plus/subscription/subscriptionService.ts @@ -304,6 +304,7 @@ export class SubscriptionService implements Disposable { actual: getSubscriptionPlan( SubscriptionPlanId.Free, false, + 0, undefined, this._subscription.plan?.actual?.startedOn != null ? new Date(this._subscription.plan.actual.startedOn) @@ -312,6 +313,7 @@ export class SubscriptionService implements Disposable { effective: getSubscriptionPlan( SubscriptionPlanId.Free, false, + 0, undefined, this._subscription.plan?.effective?.startedOn != null ? new Date(this._subscription.plan.actual.startedOn) @@ -462,7 +464,7 @@ export class SubscriptionService implements Disposable { ...this._subscription, plan: { ...this._subscription.plan, - effective: getSubscriptionPlan(SubscriptionPlanId.Pro, false, undefined, startedOn, expiresOn), + effective: getSubscriptionPlan(SubscriptionPlanId.Pro, false, 0, undefined, startedOn, expiresOn), }, previewTrial: previewTrial, }); @@ -632,6 +634,7 @@ export class SubscriptionService implements Disposable { actual = getSubscriptionPlan( convertLicenseTypeToPlanId(licenseType), isBundleLicenseType(licenseType), + license.reactivationCount ?? 0, license.organizationId, new Date(license.latestStartDate), new Date(license.latestEndDate), @@ -643,6 +646,7 @@ export class SubscriptionService implements Disposable { actual = getSubscriptionPlan( SubscriptionPlanId.FreePlus, false, + 0, undefined, data.user.firstGitLensCheckIn != null ? new Date(data.user.firstGitLensCheckIn) @@ -668,6 +672,7 @@ export class SubscriptionService implements Disposable { effective = getSubscriptionPlan( convertLicenseTypeToPlanId(licenseType), isBundleLicenseType(licenseType), + license.reactivationCount ?? 0, license.organizationId, new Date(license.latestStartDate), new Date(license.latestEndDate), @@ -825,8 +830,8 @@ export class SubscriptionService implements Disposable { if (subscription == null) { subscription = { plan: { - actual: getSubscriptionPlan(SubscriptionPlanId.Free, false, undefined), - effective: getSubscriptionPlan(SubscriptionPlanId.Free, false, undefined), + actual: getSubscriptionPlan(SubscriptionPlanId.Free, false, 0, undefined), + effective: getSubscriptionPlan(SubscriptionPlanId.Free, false, 0, undefined), }, account: undefined, state: SubscriptionState.Free, @@ -857,6 +862,7 @@ export class SubscriptionService implements Disposable { effective: getSubscriptionPlan( SubscriptionPlanId.Pro, false, + 0, undefined, new Date(subscription.previewTrial.startedOn), new Date(subscription.previewTrial.expiresOn), @@ -999,6 +1005,7 @@ export class SubscriptionService implements Disposable { const { account, plan: { effective }, + state, } = this._subscription; if (effective.id === SubscriptionPlanId.Free) { @@ -1023,7 +1030,7 @@ export class SubscriptionService implements Disposable { } this._statusBarSubscription.name = 'GitKraken Subscription'; - this._statusBarSubscription.command = Commands.ShowHomeView; + this._statusBarSubscription.command = Commands.ShowAccountView; if (account?.verified === false) { this._statusBarSubscription.text = `$(warning) ${effective.name} (Unverified)`; @@ -1038,12 +1045,21 @@ export class SubscriptionService implements Disposable { ); } else { const remaining = getSubscriptionTimeRemaining(this._subscription, 'days'); + const isReactivatedTrial = + state === SubscriptionState.FreePlusInTrial && effective.trialReactivationCount > 0; this._statusBarSubscription.text = `${effective.name} (Trial)`; this._statusBarSubscription.tooltip = new MarkdownString( - `You have ${pluralize('day', remaining ?? 0)} left in your free **${ - effective.name - }** trial, which gives you additional access to Pro features on privately hosted repos.\n\nClick for details`, + `${ + isReactivatedTrial + ? `[See what's new](https://help.gitkraken.com/gitlens/gitlens-release-notes-current/) with + ${pluralize('day', remaining ?? 0, { + infix: ' more ', + })} + in your **${effective.name}** trial.` + : `You have ${pluralize('day', remaining ?? 0)} remaining in your **${effective.name}** trial.` + } Once your trial ends, you'll need a paid plan to continue using ✨ features.\n\nTry our + [other developer tools](https://www.gitkraken.com/suite) also included in your trial.`, true, ); } @@ -1095,6 +1111,7 @@ interface GKLicense { readonly latestStartDate: string; readonly latestEndDate: string; readonly organizationId: string | undefined; + readonly reactivationCount?: number; } type GKLicenseType = diff --git a/src/subscription.ts b/src/subscription.ts index 3cb3732804b3f..7913d174bc5a1 100644 --- a/src/subscription.ts +++ b/src/subscription.ts @@ -30,6 +30,7 @@ export interface SubscriptionPlan { readonly id: SubscriptionPlanId; readonly name: string; readonly bundle: boolean; + readonly trialReactivationCount: number; readonly cancelled: boolean; readonly startedOn: string; readonly expiresOn?: string | undefined; @@ -112,6 +113,7 @@ export function computeSubscriptionState(subscription: Optional { $content.state = subscription.state; $content.plan = subscription.plan.effective.name; $content.days = days; + $content.trialReactivationCount = subscription.plan.effective.trialReactivationCount; } } diff --git a/src/webviews/apps/plus/account/components/account-content.ts b/src/webviews/apps/plus/account/components/account-content.ts index 5ca90b1929504..0b93d0c6066f8 100644 --- a/src/webviews/apps/plus/account/components/account-content.ts +++ b/src/webviews/apps/plus/account/components/account-content.ts @@ -85,6 +85,9 @@ export class AccountContent extends LitElement { @property() plan = ''; + @property({ type: Number }) + trialReactivationCount = 0; + get daysRemaining() { if (this.days < 1) { return '<1 day'; @@ -122,6 +125,10 @@ export class AccountContent extends LitElement { return hasAccountFromSubscriptionState(this.state); } + get isReactivatedTrial() { + return this.state === SubscriptionState.FreePlusInTrial && this.trialReactivationCount > 0; + } + private renderAccountInfo() { if (!this.hasAccount) { return nothing; @@ -192,15 +199,28 @@ export class AccountContent extends LitElement { case SubscriptionState.FreePlusInTrial: return html`

- Your have ${this.daysRemaining} remaining in your GitKraken trial. Once your trial ends, you'll - need a paid plan to continue using ✨ features. + ${this.isReactivatedTrial + ? html`See what's new + with + ${pluralize('day', this.days, { + infix: ' more ', + })} + in your GitKraken trial.` + : `You have + ${this.daysRemaining} remaining in your GitKraken trial.`} + Once your trial ends, you'll need a paid plan to continue using ✨ features.

Upgrade to Pro

- You have access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan - during your trial. + You have access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan. +

+

+ Try our + other developer tools also included in your trial.

`; @@ -212,6 +232,10 @@ export class AccountContent extends LitElement { >

You have access to ✨ features on privately hosted repos and ☁️ features based on your plan.

+

+ Try our + other developer tools also included in your plan. +

`; } From de7c53b91e38afbb0ed1da240d139652bb95cdcf Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Thu, 12 Oct 2023 11:38:53 -0700 Subject: [PATCH 0044/1012] Updates graph dependency --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ebb216213737d..99a0ac048e9ce 100644 --- a/package.json +++ b/package.json @@ -14850,7 +14850,7 @@ "vscode:prepublish": "yarn run bundle" }, "dependencies": { - "@gitkraken/gitkraken-components": "10.1.29", + "@gitkraken/gitkraken-components": "10.1.30", "@gitkraken/shared-web-components": "0.1.1-rc.11", "@microsoft/fast-element": "1.12.0", "@microsoft/fast-react-wrapper": "0.3.19", diff --git a/yarn.lock b/yarn.lock index d4cfff6a1409c..832f6bffd3848 100644 --- a/yarn.lock +++ b/yarn.lock @@ -223,10 +223,10 @@ resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.1.6.tgz#22958c042e10b67463997bd6ea7115fe28cbcaf9" integrity sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A== -"@gitkraken/gitkraken-components@10.1.29": - version "10.1.29" - resolved "https://registry.yarnpkg.com/@gitkraken/gitkraken-components/-/gitkraken-components-10.1.29.tgz#4d539e1bc9c343e8167bb4165f91246953725837" - integrity sha512-cqu9Mg8X6AERpdNIe+ux9CFLglkMejgRq3E6pIDG5lyMsEmLiISYr4trrTFc0DTyGfRwmbagCbqNodXeTOU6Fw== +"@gitkraken/gitkraken-components@10.1.30": + version "10.1.30" + resolved "https://registry.yarnpkg.com/@gitkraken/gitkraken-components/-/gitkraken-components-10.1.30.tgz#75c504736a47527e410d93be36cc38a0952568d4" + integrity sha512-A7EBIFQUCqptvQxmpt5YMfwnhl4rORAeay82Vtue8jM82jedT3xr7gKltQ1Q87QmKWvPpcgCS6pHwVVfOZrJZg== dependencies: "@axosoft/react-virtualized" "9.22.3-gitkraken.3" classnames "2.3.2" From ecbcbc45465e8182778bd69eda1f8ff8a0d11899 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Thu, 12 Oct 2023 14:18:03 -0700 Subject: [PATCH 0045/1012] Updates CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 282871f57824d..3660b59dcc16b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Fixes [#2940](https://github.com/gitkraken/vscode-gitlens/issues/2940) - Can't use Azure OpenAI model because i can't save the openai key because of the verification - Fixes [#2928](https://github.com/gitkraken/vscode-gitlens/issues/2928) - Apply Changes should create new files when needed - Fixes [#2896](https://github.com/gitkraken/vscode-gitlens/issues/2896) - Repositories view stuck in loading state +- Fixes [#2460](https://github.com/gitkraken/vscode-gitlens/issues/2460) - Gitlens Remote provider doesn't work properly in "Commit graph" view - Fixes issue with "View as [List|Tree]" toggle not working in the _Commit Details_ view - Fixes an issue with deep links sometimes failing to properly resolve when a matching repository without the remote is found - Fixes an issue in the _Commit Graph_ where commits not in the history of a merge commit were showing in the same column From c985a2e70c46a09a4c9ba7675121dbcbd309567b Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Thu, 12 Oct 2023 17:57:16 -0400 Subject: [PATCH 0046/1012] Closes #2828 allows following across all branches --- CHANGELOG.md | 1 + package.json | 15 ++++----------- src/env/node/git/git.ts | 4 ++-- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3660b59dcc16b..47a6d52291ff3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Improves performance of inline blame, status bar blame, and hovers especially when working with remotes with connected integrations - Changes the _File History_ view to follow renames and filters out merge commits by default — closes [#2104](https://github.com/gitkraken/vscode-gitlens/issues/2104) & [#2944](https://github.com/gitkraken/vscode-gitlens/issues/2944) +- Changes the _File History_ view to allow following renames while showing history across all branches (which was a previous limitation of Git) — closes [#2828](https://github.com/gitkraken/vscode-gitlens/issues/2828) - Changes to use our own implementation of `fetch`, `push`, and `pull` Git operations, rather than delegating to VS Code to avoid limitations especially with GitKraken Workspaces. Please report any issues and you can revert this (for now) by setting `"gitlens.experimental.nativeGit"` to `"false"` in your settings - Relaxes PR autolink detection for Azure DevOps to use `PR ` instead of `Merged PR ` — closes [#2908](https://github.com/gitkraken/vscode-gitlens/issues/2908) - Changes wording on `Reset Stored OpenAI Key` command to `Reset Stored AI Key` to reflect support for other providers diff --git a/package.json b/package.json index 99a0ac048e9ce..6f3887e50d974 100644 --- a/package.json +++ b/package.json @@ -6557,14 +6557,12 @@ { "command": "gitlens.views.fileHistory.setRenameFollowingOn", "title": "Follow Renames", - "category": "GitLens", - "enablement": "!config.gitlens.advanced.fileHistoryShowAllBranches" + "category": "GitLens" }, { "command": "gitlens.views.fileHistory.setRenameFollowingOff", "title": "Don't Follow Renames", - "category": "GitLens", - "enablement": "!config.gitlens.advanced.fileHistoryShowAllBranches" + "category": "GitLens" }, { "command": "gitlens.views.fileHistory.setShowAllBranchesOn", @@ -10860,17 +10858,12 @@ }, { "command": "gitlens.views.fileHistory.setRenameFollowingOn", - "when": "view =~ /^gitlens\\.views\\.fileHistory/ && !gitlens:views:fileHistory:cursorFollowing && config.gitlens.advanced.fileHistoryShowAllBranches", - "group": "3_gitlens@1" - }, - { - "command": "gitlens.views.fileHistory.setRenameFollowingOn", - "when": "view =~ /^gitlens\\.views\\.fileHistory/ && !gitlens:views:fileHistory:cursorFollowing && !config.gitlens.advanced.fileHistoryShowAllBranches && !config.gitlens.advanced.fileHistoryFollowsRenames", + "when": "view =~ /^gitlens\\.views\\.fileHistory/ && !gitlens:views:fileHistory:cursorFollowing && !config.gitlens.advanced.fileHistoryFollowsRenames", "group": "3_gitlens@1" }, { "command": "gitlens.views.fileHistory.setRenameFollowingOff", - "when": "view =~ /^gitlens\\.views\\.fileHistory/ && !gitlens:views:fileHistory:cursorFollowing && !config.gitlens.advanced.fileHistoryShowAllBranches && config.gitlens.advanced.fileHistoryFollowsRenames", + "when": "view =~ /^gitlens\\.views\\.fileHistory/ && !gitlens:views:fileHistory:cursorFollowing && config.gitlens.advanced.fileHistoryFollowsRenames", "group": "3_gitlens@1" }, { diff --git a/src/env/node/git/git.ts b/src/env/node/git/git.ts index f772c2d13549a..e6caf421e4a08 100644 --- a/src/env/node/git/git.ts +++ b/src/env/node/git/git.ts @@ -1275,8 +1275,8 @@ export class Git { params.push('--first-parent'); } - // Can't allow rename detection (`--follow`) if `all` or a `startLine` is specified - if (renames && (all || startLine != null)) { + // Can't allow rename detection (`--follow`) if a `startLine` is specified + if (renames && startLine != null) { renames = false; } From 3ce034a2173c4fc73e16381b511172605b4b1684 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 13 Oct 2023 12:29:44 -0400 Subject: [PATCH 0047/1012] Improves performance of pin/snooze on Focus view --- src/plus/webviews/focus/focusWebview.ts | 192 +++++++++++++----------- 1 file changed, 105 insertions(+), 87 deletions(-) diff --git a/src/plus/webviews/focus/focusWebview.ts b/src/plus/webviews/focus/focusWebview.ts index 71c84b1875391..e4268e58e6d80 100644 --- a/src/plus/webviews/focus/focusWebview.ts +++ b/src/plus/webviews/focus/focusWebview.ts @@ -2,6 +2,7 @@ import { Disposable, Uri, window } from 'vscode'; import type { GHPRPullRequest } from '../../../commands/ghpr/openOrCreateWorktree'; import { Commands } from '../../../constants'; import type { Container } from '../../../container'; +import type { FeatureAccess, RepoFeatureAccess } from '../../../features'; import { PlusFeatures } from '../../../features'; import { add as addRemote } from '../../../git/actions/remote'; import * as RepoActions from '../../../git/actions/repository'; @@ -394,13 +395,22 @@ export class FocusWebviewProvider implements WebviewProvider { if (e.etag === this._etagSubscription) return; this._etagSubscription = e.etag; - void this.notifyDidChangeState(true); + this._access = undefined; + void this.notifyDidChangeState(); + } + + private _access: FeatureAccess | RepoFeatureAccess | undefined; + private async getAccess(force?: boolean) { + if (force || this._access == null) { + this._access = await this.container.git.access(PlusFeatures.Focus); + } + return this._access; } - private async getState(deferState?: boolean): Promise { + private async getState(force?: boolean, deferState?: boolean): Promise { const webviewId = this.host.id; - const access = await this.container.git.access(PlusFeatures.Focus); + const access = await this.getAccess(force); if (access.allowed !== true) { return { webviewId: webviewId, @@ -409,7 +419,7 @@ export class FocusWebviewProvider implements WebviewProvider { }; } - const allRichRepos = await this.getRichRepos(); + const allRichRepos = await this.getRichRepos(force); const githubRepos = filterGithubRepos(allRichRepos); const connectedRepos = filterUsableRepos(githubRepos); const hasConnectedRepos = connectedRepos.length > 0; @@ -426,9 +436,9 @@ export class FocusWebviewProvider implements WebviewProvider { const repos = connectedRepos.map(r => serializeRepoWithRichRemote(r)); const statePromise = Promise.allSettled([ - this.getMyPullRequests(connectedRepos), - this.getMyIssues(connectedRepos), - this.getEnrichedItems(), + this.getMyPullRequests(connectedRepos, force), + this.getMyIssues(connectedRepos, force), + this.getEnrichedItems(force), ]); async function getStateCore() { @@ -476,11 +486,11 @@ export class FocusWebviewProvider implements WebviewProvider { } async includeBootstrap(): Promise { - return this.getState(true); + return this.getState(true, true); } private async getRichRepos(force?: boolean): Promise { - if (this._repos == null || force === true) { + if (force || this._repos == null) { const repos = []; const disposables = []; for (const repo of this.container.git.openRepositories) { @@ -509,115 +519,123 @@ export class FocusWebviewProvider implements WebviewProvider { return this._repos; } - private async onRepositoryChanged(e: RepositoryChangeEvent) { + private onRepositoryChanged(e: RepositoryChangeEvent) { if (e.changed(RepositoryChange.RemoteProviders, RepositoryChangeComparisonMode.Any)) { - await this.getRichRepos(true); - void this.notifyDidChangeState(); + void this.notifyDidChangeState(true); } } - private async getMyPullRequests(richRepos: RepoWithRichRemote[]): Promise { - const allPrs: SearchedPullRequestWithRemote[] = []; - for (const richRepo of richRepos) { - const remote = richRepo.remote; - const prs = await this.container.git.getMyPullRequests(remote); - if (prs == null) { - continue; - } - - for (const pr of prs) { - if (pr.reasons.length === 0) { + private async getMyPullRequests( + richRepos: RepoWithRichRemote[], + force?: boolean, + ): Promise { + if (force || this._pullRequests == null) { + const allPrs: SearchedPullRequestWithRemote[] = []; + for (const richRepo of richRepos) { + const remote = richRepo.remote; + const prs = await this.container.git.getMyPullRequests(remote); + if (prs == null) { continue; } - const entry: SearchedPullRequestWithRemote = { - ...pr, - repoAndRemote: richRepo, - isCurrentWorktree: false, - isCurrentBranch: false, - rank: getPrRank(pr), - }; - - const remoteBranchName = `${entry.pullRequest.refs!.head.owner}/${entry.pullRequest.refs!.head.branch}`; // TODO@eamodio really need to check for upstream url rather than name - - const worktree = await getWorktreeForBranch( - entry.repoAndRemote.repo, - entry.pullRequest.refs!.head.branch, - remoteBranchName, - ); - entry.hasWorktree = worktree != null; - entry.isCurrentWorktree = worktree?.opened === true; - - const branch = await getLocalBranchByUpstream(richRepo.repo, remoteBranchName); - if (branch) { - entry.branch = branch; - entry.hasLocalBranch = true; - entry.isCurrentBranch = branch.current; - } - allPrs.push(entry); + for (const pr of prs) { + if (pr.reasons.length === 0) { + continue; + } + const entry: SearchedPullRequestWithRemote = { + ...pr, + repoAndRemote: richRepo, + isCurrentWorktree: false, + isCurrentBranch: false, + rank: getPrRank(pr), + }; + + const remoteBranchName = `${entry.pullRequest.refs!.head.owner}/${ + entry.pullRequest.refs!.head.branch + }`; // TODO@eamodio really need to check for upstream url rather than name + + const worktree = await getWorktreeForBranch( + entry.repoAndRemote.repo, + entry.pullRequest.refs!.head.branch, + remoteBranchName, + ); + entry.hasWorktree = worktree != null; + entry.isCurrentWorktree = worktree?.opened === true; + + const branch = await getLocalBranchByUpstream(richRepo.repo, remoteBranchName); + if (branch) { + entry.branch = branch; + entry.hasLocalBranch = true; + entry.isCurrentBranch = branch.current; + } + + allPrs.push(entry); + } } - } - this._pullRequests = allPrs.sort((a, b) => { - const scoreA = a.rank; - const scoreB = b.rank; + this._pullRequests = allPrs.sort((a, b) => { + const scoreA = a.rank; + const scoreB = b.rank; - if (scoreA === scoreB) { - return a.pullRequest.date.getTime() - b.pullRequest.date.getTime(); - } - return (scoreB ?? 0) - (scoreA ?? 0); - }); + if (scoreA === scoreB) { + return a.pullRequest.date.getTime() - b.pullRequest.date.getTime(); + } + return (scoreB ?? 0) - (scoreA ?? 0); + }); + } return this._pullRequests; } - private async getMyIssues(richRepos: RepoWithRichRemote[]): Promise { - const allIssues = []; - for (const richRepo of richRepos) { - const remote = richRepo.remote; - const issues = await this.container.git.getMyIssues(remote); - if (issues == null) { - continue; - } - - for (const issue of issues) { - if (issue.reasons.length === 0) { + private async getMyIssues(richRepos: RepoWithRichRemote[], force?: boolean): Promise { + if (force || this._pullRequests == null) { + const allIssues = []; + for (const richRepo of richRepos) { + const remote = richRepo.remote; + const issues = await this.container.git.getMyIssues(remote); + if (issues == null) { continue; } - allIssues.push({ - ...issue, - repoAndRemote: richRepo, - rank: 0, // getIssueRank(issue), - }); + + for (const issue of issues) { + if (issue.reasons.length === 0) { + continue; + } + allIssues.push({ + ...issue, + repoAndRemote: richRepo, + rank: 0, // getIssueRank(issue), + }); + } } - } - // this._issues = allIssues.sort((a, b) => { - // const scoreA = a.rank; - // const scoreB = b.rank; + // this._issues = allIssues.sort((a, b) => { + // const scoreA = a.rank; + // const scoreB = b.rank; - // if (scoreA === scoreB) { - // return b.issue.updatedDate.getTime() - a.issue.updatedDate.getTime(); - // } - // return (scoreB ?? 0) - (scoreA ?? 0); - // }); + // if (scoreA === scoreB) { + // return b.issue.updatedDate.getTime() - a.issue.updatedDate.getTime(); + // } + // return (scoreB ?? 0) - (scoreA ?? 0); + // }); - this._issues = allIssues.sort((a, b) => b.issue.updatedDate.getTime() - a.issue.updatedDate.getTime()); + this._issues = allIssues.sort((a, b) => b.issue.updatedDate.getTime() - a.issue.updatedDate.getTime()); + } return this._issues; } - private async getEnrichedItems(): Promise { + private async getEnrichedItems(force?: boolean): Promise { // TODO needs cache invalidation - if (this._enrichedItems == null) { + if (force || this._enrichedItems == null) { const enrichedItems = await this.container.focus.get(); this._enrichedItems = enrichedItems; } return this._enrichedItems; } - private async notifyDidChangeState(deferState?: boolean) { - void this.host.notify(DidChangeNotificationType, { state: await this.getState(deferState) }); + private async notifyDidChangeState(force?: boolean, deferState?: boolean) { + void this.host.notify(DidChangeNotificationType, { state: await this.getState(force, deferState) }); } } From 3270cadb5423e22d8f335b9355dd9b9a08a3e8be Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 13 Oct 2023 12:42:34 -0400 Subject: [PATCH 0048/1012] Fixes log sanitizing --- src/plus/github/github.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plus/github/github.ts b/src/plus/github/github.ts index 12e1dcf20fbdf..e2aaae4f93601 100644 --- a/src/plus/github/github.ts +++ b/src/plus/github/github.ts @@ -2270,7 +2270,7 @@ export class GitHubApi implements Disposable { private _enterpriseVersions = new Map(); - @debug({ args: { 0: '' } }) + @debug({ args: { 0: p => p?.name, 1: '' } }) private async getEnterpriseVersion( provider: RichRemoteProvider | undefined, token: string, @@ -2707,7 +2707,7 @@ export class GitHubApi implements Disposable { } } - @debug({ args: { 0: '' } }) + @debug({ args: { 0: p => p.name, 1: '' } }) async searchMyIssues( provider: RichRemoteProvider, token: string, From 45ab95fe54acf08507701c700f6fb0f47041a5d7 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 13 Oct 2023 12:48:15 -0400 Subject: [PATCH 0049/1012] Adds/fixes logging --- src/plus/focus/focusService.ts | 4 ++-- src/plus/webviews/focus/focusWebview.ts | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/plus/focus/focusService.ts b/src/plus/focus/focusService.ts index ccfabd227935c..63f6c49e75698 100644 --- a/src/plus/focus/focusService.ts +++ b/src/plus/focus/focusService.ts @@ -99,7 +99,7 @@ export class FocusService implements Disposable { return this.get('snooze'); } - @log() + @log({ args: { 0: i => `${i.id} (${i.remote.provider.name} ${i.type})` } }) async pinItem(item: FocusItem): Promise { const scope = getLogScope(); @@ -138,7 +138,7 @@ export class FocusService implements Disposable { return this.delete(id, 'unpin'); } - @log() + @log({ args: { 0: i => `${i.id} (${i.remote.provider.name} ${i.type})` } }) async snoozeItem(item: FocusItem): Promise { const scope = getLogScope(); diff --git a/src/plus/webviews/focus/focusWebview.ts b/src/plus/webviews/focus/focusWebview.ts index e4268e58e6d80..50e73a5ac7d7b 100644 --- a/src/plus/webviews/focus/focusWebview.ts +++ b/src/plus/webviews/focus/focusWebview.ts @@ -24,6 +24,7 @@ import { getWorktreeForBranch } from '../../../git/models/worktree'; import { parseGitRemoteUrl } from '../../../git/parsers/remoteParser'; import type { RichRemoteProvider } from '../../../git/remotes/richRemoteProvider'; import { executeCommand, registerCommand } from '../../../system/command'; +import { debug } from '../../../system/decorators/log'; import { getSettledValue } from '../../../system/promise'; import type { IpcMessage } from '../../../webviews/protocol'; import { onIpc } from '../../../webviews/protocol'; @@ -129,6 +130,7 @@ export class FocusWebviewProvider implements WebviewProvider { } } + @debug({ args: false }) private async onPinIssue({ issue, pin }: PinIssueParams) { const issueWithRemote = this._issues?.find(r => r.issue.nodeId === issue.nodeId); if (issueWithRemote == null) return; @@ -159,6 +161,7 @@ export class FocusWebviewProvider implements WebviewProvider { void this.notifyDidChangeState(); } + @debug({ args: false }) private async onSnoozeIssue({ issue, snooze }: SnoozeIssueParams) { const issueWithRemote = this._issues?.find(r => r.issue.nodeId === issue.nodeId); if (issueWithRemote == null) return; @@ -189,6 +192,7 @@ export class FocusWebviewProvider implements WebviewProvider { void this.notifyDidChangeState(); } + @debug({ args: false }) private async onPinPr({ pullRequest, pin }: PinPrParams) { const prWithRemote = this._pullRequests?.find(r => r.pullRequest.nodeId === pullRequest.nodeId); if (prWithRemote == null) return; @@ -219,6 +223,7 @@ export class FocusWebviewProvider implements WebviewProvider { void this.notifyDidChangeState(); } + @debug({ args: false }) private async onSnoozePr({ pullRequest, snooze }: SnoozePrParams) { const prWithRemote = this._pullRequests?.find(r => r.pullRequest.nodeId === pullRequest.nodeId); if (prWithRemote == null) return; @@ -323,6 +328,7 @@ export class FocusWebviewProvider implements WebviewProvider { }; } + @debug({ args: false }) private async onOpenBranch({ pullRequest }: OpenBranchParams) { const prWithRemote = this.findSearchedPullRequest(pullRequest); if (prWithRemote == null) return; @@ -338,6 +344,7 @@ export class FocusWebviewProvider implements WebviewProvider { void executeCommand(Commands.ShowInCommitGraph, { ref: remoteBranch.reference }); } + @debug({ args: false }) private async onSwitchBranch({ pullRequest }: SwitchToBranchParams) { const prWithRemote = this.findSearchedPullRequest(pullRequest); if (prWithRemote == null || prWithRemote.isCurrentBranch) return; @@ -357,6 +364,7 @@ export class FocusWebviewProvider implements WebviewProvider { return RepoActions.switchTo(remoteBranch.remote.repoPath, remoteBranch.reference); } + @debug({ args: false }) private async onOpenWorktree({ pullRequest }: OpenWorktreeParams) { const searchedPullRequestWithRemote = this.findSearchedPullRequest(pullRequest); if (searchedPullRequestWithRemote?.repoAndRemote == null) { @@ -400,6 +408,7 @@ export class FocusWebviewProvider implements WebviewProvider { } private _access: FeatureAccess | RepoFeatureAccess | undefined; + @debug() private async getAccess(force?: boolean) { if (force || this._access == null) { this._access = await this.container.git.access(PlusFeatures.Focus); @@ -407,6 +416,7 @@ export class FocusWebviewProvider implements WebviewProvider { return this._access; } + @debug() private async getState(force?: boolean, deferState?: boolean): Promise { const webviewId = this.host.id; @@ -489,6 +499,7 @@ export class FocusWebviewProvider implements WebviewProvider { return this.getState(true, true); } + @debug() private async getRichRepos(force?: boolean): Promise { if (force || this._repos == null) { const repos = []; @@ -525,6 +536,7 @@ export class FocusWebviewProvider implements WebviewProvider { } } + @debug({ args: { 0: false } }) private async getMyPullRequests( richRepos: RepoWithRichRemote[], force?: boolean, @@ -587,6 +599,7 @@ export class FocusWebviewProvider implements WebviewProvider { return this._pullRequests; } + @debug({ args: { 0: false } }) private async getMyIssues(richRepos: RepoWithRichRemote[], force?: boolean): Promise { if (force || this._pullRequests == null) { const allIssues = []; @@ -625,6 +638,7 @@ export class FocusWebviewProvider implements WebviewProvider { return this._issues; } + @debug() private async getEnrichedItems(force?: boolean): Promise { // TODO needs cache invalidation if (force || this._enrichedItems == null) { From 5999a261c811d3e66f16e67b7da07b5d08a5fd00 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 13 Oct 2023 14:57:09 -0400 Subject: [PATCH 0050/1012] Optimizes git calls for focus view Adds PageableResult class helper --- src/git/models/branch.ts | 23 ++++---- src/git/models/worktree.ts | 29 ++++++---- src/plus/webviews/focus/focusWebview.ts | 72 ++++++++++++++++++------- src/system/paging.ts | 31 +++++++++++ 4 files changed, 114 insertions(+), 41 deletions(-) create mode 100644 src/system/paging.ts diff --git a/src/git/models/branch.ts b/src/git/models/branch.ts index e8e647a5d1040..a1a0f4015aeaf 100644 --- a/src/git/models/branch.ts +++ b/src/git/models/branch.ts @@ -5,6 +5,7 @@ import { formatDate, fromNow } from '../../system/date'; import { debug } from '../../system/decorators/log'; import { memoize } from '../../system/decorators/memoize'; import { getLoggableName } from '../../system/logger'; +import { PageableResult } from '../../system/paging'; import { sortCompare } from '../../system/string'; import type { PullRequest, PullRequestState } from './pullRequest'; import type { GitBranchReference, GitReference } from './reference'; @@ -291,6 +292,7 @@ export function sortBranches(branches: GitBranch[], options?: BranchSortOptions) export async function getLocalBranchByUpstream( repo: Repository, remoteBranchName: string, + branches?: PageableResult, ): Promise { let qualifiedRemoteBranchName; if (remoteBranchName.startsWith('remotes/')) { @@ -300,19 +302,16 @@ export async function getLocalBranchByUpstream( qualifiedRemoteBranchName = `remotes/${remoteBranchName}`; } - let branches; - do { - branches = await repo.getBranches(branches != null ? { paging: branches.paging } : undefined); - for (const branch of branches.values) { - if ( - !branch.remote && - branch.upstream?.name != null && - (branch.upstream.name === remoteBranchName || branch.upstream.name === qualifiedRemoteBranchName) - ) { - return branch; - } + branches ??= new PageableResult(p => repo.getBranches(p != null ? { paging: p } : undefined)); + for await (const branch of branches.values()) { + if ( + !branch.remote && + branch.upstream?.name != null && + (branch.upstream.name === remoteBranchName || branch.upstream.name === qualifiedRemoteBranchName) + ) { + return branch; } - } while (branches.paging?.more); + } return undefined; } diff --git a/src/git/models/worktree.ts b/src/git/models/worktree.ts index 4c38a1a947bd9..ad8f3f91aa7d2 100644 --- a/src/git/models/worktree.ts +++ b/src/git/models/worktree.ts @@ -2,6 +2,7 @@ import type { Uri, WorkspaceFolder } from 'vscode'; import { workspace } from 'vscode'; import { Container } from '../../container'; import { memoize } from '../../system/decorators/memoize'; +import { PageableResult } from '../../system/paging'; import { normalizePath, relative } from '../../system/path'; import type { GitBranch } from './branch'; import { shortenRevision } from './reference'; @@ -84,26 +85,34 @@ export class GitWorktree { export async function getWorktreeForBranch( repo: Repository, branchName: string, - upstreamNames?: string | string[], + upstreamNames: string | string[], + worktrees?: GitWorktree[], + branches?: PageableResult, ): Promise { if (upstreamNames != null && !Array.isArray(upstreamNames)) { upstreamNames = [upstreamNames]; } - const worktrees = await repo.getWorktrees(); + worktrees ??= await repo.getWorktrees(); for (const worktree of worktrees) { if (worktree.branch === branchName) return worktree; if (upstreamNames == null || worktree.branch == null) continue; - const branch = await repo.getBranch(worktree.branch); - if ( - branch?.upstream?.name != null && - (upstreamNames.includes(branch.upstream.name) || - (branch.upstream.name.startsWith('remotes/') && - upstreamNames.includes(branch.upstream.name.substring(8)))) - ) { - return worktree; + branches ??= new PageableResult(p => repo.getBranches(p != null ? { paging: p } : undefined)); + for await (const branch of branches.values()) { + if (branch.name === worktree.branch) { + if ( + branch.upstream?.name != null && + (upstreamNames.includes(branch.upstream.name) || + (branch.upstream.name.startsWith('remotes/') && + upstreamNames.includes(branch.upstream.name.substring(8)))) + ) { + return worktree; + } + + break; + } } } diff --git a/src/plus/webviews/focus/focusWebview.ts b/src/plus/webviews/focus/focusWebview.ts index 50e73a5ac7d7b..4d9078d66870e 100644 --- a/src/plus/webviews/focus/focusWebview.ts +++ b/src/plus/webviews/focus/focusWebview.ts @@ -20,11 +20,15 @@ import { createReference } from '../../../git/models/reference'; import type { GitRemote } from '../../../git/models/remote'; import type { Repository, RepositoryChangeEvent } from '../../../git/models/repository'; import { RepositoryChange, RepositoryChangeComparisonMode } from '../../../git/models/repository'; +import type { GitWorktree } from '../../../git/models/worktree'; import { getWorktreeForBranch } from '../../../git/models/worktree'; import { parseGitRemoteUrl } from '../../../git/parsers/remoteParser'; import type { RichRemoteProvider } from '../../../git/remotes/richRemoteProvider'; import { executeCommand, registerCommand } from '../../../system/command'; import { debug } from '../../../system/decorators/log'; +import { Logger } from '../../../system/logger'; +import { getLogScope } from '../../../system/logger.scope'; +import { PageableResult } from '../../../system/paging'; import { getSettledValue } from '../../../system/promise'; import type { IpcMessage } from '../../../webviews/protocol'; import { onIpc } from '../../../webviews/protocol'; @@ -541,22 +545,30 @@ export class FocusWebviewProvider implements WebviewProvider { richRepos: RepoWithRichRemote[], force?: boolean, ): Promise { + const scope = getLogScope(); + if (force || this._pullRequests == null) { const allPrs: SearchedPullRequestWithRemote[] = []; - for (const richRepo of richRepos) { - const remote = richRepo.remote; - const prs = await this.container.git.getMyPullRequests(remote); - if (prs == null) { - continue; + + const branchesByRepo = new Map>(); + const worktreesByRepo = new Map(); + + const queries = richRepos.map(r => [r, this.container.git.getMyPullRequests(r.remote)] as const); + for (const [r, query] of queries) { + let prs; + try { + prs = await query; + } catch (ex) { + Logger.error(ex, scope, `Failed to get prs for '${r.remote.url}'`); } + if (prs == null) continue; for (const pr of prs) { - if (pr.reasons.length === 0) { - continue; - } + if (pr.reasons.length === 0) continue; + const entry: SearchedPullRequestWithRemote = { ...pr, - repoAndRemote: richRepo, + repoAndRemote: r, isCurrentWorktree: false, isCurrentBranch: false, rank: getPrRank(pr), @@ -566,15 +578,32 @@ export class FocusWebviewProvider implements WebviewProvider { entry.pullRequest.refs!.head.branch }`; // TODO@eamodio really need to check for upstream url rather than name + let branches = branchesByRepo.get(entry.repoAndRemote.repo); + if (branches == null) { + branches = new PageableResult(paging => + entry.repoAndRemote.repo.getBranches(paging != null ? { paging: paging } : undefined), + ); + branchesByRepo.set(entry.repoAndRemote.repo, branches); + } + + let worktrees = worktreesByRepo.get(entry.repoAndRemote.repo); + if (worktrees == null) { + worktrees = await entry.repoAndRemote.repo.getWorktrees(); + worktreesByRepo.set(entry.repoAndRemote.repo, worktrees); + } + const worktree = await getWorktreeForBranch( entry.repoAndRemote.repo, entry.pullRequest.refs!.head.branch, remoteBranchName, + worktrees, + branches, ); + entry.hasWorktree = worktree != null; entry.isCurrentWorktree = worktree?.opened === true; - const branch = await getLocalBranchByUpstream(richRepo.repo, remoteBranchName); + const branch = await getLocalBranchByUpstream(r.repo, remoteBranchName, branches); if (branch) { entry.branch = branch; entry.hasLocalBranch = true; @@ -601,22 +630,27 @@ export class FocusWebviewProvider implements WebviewProvider { @debug({ args: { 0: false } }) private async getMyIssues(richRepos: RepoWithRichRemote[], force?: boolean): Promise { + const scope = getLogScope(); + if (force || this._pullRequests == null) { const allIssues = []; - for (const richRepo of richRepos) { - const remote = richRepo.remote; - const issues = await this.container.git.getMyIssues(remote); - if (issues == null) { - continue; + + const queries = richRepos.map(r => [r, this.container.git.getMyIssues(r.remote)] as const); + for (const [r, query] of queries) { + let issues; + try { + issues = await query; + } catch (ex) { + Logger.error(ex, scope, `Failed to get issues for '${r.remote.url}'`); } + if (issues == null) continue; for (const issue of issues) { - if (issue.reasons.length === 0) { - continue; - } + if (issue.reasons.length === 0) continue; + allIssues.push({ ...issue, - repoAndRemote: richRepo, + repoAndRemote: r, rank: 0, // getIssueRank(issue), }); } diff --git a/src/system/paging.ts b/src/system/paging.ts new file mode 100644 index 0000000000000..c7a448c2cdbb9 --- /dev/null +++ b/src/system/paging.ts @@ -0,0 +1,31 @@ +import type { PagedResult } from '../git/gitProvider'; + +export class PageableResult { + private cached: Mutable> | undefined; + + constructor(private readonly fetch: (paging: PagedResult['paging']) => Promise>) {} + + async *values(): AsyncIterable> { + if (this.cached != null) { + for (const value of this.cached.values) { + yield value; + } + } + + let results = this.cached; + while (results == null || results.paging?.more) { + results = await this.fetch(results?.paging); + + if (this.cached == null) { + this.cached = results; + } else { + this.cached.values.push(...results.values); + this.cached.paging = results.paging; + } + + for (const value of results.values) { + yield value; + } + } + } +} From 07c9c63d07b12e6a5d85797922d270bca214c885 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 13 Oct 2023 14:57:43 -0400 Subject: [PATCH 0051/1012] Avoids refresh on initial load while discovering --- src/git/gitProviderService.ts | 30 ++++++++++++++----------- src/plus/webviews/focus/focusWebview.ts | 22 +++++++++++++++++- 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/src/git/gitProviderService.ts b/src/git/gitProviderService.ts index 0eb207a374bed..1cfcc4b6495b4 100644 --- a/src/git/gitProviderService.ts +++ b/src/git/gitProviderService.ts @@ -142,9 +142,11 @@ export class GitProviderService implements Disposable { get onDidChangeRepositories(): Event { return this._onDidChangeRepositories.event; } + private fireRepositoriesChanged(added?: Repository[], removed?: Repository[]) { - const openSchemes = this.openRepositories.map(r => r.uri.scheme); if (this.container.telemetry.enabled) { + const openSchemes = this.openRepositories.map(r => r.uri.scheme); + this.container.telemetry.setGlobalAttributes({ 'repositories.count': openSchemes.length, 'repositories.schemes': joinUnique(openSchemes, ','), @@ -163,7 +165,7 @@ export class GitProviderService implements Disposable { this._onDidChangeRepositories.fire({ added: added ?? [], removed: removed ?? [], etag: this._etag }); if (added?.length && this.container.telemetry.enabled) { - queueMicrotask(async () => { + setTimeout(async () => { for (const repo of added) { const remoteProviders = new Set(); @@ -181,7 +183,7 @@ export class GitProviderService implements Disposable { 'repository.remoteProviders': join(remoteProviders, ','), }); } - }); + }, 0); } } @@ -541,10 +543,12 @@ export class GitProviderService implements Disposable { >('git.autoRepositoryDetection'); if (this.container.telemetry.enabled) { - queueMicrotask(() => - this.container.telemetry.sendEvent('providers/registrationComplete', { - 'config.git.autoRepositoryDetection': autoRepositoryDetection, - }), + setTimeout( + () => + this.container.telemetry.sendEvent('providers/registrationComplete', { + 'config.git.autoRepositoryDetection': autoRepositoryDetection, + }), + 0, ); } @@ -576,8 +580,8 @@ export class GitProviderService implements Disposable { private _discoveredWorkspaceFolders = new Map>(); - private _isDiscoveringRepositories: Promise | undefined; - get isDiscoveringRepositories(): Promise | undefined { + private _isDiscoveringRepositories: Promise | undefined; + get isDiscoveringRepositories(): Promise | undefined { return this._isDiscoveringRepositories; } @@ -588,7 +592,7 @@ export class GitProviderService implements Disposable { this._isDiscoveringRepositories = undefined; } - const deferred = defer(); + const deferred = defer(); this._isDiscoveringRepositories = deferred.promise; try { @@ -630,7 +634,7 @@ export class GitProviderService implements Disposable { queueMicrotask(() => this.fireRepositoriesChanged(added)); } } finally { - deferred.fulfill(); + queueMicrotask(() => deferred.fulfill(this._etag)); } } @@ -910,7 +914,7 @@ export class GitProviderService implements Disposable { if (visibility == null) { visibility = await this.visibilityCore(repoPath); if (this.container.telemetry.enabled) { - queueMicrotask(() => { + setTimeout(() => { const repo = this.getRepository(repoPath); this.container.telemetry.sendEvent('repository/visibility', { 'repository.visibility': visibility, @@ -920,7 +924,7 @@ export class GitProviderService implements Disposable { 'repository.folder.scheme': repo?.folder?.uri.scheme, 'repository.provider.id': repo?.provider.id, }); - }); + }, 0); } } return visibility; diff --git a/src/plus/webviews/focus/focusWebview.ts b/src/plus/webviews/focus/focusWebview.ts index 4d9078d66870e..8b0ac774fb65b 100644 --- a/src/plus/webviews/focus/focusWebview.ts +++ b/src/plus/webviews/focus/focusWebview.ts @@ -84,7 +84,9 @@ interface SearchedIssueWithRank extends SearchedIssue { export class FocusWebviewProvider implements WebviewProvider { private _pullRequests: SearchedPullRequestWithRemote[] = []; private _issues: SearchedIssueWithRank[] = []; + private _discovering: Promise | undefined; private readonly _disposable: Disposable; + private _etag?: number; private _etagSubscription?: number; private _repositoryEventsDisposable?: Disposable; private _repos?: RepoWithRichRemote[]; @@ -96,7 +98,16 @@ export class FocusWebviewProvider implements WebviewProvider { ) { this._disposable = Disposable.from( this.container.subscription.onDidChange(this.onSubscriptionChanged, this), - this.container.git.onDidChangeRepositories(() => void this.host.refresh(true)), + this.container.git.onDidChangeRepositories(async () => { + if (this._etag !== this.container.git.etag) { + if (this._discovering != null) { + this._etag = await this._discovering; + if (this._etag === this.container.git.etag) return; + } + + void this.host.refresh(true); + } + }), ); } @@ -424,6 +435,15 @@ export class FocusWebviewProvider implements WebviewProvider { private async getState(force?: boolean, deferState?: boolean): Promise { const webviewId = this.host.id; + this._etag = this.container.git.etag; + if (this.container.git.isDiscoveringRepositories) { + this._discovering = this.container.git.isDiscoveringRepositories.then(r => { + this._discovering = undefined; + return r; + }); + this._etag = await this._discovering; + } + const access = await this.getAccess(force); if (access.allowed !== true) { return { From 3d1230e191a3c19d6ffaad56eefa4e3fe7095877 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Fri, 13 Oct 2023 18:23:03 -0400 Subject: [PATCH 0052/1012] Adds required prompts when pinning or snoozing --- src/plus/focus/focusService.ts | 118 +++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/src/plus/focus/focusService.ts b/src/plus/focus/focusService.ts index 63f6c49e75698..2ea8518019caa 100644 --- a/src/plus/focus/focusService.ts +++ b/src/plus/focus/focusService.ts @@ -1,7 +1,9 @@ import type { Disposable } from 'vscode'; +import { window } from 'vscode'; import type { Container } from '../../container'; import type { GitRemote } from '../../git/models/remote'; import type { RichRemoteProvider } from '../../git/remotes/richRemoteProvider'; +import { isSubscriptionPaidPlan } from '../../subscription'; import { log } from '../../system/decorators/log'; import { Logger } from '../../system/logger'; import { getLogScope } from '../../system/logger.scope'; @@ -83,6 +85,8 @@ export class FocusService implements Disposable { const result = (await rsp.json()) as Result; return type == null ? result.data : result.data.filter(i => i.type === type); } catch (ex) { + if (ex instanceof Error && ex.message === 'Authentication required') return []; + Logger.error(ex, scope); debugger; throw ex; @@ -104,6 +108,10 @@ export class FocusService implements Disposable { const scope = getLogScope(); try { + if (!(await ensureAccount('Pinning requires an account', this.container))) { + throw new Error('Unable to pin item: account required'); + } + type Result = { data: EnrichedItemResponse }; const rq: EnrichedItemRequest = { @@ -143,6 +151,10 @@ export class FocusService implements Disposable { const scope = getLogScope(); try { + if (!(await ensurePaidPlan('Snoozing requires a trial or paid plan', this.container))) { + throw new Error('Unable to snooze item: subscription required'); + } + type Result = { data: EnrichedItemResponse }; const rq: EnrichedItemRequest = { @@ -177,3 +189,109 @@ export class FocusService implements Disposable { return this.delete(id, 'unsnooze'); } } + +async function ensurePaidPlan(title: string, container: Container): Promise { + while (true) { + const subscription = await container.subscription.getSubscription(); + if (subscription.account?.verified === false) { + const resend = { title: 'Resend Verification' }; + const cancel = { title: 'Cancel', isCloseAffordance: true }; + const result = await window.showWarningMessage( + `${title}\n\nYou must verify your email before you can continue.`, + { modal: true }, + resend, + cancel, + ); + + if (result === resend) { + if (await container.subscription.resendVerification()) { + continue; + } + } + + return false; + } + + const plan = subscription.plan.effective.id; + if (isSubscriptionPaidPlan(plan)) break; + + if (subscription.account == null) { + const signIn = { title: 'Start Free GitKraken Trial' }; + const cancel = { title: 'Cancel', isCloseAffordance: true }; + const result = await window.showWarningMessage( + `${title}\n\nTry our developer productivity and collaboration services free for 7 days.`, + { modal: true }, + signIn, + cancel, + ); + + if (result === signIn) { + if (await container.subscription.loginOrSignUp()) { + continue; + } + } + } else { + const upgrade = { title: 'Upgrade to Pro' }; + const cancel = { title: 'Cancel', isCloseAffordance: true }; + const result = await window.showWarningMessage( + `${title}\n\nContinue to use our developer productivity and collaboration services.`, + { modal: true }, + upgrade, + cancel, + ); + + if (result === upgrade) { + void container.subscription.purchase(); + } + } + + return false; + } + + return true; +} + +async function ensureAccount(title: string, container: Container): Promise { + while (true) { + const subscription = await container.subscription.getSubscription(); + if (subscription.account?.verified === false) { + const resend = { title: 'Resend Verification' }; + const cancel = { title: 'Cancel', isCloseAffordance: true }; + const result = await window.showWarningMessage( + `${title}\n\nYou must verify your email before you can continue.`, + { modal: true }, + resend, + cancel, + ); + + if (result === resend) { + if (await container.subscription.resendVerification()) { + continue; + } + } + + return false; + } + + if (subscription.account != null) break; + + const signIn = { title: 'Sign In / Sign Up' }; + const cancel = { title: 'Cancel', isCloseAffordance: true }; + const result = await window.showWarningMessage( + `${title}\n\nGain access to our developer productivity and collaboration services.`, + { modal: true }, + signIn, + cancel, + ); + + if (result === signIn) { + if (await container.subscription.loginOrSignUp()) { + continue; + } + } + + return false; + } + + return true; +} From 7db0ad0ce23f27b080bd83f9d0f0eb894f7c3cd6 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Fri, 13 Oct 2023 16:50:45 -0700 Subject: [PATCH 0053/1012] Bumps to v14.4.0 --- CHANGELOG.md | 5 ++++- package.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47a6d52291ff3..269d7570e9923 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] +## [14.4.0] - 2023-10-13 + ### Added - Adds a _Working Changes_ tab to the _Commit Details_ and _Graph Details_ views to show your working tree changes @@ -4964,7 +4966,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Initial release but still heavily a work in progress. -[unreleased]: https://github.com/gitkraken/vscode-gitlens/compare/v14.3.0...HEAD +[unreleased]: https://github.com/gitkraken/vscode-gitlens/compare/v14.4.0...HEAD +[14.4.0]: https://github.com/gitkraken/vscode-gitlens/compare/v14.3.0...gitkraken:v14.4.0 [14.3.0]: https://github.com/gitkraken/vscode-gitlens/compare/v14.2.1...gitkraken:v14.3.0 [14.2.1]: https://github.com/gitkraken/vscode-gitlens/compare/v14.2.0...gitkraken:v14.2.1 [14.2.0]: https://github.com/gitkraken/vscode-gitlens/compare/v14.1.1...gitkraken:v14.2.0 diff --git a/package.json b/package.json index 6f3887e50d974..882760f969713 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "gitlens", "displayName": "GitLens — Git supercharged", "description": "Supercharge Git within VS Code — Visualize code authorship at a glance via Git blame annotations and CodeLens, seamlessly navigate and explore Git repositories, gain valuable insights via rich visualizations and powerful comparison commands, and so much more", - "version": "14.3.0", + "version": "14.4.0", "engines": { "vscode": "^1.80.0" }, From 5b0d883d3a720512286d844c302c8a1855c82088 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Mon, 16 Oct 2023 11:46:03 -0400 Subject: [PATCH 0054/1012] Adds baseRef optional chain to isHidden --- .../apps/shared/components/list/file-change-list-item.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webviews/apps/shared/components/list/file-change-list-item.ts b/src/webviews/apps/shared/components/list/file-change-list-item.ts index 406c0bfd8ae02..f780785d1a393 100644 --- a/src/webviews/apps/shared/components/list/file-change-list-item.ts +++ b/src/webviews/apps/shared/components/list/file-change-list-item.ts @@ -105,7 +105,7 @@ export class FileChangeListItem extends LitElement { @state() get isHidden() { - return this.baseRef.isHidden ?? 'false'; + return this.baseRef?.isHidden ?? 'false'; } @state() From 2ec8e6c74bdf7e10e0f5300cb8b59edd1550176a Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Mon, 16 Oct 2023 11:46:17 -0400 Subject: [PATCH 0055/1012] Updates to lit v3 --- package.json | 4 ++-- yarn.lock | 58 ++++++++++++++++++++++++++-------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 882760f969713..34ea460a2ecc8 100644 --- a/package.json +++ b/package.json @@ -14844,7 +14844,7 @@ }, "dependencies": { "@gitkraken/gitkraken-components": "10.1.30", - "@gitkraken/shared-web-components": "0.1.1-rc.11", + "@gitkraken/shared-web-components": "0.1.1-rc.15", "@microsoft/fast-element": "1.12.0", "@microsoft/fast-react-wrapper": "0.3.19", "@octokit/graphql": "7.0.2", @@ -14858,7 +14858,7 @@ "billboard.js": "3.9.4", "https-proxy-agent": "5.0.1", "iconv-lite": "0.6.3", - "lit": "2.8.0", + "lit": "3.0.0", "node-fetch": "2.7.0", "os-browserify": "0.3.0", "path-browserify": "1.0.1", diff --git a/yarn.lock b/yarn.lock index 832f6bffd3848..3dd08feac8dad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -237,10 +237,10 @@ react-dragula "1.1.17" react-onclickoutside "^6.13.0" -"@gitkraken/shared-web-components@0.1.1-rc.11": - version "0.1.1-rc.11" - resolved "https://registry.yarnpkg.com/@gitkraken/shared-web-components/-/shared-web-components-0.1.1-rc.11.tgz#0d588af0a9c92a6ccf2339a341787c6d9d60227c" - integrity sha512-lslDHNgU2znzoLydkLudETHP0WlRBLdV25YgRSTcm724Elah5nFfqUdJZ8lQCKehxJBnlWtll5uTxuM+7wxVDw== +"@gitkraken/shared-web-components@0.1.1-rc.15": + version "0.1.1-rc.15" + resolved "https://registry.npmjs.org/@gitkraken/shared-web-components/-/shared-web-components-0.1.1-rc.15.tgz#efd520083a7f5a32fe342108f447e8c77723cfd2" + integrity sha512-BXGWoZoFzWftJC3BgEEPm/cU2qYasoGveGiG8oL8cWydl2TCkRCxddsiDswsMQaZDZIeTYLwbUPwA2PBeAAg4A== dependencies: "@floating-ui/dom" "^1.4.2" typescript "^4.9.5" @@ -352,17 +352,17 @@ methods "^1.1.2" path-to-regexp "^6.2.1" -"@lit-labs/ssr-dom-shim@^1.0.0", "@lit-labs/ssr-dom-shim@^1.1.0": +"@lit-labs/ssr-dom-shim@^1.1.2-pre.0": version "1.1.2" - resolved "https://registry.yarnpkg.com/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.2.tgz#d693d972974a354034454ec1317eb6afd0b00312" + resolved "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.2.tgz#d693d972974a354034454ec1317eb6afd0b00312" integrity sha512-jnOD+/+dSrfTWYfSXBXlo5l5f0q1UuJo3tkbMDCYA2lKUYq79jaxqtGEvnRoh049nt1vdo1+45RinipU6FGY2g== -"@lit/reactive-element@^1.3.0", "@lit/reactive-element@^1.6.0": - version "1.6.3" - resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-1.6.3.tgz#25b4eece2592132845d303e091bad9b04cdcfe03" - integrity sha512-QuTgnG52Poic7uM1AN5yJ09QMe0O28e10XzSvWDz02TJiiKee4stsiownEIadWm8nYzyDAyT+gKzUoZmiWQtsQ== +"@lit/reactive-element@^2.0.0": + version "2.0.0" + resolved "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.0.tgz#da14a256ac5533873b935840f306d572bac4a2ab" + integrity sha512-wn+2+uDcs62ROBmVAwssO4x5xue/uKD3MGGZOXL2sMxReTRIT0JXKyMXeu7gh0aJ4IJNEIG/3aOnUaQvM7BMzQ== dependencies: - "@lit-labs/ssr-dom-shim" "^1.0.0" + "@lit-labs/ssr-dom-shim" "^1.1.2-pre.0" "@microsoft/fast-element@1.12.0", "@microsoft/fast-element@^1.12.0", "@microsoft/fast-element@^1.6.2", "@microsoft/fast-element@^1.9.0": version "1.12.0" @@ -4430,30 +4430,30 @@ linkify-it@^3.0.1: dependencies: uc.micro "^1.0.1" -lit-element@^3.3.0: - version "3.3.3" - resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-3.3.3.tgz#10bc19702b96ef5416cf7a70177255bfb17b3209" - integrity sha512-XbeRxmTHubXENkV4h8RIPyr8lXc+Ff28rkcQzw3G6up2xg5E8Zu1IgOWIwBLEQsu3cOVFqdYwiVi0hv0SlpqUA== +lit-element@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/lit-element/-/lit-element-4.0.0.tgz#8343891bc9159a5fcb7f534914b37f2c0161e036" + integrity sha512-N6+f7XgusURHl69DUZU6sTBGlIN+9Ixfs3ykkNDfgfTkDYGGOWwHAYBhDqVswnFGyWgQYR2KiSpu4J76Kccs/A== dependencies: - "@lit-labs/ssr-dom-shim" "^1.1.0" - "@lit/reactive-element" "^1.3.0" - lit-html "^2.8.0" + "@lit-labs/ssr-dom-shim" "^1.1.2-pre.0" + "@lit/reactive-element" "^2.0.0" + lit-html "^3.0.0" -lit-html@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-2.8.0.tgz#96456a4bb4ee717b9a7d2f94562a16509d39bffa" - integrity sha512-o9t+MQM3P4y7M7yNzqAyjp7z+mQGa4NS4CxiyLqFPyFWyc4O+nodLrkrxSaCTrla6M5YOLaT3RpbbqjszB5g3Q== +lit-html@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/lit-html/-/lit-html-3.0.0.tgz#77d6776ee488642c74c5575315ef81aa09d24ea9" + integrity sha512-DNJIE8dNY0dQF2Gs0sdMNUppMQT2/CvV4OVnSdg7BXAsGqkVwsE5bqQ04POfkYH5dBIuGnJYdFz5fYYyNnOxiA== dependencies: "@types/trusted-types" "^2.0.2" -lit@2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/lit/-/lit-2.8.0.tgz#4d838ae03059bf9cafa06e5c61d8acc0081e974e" - integrity sha512-4Sc3OFX9QHOJaHbmTMk28SYgVxLN3ePDjg7hofEft2zWlehFL3LiAuapWc4U/kYwMYJSh2hTCPZ6/LIC7ii0MA== +lit@3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/lit/-/lit-3.0.0.tgz#204bd65935892a73670471e893ee8ca55d2f9a3b" + integrity sha512-nQ0teRzU1Kdj++VdmttS2WvIen8M79wChJ6guRKIIym2M3Ansg3Adj9O6yuQh2IpjxiUXlNuS81WKlQ4iL3BmA== dependencies: - "@lit/reactive-element" "^1.6.0" - lit-element "^3.3.0" - lit-html "^2.8.0" + "@lit/reactive-element" "^2.0.0" + lit-element "^4.0.0" + lit-html "^3.0.0" loader-runner@^4.2.0: version "4.3.0" From 1dbd860f82d92b68b4b51c771754ea897fdb515e Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 16 Oct 2023 11:48:19 -0400 Subject: [PATCH 0056/1012] Updates dependencies & replaces FAST React w/ Lit --- ThirdPartyNotices.txt | 77 +++---- package.json | 12 +- src/webviews/apps/plus/graph/GraphWrapper.tsx | 6 +- .../apps/plus/graph/minimap/react.tsx | 5 +- .../components/helpers/react-wrapper.ts | 19 +- .../apps/shared/components/menu/react.tsx | 8 +- .../components/overlays/pop-menu/react.tsx | 2 +- .../apps/shared/components/overlays/react.tsx | 2 +- .../components/react/feature-gate-badge.tsx | 5 +- .../shared/components/react/feature-gate.tsx | 5 +- .../apps/shared/components/search/react.tsx | 8 +- yarn.lock | 212 +++++++++--------- 12 files changed, 187 insertions(+), 174 deletions(-) diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index ea8988ae6e39e..dcb4137ae4bfa 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -3,8 +3,8 @@ GitLens THIRD-PARTY SOFTWARE NOTICES AND INFORMATION This project incorporates components from the projects listed below. -1. @microsoft/fast-element version 1.12.0 (https://github.com/Microsoft/fast) -2. @microsoft/fast-react-wrapper version 0.3.19 (https://github.com/Microsoft/fast) +1. @lit/react version 1.0.0 (https://github.com/lit/lit) +2. @microsoft/fast-element version 1.12.0 (https://github.com/Microsoft/fast) 3. @octokit/graphql version 7.0.2 (https://github.com/octokit/graphql.js) 4. @octokit/request version 8.1.4 (https://github.com/octokit/request.js) 5. @opentelemetry/api version 1.6.0 (https://github.com/open-telemetry/opentelemetry-js) @@ -16,7 +16,7 @@ This project incorporates components from the projects listed below. 11. billboard.js version 3.9.4 (https://github.com/naver/billboard.js) 12. https-proxy-agent version 5.0.1 (https://github.com/TooTallNate/node-https-proxy-agent) 13. iconv-lite version 0.6.3 (https://github.com/ashtuchkin/iconv-lite) -14. lit version 2.8.0 (https://github.com/lit/lit) +14. lit version 3.0.0 (https://github.com/lit/lit) 15. microsoft/vscode (https://github.com/microsoft/vscode) 16. node-fetch version 2.7.0 (https://github.com/bitinn/node-fetch) 17. os-browserify version 0.3.0 (https://github.com/CoderPuppy/os-browserify) @@ -27,6 +27,39 @@ This project incorporates components from the projects listed below. 22. sindresorhus/string-width (https://github.com/sindresorhus/string-width) 23. sortablejs version 1.15.0 (https://github.com/SortableJS/Sortable) +%% @lit/react NOTICES AND INFORMATION BEGIN HERE +========================================= +BSD 3-Clause License + +Copyright (c) 2017 Google LLC. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +========================================= +END OF @lit/react NOTICES AND INFORMATION + %% @microsoft/fast-element NOTICES AND INFORMATION BEGIN HERE ========================================= # FAST Element @@ -94,44 +127,6 @@ Looking for a quick guide on building components? Check out [our Cheat Sheet](. ========================================= END OF @microsoft/fast-element NOTICES AND INFORMATION -%% @microsoft/fast-react-wrapper NOTICES AND INFORMATION BEGIN HERE -========================================= -# FAST React Wrapper - -[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) -[![npm version](https://badge.fury.io/js/%40microsoft%2Ffast-react-wrapper.svg)](https://badge.fury.io/js/%40microsoft%2Ffast-react-wrapper) - -The `fast-react-wrapper` package contains a utility that enables automatically wrapping Web Components in a React component for ease of integration into React projects. - -## Installation - -### From NPM - -To install the `fast-react-wrapper` library, use either `npm` or `yarn` as follows: - -```shell -npm install --save @microsoft/fast-react-wrapper -``` - -```shell -yarn add @microsoft/fast-react-wrapper -``` - -Within your JavaScript or TypeScript code, you can then and use the wrapper like this: - -```ts -import React from 'react'; -import { provideReactWrapper } from '@microsoft/fast-react-wrapper'; - -const { wrap } = provideReactWrapper(React); - -const MyComponent = wrap(MyComponent); -``` - -For additional wrapper settings and more information on integrating with Design Systems, see [our integration docs](https://fast.design/docs/integrations/react). -========================================= -END OF @microsoft/fast-react-wrapper NOTICES AND INFORMATION - %% @octokit/graphql NOTICES AND INFORMATION BEGIN HERE ========================================= The MIT License diff --git a/package.json b/package.json index 34ea460a2ecc8..8d477e81162aa 100644 --- a/package.json +++ b/package.json @@ -14845,8 +14845,8 @@ "dependencies": { "@gitkraken/gitkraken-components": "10.1.30", "@gitkraken/shared-web-components": "0.1.1-rc.15", + "@lit/react": "1.0.0", "@microsoft/fast-element": "1.12.0", - "@microsoft/fast-react-wrapper": "0.3.19", "@octokit/graphql": "7.0.2", "@octokit/request": "8.1.4", "@opentelemetry/api": "1.6.0", @@ -14869,14 +14869,14 @@ "devDependencies": { "@types/mocha": "10.0.1", "@types/node": "16.11.47", - "@types/react": "17.0.67", + "@types/react": "17.0.68", "@types/react-dom": "17.0.21", "@types/sortablejs": "1.15.3", "@types/vscode": "1.80.0", "@typescript-eslint/eslint-plugin": "6.7.5", "@typescript-eslint/parser": "6.7.5", "@vscode/test-electron": "2.3.5", - "@vscode/test-web": "0.0.46", + "@vscode/test-web": "0.0.47", "@vscode/vsce": "2.21.1", "circular-dependency-plugin": "5.2.2", "clean-webpack-plugin": "4.0.0", @@ -14903,12 +14903,12 @@ "html-loader": "4.2.0", "html-webpack-plugin": "5.5.3", "image-minimizer-webpack-plugin": "3.8.3", - "license-checker-rseidelsohn": "4.2.8", + "license-checker-rseidelsohn": "4.2.10", "lz-string": "1.5.0", "mini-css-extract-plugin": "2.7.6", "mocha": "10.2.0", "prettier": "3.0.3", - "sass": "1.69.1", + "sass": "1.69.3", "sass-loader": "13.3.2", "schema-utils": "4.2.0", "sharp": "0.32.6", @@ -14917,7 +14917,7 @@ "ts-loader": "9.5.0", "tsc-alias": "1.8.8", "typescript": "5.3.0-beta", - "webpack": "5.88.2", + "webpack": "5.89.0", "webpack-bundle-analyzer": "4.9.1", "webpack-cli": "5.1.4", "webpack-node-externals": "3.0.0", diff --git a/src/webviews/apps/plus/graph/GraphWrapper.tsx b/src/webviews/apps/plus/graph/GraphWrapper.tsx index c342f2e6c2947..a45242a20b8b0 100644 --- a/src/webviews/apps/plus/graph/GraphWrapper.tsx +++ b/src/webviews/apps/plus/graph/GraphWrapper.tsx @@ -1231,8 +1231,8 @@ export function GraphWrapper({ errorMessage={searchResultsError?.error ?? ''} resultsHidden={searchResultsHidden} resultsLoaded={searchResults != null} - onChange={e => handleSearchInput(e as CustomEvent)} - onNavigate={e => handleSearchNavigation(e as CustomEvent)} + onChange={e => handleSearchInput(e)} + onNavigate={e => handleSearchNavigation(e)} onOpenInView={() => handleSearchOpenInView()} /> @@ -1369,7 +1369,7 @@ export function GraphWrapper({ markers={minimapData?.markers} searchResults={minimapSearchResults} visibleDays={visibleDays} - onSelected={e => handleOnMinimapDaySelected(e as CustomEvent)} + onSelected={e => handleOnMinimapDaySelected(e)} > )}
diff --git a/src/webviews/apps/plus/graph/minimap/react.tsx b/src/webviews/apps/plus/graph/minimap/react.tsx index 2819f0c33a417..36bfd80e6424c 100644 --- a/src/webviews/apps/plus/graph/minimap/react.tsx +++ b/src/webviews/apps/plus/graph/minimap/react.tsx @@ -1,8 +1,11 @@ +import type { EventName } from '@lit/react'; import { reactWrapper } from '../../../shared/components/helpers/react-wrapper'; +import type { GraphMinimapDaySelectedEventDetail } from './minimap'; import { GraphMinimap as graphMinimapComponent } from './minimap'; export const GraphMinimap = reactWrapper(graphMinimapComponent, { + tagName: 'graph-minimap', events: { - onSelected: 'selected', + onSelected: 'selected' as EventName>, }, }); diff --git a/src/webviews/apps/shared/components/helpers/react-wrapper.ts b/src/webviews/apps/shared/components/helpers/react-wrapper.ts index 891d14ac5cf9a..4af7e8807d4b9 100644 --- a/src/webviews/apps/shared/components/helpers/react-wrapper.ts +++ b/src/webviews/apps/shared/components/helpers/react-wrapper.ts @@ -1,6 +1,19 @@ -import { provideReactWrapper } from '@microsoft/fast-react-wrapper'; +/* eslint-disable @typescript-eslint/ban-types */ +import type { EventName, Options } from '@lit/react'; +import { createComponent } from '@lit/react'; import React from 'react'; -const { wrap } = provideReactWrapper(React); +type Constructor = new () => T; +type EventNames = Record; +type Opts = Omit, 'elementClass' | 'react'>; -export { wrap as reactWrapper }; +export function reactWrapper( + elementClass: Constructor, + options: Opts, +) { + return createComponent({ + ...options, + elementClass: elementClass, + react: React, + }); +} diff --git a/src/webviews/apps/shared/components/menu/react.tsx b/src/webviews/apps/shared/components/menu/react.tsx index e4eb39785e05e..732b4971e56f7 100644 --- a/src/webviews/apps/shared/components/menu/react.tsx +++ b/src/webviews/apps/shared/components/menu/react.tsx @@ -6,7 +6,7 @@ import { MenuList as MenuListComponent, } from './index'; -export const MenuDivider = reactWrapper(MenuDividerComponent); -export const MenuItem = reactWrapper(MenuItemComponent); -export const MenuLabel = reactWrapper(MenuLabelComponent); -export const MenuList = reactWrapper(MenuListComponent); +export const MenuDivider = reactWrapper(MenuDividerComponent, { tagName: 'menu-divider' }); +export const MenuItem = reactWrapper(MenuItemComponent, { tagName: 'menu-item' }); +export const MenuLabel = reactWrapper(MenuLabelComponent, { tagName: 'menu-label' }); +export const MenuList = reactWrapper(MenuListComponent, { tagName: 'menu-list' }); diff --git a/src/webviews/apps/shared/components/overlays/pop-menu/react.tsx b/src/webviews/apps/shared/components/overlays/pop-menu/react.tsx index 935a56f64892f..f433e9365f0fb 100644 --- a/src/webviews/apps/shared/components/overlays/pop-menu/react.tsx +++ b/src/webviews/apps/shared/components/overlays/pop-menu/react.tsx @@ -1,4 +1,4 @@ import { reactWrapper } from '../../helpers/react-wrapper'; import { PopMenu as PopMenuComponent } from './index'; -export const PopMenu = reactWrapper(PopMenuComponent); +export const PopMenu = reactWrapper(PopMenuComponent, { tagName: 'pop-menu' }); diff --git a/src/webviews/apps/shared/components/overlays/react.tsx b/src/webviews/apps/shared/components/overlays/react.tsx index 7d6fe102e3817..603bacf2eaf4b 100644 --- a/src/webviews/apps/shared/components/overlays/react.tsx +++ b/src/webviews/apps/shared/components/overlays/react.tsx @@ -1,4 +1,4 @@ import { reactWrapper } from '../helpers/react-wrapper'; import { PopOver as PopOverComponent } from './pop-over'; -export const PopOver = reactWrapper(PopOverComponent); +export const PopOver = reactWrapper(PopOverComponent, { tagName: 'pop-over' }); diff --git a/src/webviews/apps/shared/components/react/feature-gate-badge.tsx b/src/webviews/apps/shared/components/react/feature-gate-badge.tsx index 97e3807165539..1c1077f069c13 100644 --- a/src/webviews/apps/shared/components/react/feature-gate-badge.tsx +++ b/src/webviews/apps/shared/components/react/feature-gate-badge.tsx @@ -1,7 +1,4 @@ import { FeatureGateBadge as featureGateBadgeComponent } from '../feature-gate-badge'; import { reactWrapper } from '../helpers/react-wrapper'; -export const FeatureGateBadge = reactWrapper(featureGateBadgeComponent, { - name: 'gk-feature-gate-badge', - properties: ['placement', 'subscription'], -}); +export const FeatureGateBadge = reactWrapper(featureGateBadgeComponent, { tagName: 'gk-feature-gate-badge' }); diff --git a/src/webviews/apps/shared/components/react/feature-gate.tsx b/src/webviews/apps/shared/components/react/feature-gate.tsx index 2ccc1952a3482..f8cad52fea0fe 100644 --- a/src/webviews/apps/shared/components/react/feature-gate.tsx +++ b/src/webviews/apps/shared/components/react/feature-gate.tsx @@ -1,7 +1,4 @@ import { FeatureGate as featureGateComponent } from '../feature-gate'; import { reactWrapper } from '../helpers/react-wrapper'; -export const FeatureGate = reactWrapper(featureGateComponent, { - name: 'gk-feature-gate', - properties: ['state', 'visible'], -}); +export const FeatureGate = reactWrapper(featureGateComponent, { tagName: 'gk-feature-gate' }); diff --git a/src/webviews/apps/shared/components/search/react.tsx b/src/webviews/apps/shared/components/search/react.tsx index 7bf8249be78db..8e54e30cd839b 100644 --- a/src/webviews/apps/shared/components/search/react.tsx +++ b/src/webviews/apps/shared/components/search/react.tsx @@ -1,10 +1,14 @@ +import type { EventName } from '@lit/react'; +import type { SearchQuery } from '../../../../../git/search'; import { reactWrapper } from '../helpers/react-wrapper'; +import type { SearchNavigationEventDetail } from './search-box'; import { SearchBox as searchBoxComponent } from './search-box'; export const SearchBox = reactWrapper(searchBoxComponent, { + tagName: 'search-box', events: { - onChange: 'change', - onNavigate: 'navigate', + onChange: 'change' as EventName>, + onNavigate: 'navigate' as EventName>, onOpenInView: 'openinview', }, }); diff --git a/yarn.lock b/yarn.lock index 3dd08feac8dad..54504cc6a5cde 100644 --- a/yarn.lock +++ b/yarn.lock @@ -42,17 +42,17 @@ js-tokens "^4.0.0" "@babel/runtime-corejs2@^7.0.0": - version "7.23.1" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.23.1.tgz#f3a25c24d455be4e0309a56e56f0d2ef1a91c567" - integrity sha512-eY39r8IIgbcDfILJqsflwMImjccvK3QdgBRKo5v6lDPd5SiAsyfl3SJuAYWJ5hgbz7kfQmZ9ueirnhq0e9176Q== + version "7.23.2" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.23.2.tgz#a482c6e233fb2efa6456ce299da1b440b87260ed" + integrity sha512-lTwRWGcAUBANnxD0A4c5/wKQ0eLhgdAy9kdY2rzTmmliumBQ8u8awykMnaQAnZR3PC47jLRjGoj+hozZqy9Bww== dependencies: core-js "^2.6.12" regenerator-runtime "^0.14.0" "@babel/runtime@^7.1.2", "@babel/runtime@^7.21.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7": - version "7.23.1" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.1.tgz#72741dc4d413338a91dcb044a86f3c0bc402646d" - integrity sha512-hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g== + version "7.23.2" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885" + integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg== dependencies: regenerator-runtime "^0.14.0" @@ -239,7 +239,7 @@ "@gitkraken/shared-web-components@0.1.1-rc.15": version "0.1.1-rc.15" - resolved "https://registry.npmjs.org/@gitkraken/shared-web-components/-/shared-web-components-0.1.1-rc.15.tgz#efd520083a7f5a32fe342108f447e8c77723cfd2" + resolved "https://registry.yarnpkg.com/@gitkraken/shared-web-components/-/shared-web-components-0.1.1-rc.15.tgz#efd520083a7f5a32fe342108f447e8c77723cfd2" integrity sha512-BXGWoZoFzWftJC3BgEEPm/cU2qYasoGveGiG8oL8cWydl2TCkRCxddsiDswsMQaZDZIeTYLwbUPwA2PBeAAg4A== dependencies: "@floating-ui/dom" "^1.4.2" @@ -343,10 +343,11 @@ vary "^1.1.2" "@koa/router@^12.0.0": - version "12.0.0" - resolved "https://registry.yarnpkg.com/@koa/router/-/router-12.0.0.tgz#2ae7937093fd392761c0e5833c368379d4a35737" - integrity sha512-cnnxeKHXlt7XARJptflGURdJaO+ITpNkOHmQu7NHmCoRinPbyvFzce/EG/E8Zy81yQ1W9MoSdtklc3nyaDReUw== + version "12.0.1" + resolved "https://registry.yarnpkg.com/@koa/router/-/router-12.0.1.tgz#1a66f92a630c02832cf5bbf0db06c9e53e423468" + integrity sha512-ribfPYfHb+Uw3b27Eiw6NPqjhIhTpVFzEWLwyc/1Xp+DCdwRRyIlAUODX+9bPARF6aQtUu1+/PHzdNvRzcs/+Q== dependencies: + debug "^4.3.4" http-errors "^2.0.0" koa-compose "^4.1.0" methods "^1.1.2" @@ -354,12 +355,17 @@ "@lit-labs/ssr-dom-shim@^1.1.2-pre.0": version "1.1.2" - resolved "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.2.tgz#d693d972974a354034454ec1317eb6afd0b00312" + resolved "https://registry.yarnpkg.com/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.2.tgz#d693d972974a354034454ec1317eb6afd0b00312" integrity sha512-jnOD+/+dSrfTWYfSXBXlo5l5f0q1UuJo3tkbMDCYA2lKUYq79jaxqtGEvnRoh049nt1vdo1+45RinipU6FGY2g== +"@lit/react@1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@lit/react/-/react-1.0.0.tgz#1f5fc9b8d88cf6e7152653c7d67aa40456c095e6" + integrity sha512-uTuU6vpxtZvCWxcu3GNosckP2JpFWZpMKjhwQ42Bzu/OU9kjStJspA04o7RadecQfx0YiFIImX3qek15BXhaWQ== + "@lit/reactive-element@^2.0.0": version "2.0.0" - resolved "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.0.tgz#da14a256ac5533873b935840f306d572bac4a2ab" + resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-2.0.0.tgz#da14a256ac5533873b935840f306d572bac4a2ab" integrity sha512-wn+2+uDcs62ROBmVAwssO4x5xue/uKD3MGGZOXL2sMxReTRIT0JXKyMXeu7gh0aJ4IJNEIG/3aOnUaQvM7BMzQ== dependencies: "@lit-labs/ssr-dom-shim" "^1.1.2-pre.0" @@ -369,24 +375,16 @@ resolved "https://registry.yarnpkg.com/@microsoft/fast-element/-/fast-element-1.12.0.tgz#aabfc75518c3a9000710cce5f66dfc677de8c254" integrity sha512-gQutuDHPKNxUEcQ4pypZT4Wmrbapus+P9s3bR/SEOLsMbNqNoXigGImITygI5zhb+aA5rzflM6O8YWkmRbGkPA== -"@microsoft/fast-foundation@^2.38.0", "@microsoft/fast-foundation@^2.41.1", "@microsoft/fast-foundation@^2.49.1": - version "2.49.1" - resolved "https://registry.yarnpkg.com/@microsoft/fast-foundation/-/fast-foundation-2.49.1.tgz#f9cd36491d4d0080e694eaf0aece5672cdf7075a" - integrity sha512-dSajlZeX+lkqjg4108XbIIhVLECgJTCG32bE8P6rNgo8XCPHVJBDiBejrF34lv5pO9Z2uGORZjeip/N0fPib+g== +"@microsoft/fast-foundation@^2.38.0", "@microsoft/fast-foundation@^2.41.1": + version "2.49.2" + resolved "https://registry.yarnpkg.com/@microsoft/fast-foundation/-/fast-foundation-2.49.2.tgz#f310843038cd4b1dd6f64da1ac3ddba2a71b7a5e" + integrity sha512-xA7WP/Td33SW0zkpHRH5LUDxyLOPnPQQXieRxc080uLWxoGXhVxo6Rz7b6qwiL+e2IadNCm7X7KcrgsUhJwvBg== dependencies: "@microsoft/fast-element" "^1.12.0" "@microsoft/fast-web-utilities" "^5.4.1" tabbable "^5.2.0" tslib "^1.13.0" -"@microsoft/fast-react-wrapper@0.3.19": - version "0.3.19" - resolved "https://registry.yarnpkg.com/@microsoft/fast-react-wrapper/-/fast-react-wrapper-0.3.19.tgz#c1fda6d3c157bd9e28455c146068f668932d808e" - integrity sha512-Pe7z+3H2JYVFbz+CERAu/cf/6KkWboktfiP/Z/ZM0toPKiEaHUNycT+0sPZBWljOWxJiiGDX6+Dp6bw3GXCOvg== - dependencies: - "@microsoft/fast-element" "^1.12.0" - "@microsoft/fast-foundation" "^2.49.1" - "@microsoft/fast-react-wrapper@^0.1.18": version "0.1.48" resolved "https://registry.yarnpkg.com/@microsoft/fast-react-wrapper/-/fast-react-wrapper-0.1.48.tgz#aa89c0dfb703c2f71619c536de2342e28b40b8c9" @@ -574,11 +572,11 @@ integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== "@playwright/browser-chromium@^1.38.1": - version "1.38.1" - resolved "https://registry.yarnpkg.com/@playwright/browser-chromium/-/browser-chromium-1.38.1.tgz#daf0ed3f7a8f9ad6ca731c73be3682b7cce8d5ff" - integrity sha512-HRhcBGtk1XaGAQjOben/04PNHxWAY3DBHT97egraR5lx5SQSLOREIiYu/j7WlvQBz4QJP+XL2JsvoxFBJfXmAw== + version "1.39.0" + resolved "https://registry.yarnpkg.com/@playwright/browser-chromium/-/browser-chromium-1.39.0.tgz#549ea67a4734e8a17d5d3fdeabcdcf1e02cffd84" + integrity sha512-s1WPO0qOE7PIZcdcJEd4CHQgXf9rOwy00Den8DsXTI26n/Eqa2HzFSbLRE1Eh2nIJZFSGyKLbopHR0HkT8ClZw== dependencies: - playwright-core "1.38.1" + playwright-core "1.39.0" "@polka/url@^1.0.0-next.20": version "1.0.0-next.23" @@ -626,9 +624,9 @@ "@types/estree" "*" "@types/eslint@*": - version "8.44.3" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.3.tgz#96614fae4875ea6328f56de38666f582d911d962" - integrity sha512-iM/WfkwAhwmPff3wZuPLYiHX18HI24jU8k1ZSH7P8FHwxTjZ2P6CoX2wnF43oprR+YXJM6UUxATkNvyv/JHd+g== + version "8.44.4" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.4.tgz#28eaff82e1ca0a96554ec5bb0188f10ae1a74c2f" + integrity sha512-lOzjyfY/D9QR4hY9oblZ76B90MYTB3RrQ4z2vBIJKj9ROCRqdkYl2gSUx1x1a4IWPjKJZLL4Aw1Zfay7eMnmnA== dependencies: "@types/estree" "*" "@types/json-schema" "*" @@ -696,9 +694,9 @@ integrity sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q== "@types/node@*": - version "20.8.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.4.tgz#0e9ebb2ff29d5c3302fc84477d066fa7c6b441aa" - integrity sha512-ZVPnqU58giiCjSxjVUESDtdPk4QR5WQhhINbc9UBrKLU68MX5BF6kbQzTrkwbolyr0X8ChBpXfavr5mZFKZQ5A== + version "20.8.6" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.6.tgz#0dbd4ebcc82ad0128df05d0e6f57e05359ee47fa" + integrity sha512-eWO4K2Ji70QzKUqRy6oyJWUeB7+g2cRagT3T/nxYibYcT4y2BDL8lqolRXjTHmkZCdJfIPaY73KbJAZmcryxTQ== dependencies: undici-types "~5.25.1" @@ -729,10 +727,10 @@ dependencies: "@types/react" "^17" -"@types/react@17.0.67", "@types/react@^17": - version "17.0.67" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.67.tgz#1c224738f203829a4692aa48e33a732c34fd014a" - integrity sha512-zE76EIJ0Y58Oy9yDX/9csb/NuKjt0Eq2YgWb/8Wxo91YmuLzzbyiRoaqJE9h8iDlsT7n35GdpoLomHlaB1kFbg== +"@types/react@17.0.68", "@types/react@^17": + version "17.0.68" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.68.tgz#99b17f567e258f5e7be855a281ac67b49a34f9f2" + integrity sha512-y8heXejd/Gi43S28GOqIFmr6BzhLa3anMlPojRu4rHh3MtRrrpB+BtLEcqP3XPO1urXByzBdkOLU7sodYWnpkA== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -875,10 +873,10 @@ jszip "^3.10.1" semver "^7.5.2" -"@vscode/test-web@0.0.46": - version "0.0.46" - resolved "https://registry.yarnpkg.com/@vscode/test-web/-/test-web-0.0.46.tgz#ad42bcaa5fbbf7929dcc629db6285fd7580753ad" - integrity sha512-s5rKDtCvIWN6kJpjXzBoWpLvftjH3m2r2MQNGUGsdY1+mOJ06lbbHeJn+g30+p0ec4Vh7PpBZGECflrRW+oH4Q== +"@vscode/test-web@0.0.47": + version "0.0.47" + resolved "https://registry.yarnpkg.com/@vscode/test-web/-/test-web-0.0.47.tgz#329abf815529c915e2acf6df8f87ffdaf682e33b" + integrity sha512-p1ym6+h30ecTLCrOcAlD7k3tq/AMVWzZjolbU3jcP0QJV0JSj9hp/Pnmfkrw8s2Xo5ywdbABSFSlNPUpZoicOA== dependencies: "@koa/cors" "^4.0.0" "@koa/router" "^12.0.0" @@ -1083,11 +1081,16 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -abbrev@1, abbrev@^1.0.0: +abbrev@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== +abbrev@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf" + integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ== + accepts@^1.3.5: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" @@ -1605,9 +1608,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001541: - version "1.0.30001547" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001547.tgz#d4f92efc488aab3c7f92c738d3977c2a3180472b" - integrity sha512-W7CrtIModMAxobGhz8iXmDfuJiiKg1WADMO/9x7/CLNin5cpSbuBjooyoIUVB5eyCc36QuTVlkVa1iB2S5+/eA== + version "1.0.30001549" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001549.tgz#7d1a3dce7ea78c06ed72c32c2743ea364b3615aa" + integrity sha512-qRp48dPYSCYaP+KurZLhDYdVE+yEyht/3NlmcJgVQ2VMGt6JL36ndQ/7rgspdZsJuxDPFIo/OzBT2+GmIJ53BA== capital-case@^1.0.4: version "1.0.4" @@ -2383,9 +2386,9 @@ deepmerge@^4.2.2: integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== define-data-property@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.0.tgz#0db13540704e1d8d479a0656cf781267531b9451" - integrity sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g== + version "1.1.1" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3" + integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ== dependencies: get-intrinsic "^1.2.1" gopd "^1.0.1" @@ -2588,9 +2591,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.4.535: - version "1.4.548" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.548.tgz#e695d769e0e801fa6d438b63f6bc9b80372000d6" - integrity sha512-R77KD6mXv37DOyKLN/eW1rGS61N6yHOfapNSX9w+y9DdPG83l9Gkuv7qkCFZ4Ta4JPhrjgQfYbv4Y3TnM1Hi2Q== + version "1.4.554" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.554.tgz#04e09c2ee31dc0f1546174033809b54cc372740b" + integrity sha512-Q0umzPJjfBrrj8unkONTgbKQXzXRrH7sVV7D9ea2yBV3Oaogz991yhbpfvo2LMNkJItmruXTEzVpP9cp7vaIiQ== emoji-regex@^8.0.0: version "8.0.0" @@ -3236,9 +3239,9 @@ fork-ts-checker-webpack-plugin@6.5.3: tapable "^1.0.0" fraction.js@^4.3.6: - version "4.3.6" - resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.6.tgz#e9e3acec6c9a28cf7bc36cbe35eea4ceb2c5c92d" - integrity sha512-n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg== + version "4.3.7" + resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7" + integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew== fresh@~0.5.2: version "0.5.2" @@ -3295,9 +3298,9 @@ fsevents@~2.3.2: integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + version "1.1.2" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" + integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== function.prototype.name@^1.1.6: version "1.1.6" @@ -4389,16 +4392,16 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" -license-checker-rseidelsohn@4.2.8: - version "4.2.8" - resolved "https://registry.yarnpkg.com/license-checker-rseidelsohn/-/license-checker-rseidelsohn-4.2.8.tgz#dba4ef59100df8e2fe1f99c3e12473b6f8d56525" - integrity sha512-WVnHC3iJff79mAp+IfAgiBwHXF2Oey/7/XugjTHRcTcufZMSpwky9a+1wyOOOe+0Z3Qo5XK1pVRfLAoOHLOGqA== +license-checker-rseidelsohn@4.2.10: + version "4.2.10" + resolved "https://registry.yarnpkg.com/license-checker-rseidelsohn/-/license-checker-rseidelsohn-4.2.10.tgz#2f08cdf5dd6abae8248359466e04b399294565a1" + integrity sha512-phvcph9WTQ/Kb209kqwLxVA6CV8BAeUnFMIo+I+wBlp74El4ngbMwq49qSqqPYC5bfj49EWBXqwjvTFswGE2Fg== dependencies: chalk "4.1.2" debug "^4.3.4" lodash.clonedeep "^4.5.0" mkdirp "^1.0.4" - nopt "^5.0.0" + nopt "^7.2.0" read-installed-packages "^2.0.1" semver "^7.3.5" spdx-correct "^3.1.1" @@ -4432,7 +4435,7 @@ linkify-it@^3.0.1: lit-element@^4.0.0: version "4.0.0" - resolved "https://registry.npmjs.org/lit-element/-/lit-element-4.0.0.tgz#8343891bc9159a5fcb7f534914b37f2c0161e036" + resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-4.0.0.tgz#8343891bc9159a5fcb7f534914b37f2c0161e036" integrity sha512-N6+f7XgusURHl69DUZU6sTBGlIN+9Ixfs3ykkNDfgfTkDYGGOWwHAYBhDqVswnFGyWgQYR2KiSpu4J76Kccs/A== dependencies: "@lit-labs/ssr-dom-shim" "^1.1.2-pre.0" @@ -4441,14 +4444,14 @@ lit-element@^4.0.0: lit-html@^3.0.0: version "3.0.0" - resolved "https://registry.npmjs.org/lit-html/-/lit-html-3.0.0.tgz#77d6776ee488642c74c5575315ef81aa09d24ea9" + resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-3.0.0.tgz#77d6776ee488642c74c5575315ef81aa09d24ea9" integrity sha512-DNJIE8dNY0dQF2Gs0sdMNUppMQT2/CvV4OVnSdg7BXAsGqkVwsE5bqQ04POfkYH5dBIuGnJYdFz5fYYyNnOxiA== dependencies: "@types/trusted-types" "^2.0.2" lit@3.0.0: version "3.0.0" - resolved "https://registry.npmjs.org/lit/-/lit-3.0.0.tgz#204bd65935892a73670471e893ee8ca55d2f9a3b" + resolved "https://registry.yarnpkg.com/lit/-/lit-3.0.0.tgz#204bd65935892a73670471e893ee8ca55d2f9a3b" integrity sha512-nQ0teRzU1Kdj++VdmttS2WvIen8M79wChJ6guRKIIym2M3Ansg3Adj9O6yuQh2IpjxiUXlNuS81WKlQ4iL3BmA== dependencies: "@lit/reactive-element" "^2.0.0" @@ -4985,9 +4988,9 @@ no-case@^3.0.4: tslib "^2.0.3" node-abi@^3.3.0: - version "3.48.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.48.0.tgz#122d132ae1ac097b0d711144560b17922de026ab" - integrity sha512-uWR/uwQyVV2iN5+Wkf1/oQxOR9YjU7gBclJLg2qK7GDvVohcnY6LaBXKV89N79EQFyN4/e43O32yQYE5QdFYTA== + version "3.50.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.50.0.tgz#bbee6943c8812d20e241539854d7b8003404d917" + integrity sha512-2Gxu7Eq7vnBIRfYSmqPruEllMM14FjOQFJSoqdGWthVn+tmwEXzmdPpya6cvvwf0uZA3F5N1fMFr9mijZBplFA== dependencies: semver "^7.3.5" @@ -5030,13 +5033,6 @@ node-releases@^2.0.13: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d" integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ== -nopt@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" - integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== - dependencies: - abbrev "1" - nopt@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d" @@ -5044,6 +5040,13 @@ nopt@^6.0.0: dependencies: abbrev "^1.0.0" +nopt@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.0.tgz#067378c68116f602f552876194fd11f1292503d7" + integrity sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA== + dependencies: + abbrev "^2.0.0" + normalize-package-data@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e" @@ -5102,9 +5105,9 @@ object-assign@^4.0.1, object-assign@^4.1.1: integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== object-inspect@^1.12.3, object-inspect@^1.9.0: - version "1.12.3" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" - integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== + version "1.13.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.0.tgz#42695d3879e1cd5bda6df5062164d80c996e23e2" + integrity sha512-HQ4J+ic8hKrgIt3mqk6cVOVrW2ozL4KdvHlqpBv9vDYWx9ysAgENAdvy4FoGF+KFdhR7nQTNm5J0ctAeOwn+3g== object-keys@^1.1.1: version "1.1.1" @@ -5438,17 +5441,17 @@ pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -playwright-core@1.38.1: - version "1.38.1" - resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.38.1.tgz#75a3c470aa9576b7d7c4e274de3d79977448ba08" - integrity sha512-tQqNFUKa3OfMf4b2jQ7aGLB8o9bS3bOY0yMEtldtC2+spf8QXG9zvXLTXUeRsoNuxEYMgLYR+NXfAa1rjKRcrg== +playwright-core@1.39.0: + version "1.39.0" + resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.39.0.tgz#efeaea754af4fb170d11845b8da30b2323287c63" + integrity sha512-+k4pdZgs1qiM+OUkSjx96YiKsXsmb59evFoqv8SKO067qBA+Z2s/dCzJij/ZhdQcs2zlTAgRKfeiiLm8PQ2qvw== playwright@^1.38.1: - version "1.38.1" - resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.38.1.tgz#82ecd9bc4f4f64dbeee8a11c31793748e2528130" - integrity sha512-oRMSJmZrOu1FP5iu3UrCx8JEFRIMxLDM0c/3o4bpzU5Tz97BypefWf7TuTNPWeCe279TPal5RtPPZ+9lW/Qkow== + version "1.39.0" + resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.39.0.tgz#184c81cd6478f8da28bcd9e60e94fcebf566e077" + integrity sha512-naE5QT11uC/Oiq0BwZ50gDmy8c8WLPRTEWuSSFVG2egBka/1qMoSqYQcROMT9zLwJ86oPofcTH2jBY/5wWOgIw== dependencies: - playwright-core "1.38.1" + playwright-core "1.39.0" optionalDependencies: fsevents "2.3.2" @@ -6148,9 +6151,9 @@ resolve-pkg-maps@^1.0.0: integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw== resolve@^1.20.0, resolve@^1.22.4, resolve@^1.22.6, resolve@^1.3.3: - version "1.22.6" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.6.tgz#dd209739eca3aef739c626fea1b4f3c506195362" - integrity sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw== + version "1.22.8" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" + integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== dependencies: is-core-module "^2.13.0" path-parse "^1.0.7" @@ -6240,10 +6243,10 @@ sass-loader@13.3.2: dependencies: neo-async "^2.6.2" -sass@1.69.1, sass@^1.7.3: - version "1.69.1" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.1.tgz#659b3b04452245dcf82f731684831e990ddb0c89" - integrity sha512-nc969GvTVz38oqKgYYVHM/Iq7Yl33IILy5uqaH2CWSiSUmRCvw+UR7tA3845Sp4BD5ykCUimvrT3k1EjTwpVUA== +sass@1.69.3, sass@^1.7.3: + version "1.69.3" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.3.tgz#f8a0c488697e6419519834a13335e7b65a609c11" + integrity sha512-X99+a2iGdXkdWn1akFPs0ZmelUzyAQfvqYc2P/MPTrJRuIRoTffGzT9W9nFqG00S+c8hXzVmgxhUuHFdrwxkhQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -6882,9 +6885,9 @@ terser-webpack-plugin@5.3.9, terser-webpack-plugin@^5.3.7: terser "^5.16.8" terser@^5.10.0, terser@^5.15.1, terser@^5.16.8: - version "5.21.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.21.0.tgz#d2b27e92b5e56650bc83b6defa00a110f0b124b2" - integrity sha512-WtnFKrxu9kaoXuiZFSGrcAvvBqAdmKx0SFNmVNYdJamMu9yyN3I/QF0FbH4QcqJQ+y1CJnzxGIKH0cSj+FGYRw== + version "5.22.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.22.0.tgz#4f18103f84c5c9437aafb7a14918273310a8a49d" + integrity sha512-hHZVLgRA2z4NWcN6aS5rQDc+7Dcy58HOf2zbYwmFcQ+ua3h6eEFf5lIDKTzbWwlazPyOZsFQO8V80/IjVNExEw== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -7345,11 +7348,12 @@ webpack-cli@5.1.4: webpack-merge "^5.7.3" webpack-merge@^5.7.3: - version "5.9.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.9.0.tgz#dc160a1c4cf512ceca515cc231669e9ddb133826" - integrity sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg== + version "5.10.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177" + integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA== dependencies: clone-deep "^4.0.1" + flat "^5.0.2" wildcard "^2.0.0" webpack-node-externals@3.0.0: @@ -7375,10 +7379,10 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@5.88.2: - version "5.88.2" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.88.2.tgz#f62b4b842f1c6ff580f3fcb2ed4f0b579f4c210e" - integrity sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ== +webpack@5.89.0: + version "5.89.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.89.0.tgz#56b8bf9a34356e93a6625770006490bf3a7f32dc" + integrity sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.0" From e6b3c96738faddb5c1eb1a16c5226d11074965e4 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 16 Oct 2023 15:18:08 -0400 Subject: [PATCH 0057/1012] Adds `using` support & removes classes for parsers --- .../gutterBlameAnnotationProvider.ts | 2 +- .../gutterChangesAnnotationProvider.ts | 2 +- .../gutterHeatmapBlameAnnotationProvider.ts | 2 +- src/env/node/git/git.ts | 22 +- src/env/node/git/localGitProvider.ts | 90 +- src/git/models/diff.ts | 4 +- src/git/parsers/blameParser.ts | 381 ++++--- src/git/parsers/branchParser.ts | 119 ++- src/git/parsers/diffParser.ts | 34 +- src/git/parsers/logParser.ts | 979 +++++++++--------- src/git/parsers/reflogParser.ts | 219 ++-- src/git/parsers/remoteParser.ts | 121 ++- src/git/parsers/statusParser.ts | 234 ++--- src/git/parsers/tagParser.ts | 101 +- src/git/parsers/treeParser.ts | 67 +- src/git/parsers/worktreeParser.ts | 149 ++- src/system/stopwatch.ts | 66 +- src/webviews/apps/tsconfig.json | 2 +- tsconfig.base.json | 2 +- tsconfig.browser.json | 2 +- 20 files changed, 1272 insertions(+), 1326 deletions(-) diff --git a/src/annotations/gutterBlameAnnotationProvider.ts b/src/annotations/gutterBlameAnnotationProvider.ts index f1e4c06c685e2..b5496f17ca83c 100644 --- a/src/annotations/gutterBlameAnnotationProvider.ts +++ b/src/annotations/gutterBlameAnnotationProvider.ts @@ -48,7 +48,7 @@ export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase { const blame = await this.getBlame(); if (blame == null) return false; - const sw = maybeStopWatch(scope); + using sw = maybeStopWatch(scope); const cfg = configuration.get('blame'); diff --git a/src/annotations/gutterChangesAnnotationProvider.ts b/src/annotations/gutterChangesAnnotationProvider.ts index 6539b0b60149e..e92ed53f18409 100644 --- a/src/annotations/gutterChangesAnnotationProvider.ts +++ b/src/annotations/gutterChangesAnnotationProvider.ts @@ -156,7 +156,7 @@ export class GutterChangesAnnotationProvider extends AnnotationProviderBase(d?: T): d is T => Boolean(d)); if (!diffs?.length) return false; - const sw = maybeStopWatch(scope); + using sw = maybeStopWatch(scope); const decorationsMap = new Map< string, diff --git a/src/annotations/gutterHeatmapBlameAnnotationProvider.ts b/src/annotations/gutterHeatmapBlameAnnotationProvider.ts index 09e6881b03998..d6d9a21bf1d2d 100644 --- a/src/annotations/gutterHeatmapBlameAnnotationProvider.ts +++ b/src/annotations/gutterHeatmapBlameAnnotationProvider.ts @@ -26,7 +26,7 @@ export class GutterHeatmapBlameAnnotationProvider extends BlameAnnotationProvide const blame = await this.getBlame(); if (blame == null) return false; - const sw = maybeStopWatch(scope); + using sw = maybeStopWatch(scope); const decorationsMap = new Map< string, diff --git a/src/env/node/git/git.ts b/src/env/node/git/git.ts index e6caf421e4a08..8d93a4e47add1 100644 --- a/src/env/node/git/git.ts +++ b/src/env/node/git/git.ts @@ -24,11 +24,11 @@ import type { GitDir } from '../../../git/gitProvider'; import type { GitDiffFilter } from '../../../git/models/diff'; import { isUncommitted, isUncommittedStaged, shortenRevision } from '../../../git/models/reference'; import type { GitUser } from '../../../git/models/user'; -import { GitBranchParser } from '../../../git/parsers/branchParser'; -import { GitLogParser } from '../../../git/parsers/logParser'; -import { GitReflogParser } from '../../../git/parsers/reflogParser'; +import { parseGitBranchesDefaultFormat } from '../../../git/parsers/branchParser'; +import { parseGitLogAllFormat, parseGitLogDefaultFormat } from '../../../git/parsers/logParser'; +import { parseGitRefLogDefaultFormat } from '../../../git/parsers/reflogParser'; import { parseGitRemoteUrl } from '../../../git/parsers/remoteParser'; -import { GitTagParser } from '../../../git/parsers/tagParser'; +import { parseGitTagsDefaultFormat } from '../../../git/parsers/tagParser'; import { splitAt } from '../../../system/array'; import { configuration } from '../../../system/configuration'; import { log } from '../../../system/decorators/log'; @@ -1011,7 +1011,7 @@ export class Git { } for_each_ref__branch(repoPath: string, options: { all: boolean } = { all: false }) { - const params = ['for-each-ref', `--format=${GitBranchParser.defaultFormat}`, 'refs/heads']; + const params = ['for-each-ref', `--format=${parseGitBranchesDefaultFormat}`, 'refs/heads']; if (options.all) { params.push('refs/remotes'); } @@ -1045,7 +1045,7 @@ export class Git { }, ) { if (argsOrFormat == null) { - argsOrFormat = ['--name-status', `--format=${all ? GitLogParser.allFormat : GitLogParser.defaultFormat}`]; + argsOrFormat = ['--name-status', `--format=${all ? parseGitLogAllFormat : parseGitLogDefaultFormat}`]; } if (typeof argsOrFormat === 'string') { @@ -1242,7 +1242,7 @@ export class Git { const [file, root] = splitPath(fileName, repoPath, true); if (argsOrFormat == null) { - argsOrFormat = [`--format=${all ? GitLogParser.allFormat : GitLogParser.defaultFormat}`]; + argsOrFormat = [`--format=${all ? parseGitLogAllFormat : parseGitLogDefaultFormat}`]; } if (typeof argsOrFormat === 'string') { @@ -1438,7 +1438,7 @@ export class Git { 'show', '--stdin', '--name-status', - `--format=${GitLogParser.defaultFormat}`, + `--format=${parseGitLogDefaultFormat}`, '--use-mailmap', ); } @@ -1451,7 +1451,7 @@ export class Git { 'log', ...(options?.stdin ? ['--stdin'] : emptyArray), '--name-status', - `--format=${GitLogParser.defaultFormat}`, + `--format=${parseGitLogDefaultFormat}`, '--use-mailmap', ...search, ...(options?.ordering ? [`--${options.ordering}-order`] : emptyArray), @@ -1542,7 +1542,7 @@ export class Git { skip?: number; } = {}, ): Promise { - const params = ['log', '--walk-reflogs', `--format=${GitReflogParser.defaultFormat}`, '--date=iso8601']; + const params = ['log', '--walk-reflogs', `--format=${parseGitRefLogDefaultFormat}`, '--date=iso8601']; if (ordering) { params.push(`--${ordering}-order`); @@ -2139,7 +2139,7 @@ export class Git { } tag(repoPath: string) { - return this.git({ cwd: repoPath }, 'tag', '-l', `--format=${GitTagParser.defaultFormat}`); + return this.git({ cwd: repoPath }, 'tag', '-l', `--format=${parseGitTagsDefaultFormat}`); } worktree__add( diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts index c3509b96a14d6..af4da178d8d12 100644 --- a/src/env/node/git/localGitProvider.ts +++ b/src/env/node/git/localGitProvider.ts @@ -108,9 +108,9 @@ import type { GitTreeEntry } from '../../../git/models/tree'; import type { GitUser } from '../../../git/models/user'; import { isUserMatch } from '../../../git/models/user'; import type { GitWorktree } from '../../../git/models/worktree'; -import { GitBlameParser } from '../../../git/parsers/blameParser'; -import { GitBranchParser } from '../../../git/parsers/branchParser'; -import { parseDiffNameStatusFiles, parseDiffShortStat, parseFileDiff } from '../../../git/parsers/diffParser'; +import { parseGitBlame } from '../../../git/parsers/blameParser'; +import { parseGitBranches } from '../../../git/parsers/branchParser'; +import { parseGitDiffNameStatusFiles, parseGitDiffShortStat, parseGitFileDiff } from '../../../git/parsers/diffParser'; import { createLogParserSingle, createLogParserWithFiles, @@ -119,15 +119,20 @@ import { getGraphStatsParser, getRefAndDateParser, getRefParser, - GitLogParser, LogType, + parseGitLog, + parseGitLogAllFormat, + parseGitLogDefaultFormat, + parseGitLogSimple, + parseGitLogSimpleFormat, + parseGitLogSimpleRenamed, } from '../../../git/parsers/logParser'; -import { GitReflogParser } from '../../../git/parsers/reflogParser'; -import { GitRemoteParser } from '../../../git/parsers/remoteParser'; -import { GitStatusParser } from '../../../git/parsers/statusParser'; -import { GitTagParser } from '../../../git/parsers/tagParser'; -import { GitTreeParser } from '../../../git/parsers/treeParser'; -import { GitWorktreeParser } from '../../../git/parsers/worktreeParser'; +import { parseGitRefLog } from '../../../git/parsers/reflogParser'; +import { parseGitRemotes } from '../../../git/parsers/remoteParser'; +import { parseGitStatus } from '../../../git/parsers/statusParser'; +import { parseGitTags } from '../../../git/parsers/tagParser'; +import { parseGitTree } from '../../../git/parsers/treeParser'; +import { parseGitWorktrees } from '../../../git/parsers/worktreeParser'; import { getRemoteProviderMatcher, loadRemoteProviders } from '../../../git/remotes/remoteProviders'; import type { GitSearch, GitSearchResultData, GitSearchResults, SearchQuery } from '../../../git/search'; import { getGitArgsFromSearchQuery, getSearchQueryComparisonKey } from '../../../git/search'; @@ -954,7 +959,7 @@ export class LocalGitProvider implements GitProvider, Disposable { // Now check if that commit had any renames data = await this.git.log__file(repoPath, '.', ref, { - argsOrFormat: GitLogParser.simpleFormat, + argsOrFormat: parseGitLogSimpleFormat, fileMode: 'simple', filters: ['R', 'C', 'D'], limit: 1, @@ -962,7 +967,7 @@ export class LocalGitProvider implements GitProvider, Disposable { }); if (data == null || data.length === 0) break; - const [foundRef, foundFile, foundStatus] = GitLogParser.parseSimpleRenamed(data, relativePath); + const [foundRef, foundFile, foundStatus] = parseGitLogSimpleRenamed(data, relativePath); if (foundStatus === 'D' && foundFile != null) return undefined; if (foundRef == null || foundFile == null) break; @@ -1455,7 +1460,7 @@ export class LocalGitProvider implements GitProvider, Disposable { args: configuration.get('advanced.blame.customArguments'), ignoreWhitespace: configuration.get('blame.ignoreWhitespace'), }); - const blame = GitBlameParser.parse(this.container, data, root, await this.getCurrentUser(root)); + const blame = parseGitBlame(this.container, data, root, await this.getCurrentUser(root)); return blame; } catch (ex) { // Trap and cache expected blame errors @@ -1536,7 +1541,7 @@ export class LocalGitProvider implements GitProvider, Disposable { correlationKey: `:${key}`, ignoreWhitespace: configuration.get('blame.ignoreWhitespace'), }); - const blame = GitBlameParser.parse(this.container, data, root, await this.getCurrentUser(root)); + const blame = parseGitBlame(this.container, data, root, await this.getCurrentUser(root)); return blame; } catch (ex) { // Trap and cache expected blame errors @@ -1601,7 +1606,7 @@ export class LocalGitProvider implements GitProvider, Disposable { startLine: lineToBlame, endLine: lineToBlame, }); - const blame = GitBlameParser.parse(this.container, data, root, await this.getCurrentUser(root)); + const blame = parseGitBlame(this.container, data, root, await this.getCurrentUser(root)); if (blame == null) return undefined; return { @@ -1652,7 +1657,7 @@ export class LocalGitProvider implements GitProvider, Disposable { startLine: lineToBlame, endLine: lineToBlame, }); - const blame = GitBlameParser.parse(this.container, data, root, await this.getCurrentUser(root)); + const blame = parseGitBlame(this.container, data, root, await this.getCurrentUser(root)); if (blame == null) return undefined; return { @@ -1819,7 +1824,7 @@ export class LocalGitProvider implements GitProvider, Disposable { return current != null ? { values: [current] } : emptyPagedResult; } - return { values: GitBranchParser.parse(this.container, data, repoPath!) }; + return { values: parseGitBranches(this.container, data, repoPath!) }; } catch (ex) { this._branchesCache.delete(repoPath!); @@ -1856,7 +1861,7 @@ export class LocalGitProvider implements GitProvider, Disposable { const data = await this.git.diff__shortstat(repoPath, ref); if (!data) return undefined; - return parseDiffShortStat(data); + return parseGitDiffShortStat(data); } @log() @@ -2752,7 +2757,7 @@ export class LocalGitProvider implements GitProvider, Disposable { similarityThreshold: configuration.get('advanced.similarityThreshold'), }); - const diff = parseFileDiff(data); + const diff = parseGitFileDiff(data); return diff; } catch (ex) { // Trap and cache expected diff errors @@ -2839,7 +2844,7 @@ export class LocalGitProvider implements GitProvider, Disposable { similarityThreshold: configuration.get('advanced.similarityThreshold'), }); - const diff = parseFileDiff(data); + const diff = parseGitFileDiff(data); return diff; } catch (ex) { // Trap and cache expected diff errors @@ -2895,7 +2900,7 @@ export class LocalGitProvider implements GitProvider, Disposable { }); if (!data) return undefined; - const files = parseDiffNameStatusFiles(data, repoPath); + const files = parseGitDiffNameStatusFiles(data, repoPath); return files == null || files.length === 0 ? undefined : files; } catch (ex) { return undefined; @@ -2911,7 +2916,7 @@ export class LocalGitProvider implements GitProvider, Disposable { const data = await this.git.show__name_status(root, relativePath, ref); if (!data) return undefined; - const files = parseDiffNameStatusFiles(data, repoPath); + const files = parseGitDiffNameStatusFiles(data, repoPath); if (files == null || files.length === 0) return undefined; return files[0]; @@ -2986,7 +2991,7 @@ export class LocalGitProvider implements GitProvider, Disposable { const similarityThreshold = configuration.get('advanced.similarityThreshold'); const args = [ - `--format=${options?.all ? GitLogParser.allFormat : GitLogParser.defaultFormat}`, + `--format=${options?.all ? parseGitLogAllFormat : parseGitLogDefaultFormat}`, `-M${similarityThreshold == null ? '' : `${similarityThreshold}%`}`, '-m', ]; @@ -3076,7 +3081,7 @@ export class LocalGitProvider implements GitProvider, Disposable { // ); // } - const log = GitLogParser.parse( + const log = parseGitLog( this.container, data, LogType.Log, @@ -3461,7 +3466,7 @@ export class LocalGitProvider implements GitProvider, Disposable { startLine: range == null ? undefined : range.start.line + 1, endLine: range == null ? undefined : range.end.line + 1, }); - const log = GitLogParser.parse( + const log = parseGitLog( this.container, data, // If this is the log of a folder, parse it as a normal log rather than a file log @@ -3815,7 +3820,7 @@ export class LocalGitProvider implements GitProvider, Disposable { const relativePath = this.getRelativePath(uri, repoPath); let data = await this.git.log__file(repoPath, relativePath, ref, { - argsOrFormat: GitLogParser.simpleFormat, + argsOrFormat: parseGitLogSimpleFormat, fileMode: 'simple', filters: filters, limit: skip + 1, @@ -3825,11 +3830,11 @@ export class LocalGitProvider implements GitProvider, Disposable { }); if (data == null || data.length === 0) return undefined; - const [nextRef, file, status] = GitLogParser.parseSimple(data, skip); + const [nextRef, file, status] = parseGitLogSimple(data, skip); // If the file was deleted, check for a possible rename if (status === 'D') { data = await this.git.log__file(repoPath, '.', nextRef, { - argsOrFormat: GitLogParser.simpleFormat, + argsOrFormat: parseGitLogSimpleFormat, fileMode: 'simple', filters: ['R', 'C'], limit: 1, @@ -3840,7 +3845,7 @@ export class LocalGitProvider implements GitProvider, Disposable { return GitUri.fromFile(file ?? relativePath, repoPath, nextRef); } - const [nextRenamedRef, renamedFile] = GitLogParser.parseSimpleRenamed(data, file ?? relativePath); + const [nextRenamedRef, renamedFile] = parseGitLogSimpleRenamed(data, file ?? relativePath); return GitUri.fromFile( renamedFile ?? file ?? relativePath, repoPath, @@ -4085,7 +4090,7 @@ export class LocalGitProvider implements GitProvider, Disposable { let data; try { data = await this.git.log__file(repoPath, relativePath, ref, { - argsOrFormat: GitLogParser.simpleFormat, + argsOrFormat: parseGitLogSimpleFormat, fileMode: 'simple', limit: skip + 2, ordering: configuration.get('advanced.commitOrdering'), @@ -4113,7 +4118,7 @@ export class LocalGitProvider implements GitProvider, Disposable { } if (data == null || data.length === 0) return undefined; - const [previousRef, file] = GitLogParser.parseSimple(data, skip, ref); + const [previousRef, file] = parseGitLogSimple(data, skip, ref); // If the previous ref matches the ref we asked for assume we are at the end of the history if (ref != null && ref === previousRef) return undefined; @@ -4143,7 +4148,7 @@ export class LocalGitProvider implements GitProvider, Disposable { }); if (data == null) return undefined; - const reflog = GitReflogParser.parse(data, repoPath, reflogCommands, limit, limit * 100); + const reflog = parseGitRefLog(data, repoPath, reflogCommands, limit, limit * 100); if (reflog?.hasMore) { reflog.more = this.getReflogMoreFn(reflog, options); } @@ -4209,13 +4214,11 @@ export class LocalGitProvider implements GitProvider, Disposable { try { const data = await this.git.remote(repoPath!); - const remotes = GitRemoteParser.parse( + const remotes = parseGitRemotes( data, repoPath!, getRemoteProviderMatcher(this.container, providers), ); - if (remotes == null) return []; - return remotes; } catch (ex) { this._remotesCache.delete(repoPath!); @@ -4341,7 +4344,7 @@ export class LocalGitProvider implements GitProvider, Disposable { similarityThreshold: configuration.get('advanced.similarityThreshold'), }); - const status = GitStatusParser.parse(data, root, porcelainVersion); + const status = parseGitStatus(data, root, porcelainVersion); return status?.files?.[0]; } @@ -4355,7 +4358,7 @@ export class LocalGitProvider implements GitProvider, Disposable { similarityThreshold: configuration.get('advanced.similarityThreshold'), }); - const status = GitStatusParser.parse(data, root, porcelainVersion); + const status = parseGitStatus(data, root, porcelainVersion); return status?.files ?? []; } @@ -4368,7 +4371,7 @@ export class LocalGitProvider implements GitProvider, Disposable { const data = await this.git.status(repoPath, porcelainVersion, { similarityThreshold: configuration.get('advanced.similarityThreshold'), }); - const status = GitStatusParser.parse(data, repoPath, porcelainVersion); + const status = parseGitStatus(data, repoPath, porcelainVersion); if (status?.detached) { const rebaseStatus = await this.getRebaseStatus(repoPath); @@ -4399,7 +4402,7 @@ export class LocalGitProvider implements GitProvider, Disposable { async function load(this: LocalGitProvider): Promise> { try { const data = await this.git.tag(repoPath!); - return { values: GitTagParser.parse(data, repoPath!) ?? [] }; + return { values: parseGitTags(data, repoPath!) }; } catch (ex) { this._tagsCache.delete(repoPath!); @@ -4436,8 +4439,7 @@ export class LocalGitProvider implements GitProvider, Disposable { const [relativePath, root] = splitPath(path, repoPath); const data = await this.git.ls_tree(root, ref, relativePath); - const trees = GitTreeParser.parse(data); - return trees?.length ? trees[0] : undefined; + return parseGitTree(data)[0]; } @log() @@ -4445,7 +4447,7 @@ export class LocalGitProvider implements GitProvider, Disposable { if (repoPath == null) return []; const data = await this.git.ls_tree(repoPath, ref); - return GitTreeParser.parse(data) ?? []; + return parseGitTree(data); } @log({ args: { 1: false } }) @@ -4811,7 +4813,7 @@ export class LocalGitProvider implements GitProvider, Disposable { shas: shas, stdin: stdin, }); - const log = GitLogParser.parse( + const log = parseGitLog( this.container, data, LogType.Log, @@ -5212,7 +5214,7 @@ export class LocalGitProvider implements GitProvider, Disposable { ); const data = await this.git.worktree__list(repoPath); - return GitWorktreeParser.parse(data, repoPath); + return parseGitWorktrees(data, repoPath); } // eslint-disable-next-line @typescript-eslint/require-await diff --git a/src/git/models/diff.ts b/src/git/models/diff.ts index 7b202d8a38ac4..fa770c8b33444 100644 --- a/src/git/models/diff.ts +++ b/src/git/models/diff.ts @@ -1,4 +1,4 @@ -import { parseDiffHunk } from '../parsers/diffParser'; +import { parseGitDiffHunk } from '../parsers/diffParser'; export interface GitDiffLine { line: string; @@ -35,7 +35,7 @@ export class GitDiffHunk { private parsedHunk: { lines: GitDiffHunkLine[]; state: 'added' | 'changed' | 'removed' } | undefined; private parseHunk() { if (this.parsedHunk == null) { - this.parsedHunk = parseDiffHunk(this); + this.parsedHunk = parseGitDiffHunk(this); } return this.parsedHunk; } diff --git a/src/git/parsers/blameParser.ts b/src/git/parsers/blameParser.ts index b673a078674ec..60d4d69193f8b 100644 --- a/src/git/parsers/blameParser.ts +++ b/src/git/parsers/blameParser.ts @@ -1,5 +1,5 @@ import type { Container } from '../../container'; -import { debug } from '../../system/decorators/log'; +import { maybeStopWatch } from '../../system/stopwatch'; import { getLines } from '../../system/string'; import type { GitBlame, GitBlameAuthor } from '../models/blame'; import type { GitCommitLine } from '../models/commit'; @@ -34,228 +34,223 @@ interface BlameEntry { summary?: string; } -// eslint-disable-next-line @typescript-eslint/no-extraneous-class -export class GitBlameParser { - @debug({ args: false, singleLine: true }) - static parse( - container: Container, - data: string, - repoPath: string, - currentUser: GitUser | undefined, - ): GitBlame | undefined { - if (!data) return undefined; - - const authors = new Map(); - const commits = new Map(); - const lines: GitCommitLine[] = []; - - let entry: BlameEntry | undefined = undefined; - let key: string; - let line: string; - let lineParts: string[]; - - for (line of getLines(data)) { - lineParts = line.split(' '); - if (lineParts.length < 2) continue; - - [key] = lineParts; - if (entry == null) { - entry = { - sha: key, - originalLine: parseInt(lineParts[1], 10), - line: parseInt(lineParts[2], 10), - lineCount: parseInt(lineParts[3], 10), - } as unknown as BlameEntry; - - continue; - } +export function parseGitBlame( + container: Container, + data: string, + repoPath: string, + currentUser: GitUser | undefined, +): GitBlame | undefined { + using sw = maybeStopWatch(`Git.parseBlame(${repoPath})`, { log: false, logLevel: 'debug' }); + if (!data) return undefined; + + const authors = new Map(); + const commits = new Map(); + const lines: GitCommitLine[] = []; + + let entry: BlameEntry | undefined = undefined; + let key: string; + let line: string; + let lineParts: string[]; + + for (line of getLines(data)) { + lineParts = line.split(' '); + if (lineParts.length < 2) continue; + + [key] = lineParts; + if (entry == null) { + entry = { + sha: key, + originalLine: parseInt(lineParts[1], 10), + line: parseInt(lineParts[2], 10), + lineCount: parseInt(lineParts[3], 10), + } as unknown as BlameEntry; + + continue; + } - switch (key) { - case 'author': - if (entry.sha === uncommitted) { - entry.author = 'You'; - } else { - entry.author = line.slice(key.length + 1).trim(); - } - break; + switch (key) { + case 'author': + if (entry.sha === uncommitted) { + entry.author = 'You'; + } else { + entry.author = line.slice(key.length + 1).trim(); + } + break; - case 'author-mail': { - if (entry.sha === uncommitted) { - entry.authorEmail = currentUser?.email; - continue; - } + case 'author-mail': { + if (entry.sha === uncommitted) { + entry.authorEmail = currentUser?.email; + continue; + } - entry.authorEmail = line.slice(key.length + 1).trim(); - const start = entry.authorEmail.indexOf('<'); - if (start >= 0) { - const end = entry.authorEmail.indexOf('>', start); - if (end > start) { - entry.authorEmail = entry.authorEmail.substring(start + 1, end); - } else { - entry.authorEmail = entry.authorEmail.substring(start + 1); - } + entry.authorEmail = line.slice(key.length + 1).trim(); + const start = entry.authorEmail.indexOf('<'); + if (start >= 0) { + const end = entry.authorEmail.indexOf('>', start); + if (end > start) { + entry.authorEmail = entry.authorEmail.substring(start + 1, end); + } else { + entry.authorEmail = entry.authorEmail.substring(start + 1); } + } - break; + break; + } + case 'author-time': + entry.authorDate = lineParts[1]; + break; + + case 'author-tz': + entry.authorTimeZone = lineParts[1]; + break; + + case 'committer': + if (isUncommitted(entry.sha)) { + entry.committer = 'You'; + } else { + entry.committer = line.slice(key.length + 1).trim(); } - case 'author-time': - entry.authorDate = lineParts[1]; - break; + break; - case 'author-tz': - entry.authorTimeZone = lineParts[1]; - break; + case 'committer-mail': { + if (isUncommitted(entry.sha)) { + entry.committerEmail = currentUser?.email; + continue; + } - case 'committer': - if (isUncommitted(entry.sha)) { - entry.committer = 'You'; + entry.committerEmail = line.slice(key.length + 1).trim(); + const start = entry.committerEmail.indexOf('<'); + if (start >= 0) { + const end = entry.committerEmail.indexOf('>', start); + if (end > start) { + entry.committerEmail = entry.committerEmail.substring(start + 1, end); } else { - entry.committer = line.slice(key.length + 1).trim(); - } - break; - - case 'committer-mail': { - if (isUncommitted(entry.sha)) { - entry.committerEmail = currentUser?.email; - continue; + entry.committerEmail = entry.committerEmail.substring(start + 1); } - - entry.committerEmail = line.slice(key.length + 1).trim(); - const start = entry.committerEmail.indexOf('<'); - if (start >= 0) { - const end = entry.committerEmail.indexOf('>', start); - if (end > start) { - entry.committerEmail = entry.committerEmail.substring(start + 1, end); - } else { - entry.committerEmail = entry.committerEmail.substring(start + 1); - } - } - - break; } - case 'committer-time': - entry.committerDate = lineParts[1]; - break; - case 'committer-tz': - entry.committerTimeZone = lineParts[1]; - break; + break; + } + case 'committer-time': + entry.committerDate = lineParts[1]; + break; + + case 'committer-tz': + entry.committerTimeZone = lineParts[1]; + break; - case 'summary': - entry.summary = line.slice(key.length + 1).trim(); - break; + case 'summary': + entry.summary = line.slice(key.length + 1).trim(); + break; - case 'previous': - entry.previousSha = lineParts[1]; - entry.previousPath = lineParts.slice(2).join(' '); - break; + case 'previous': + entry.previousSha = lineParts[1]; + entry.previousPath = lineParts.slice(2).join(' '); + break; - case 'filename': - // Don't trim to allow spaces in the filename - entry.path = line.slice(key.length + 1); + case 'filename': + // Don't trim to allow spaces in the filename + entry.path = line.slice(key.length + 1); - // Since the filename marks the end of a commit, parse the entry and clear it for the next - GitBlameParser.parseEntry(container, entry, repoPath, commits, authors, lines, currentUser); + // Since the filename marks the end of a commit, parse the entry and clear it for the next + parseBlameEntry(container, entry, repoPath, commits, authors, lines, currentUser); - entry = undefined; - break; + entry = undefined; + break; - default: - break; - } + default: + break; } + } - for (const [, c] of commits) { - if (!c.author.name) continue; + for (const [, c] of commits) { + if (!c.author.name) continue; - const author = authors.get(c.author.name); - if (author == undefined) return undefined; + const author = authors.get(c.author.name); + if (author == undefined) return undefined; - author.lineCount += c.lines.length; - } + author.lineCount += c.lines.length; + } - const sortedAuthors = new Map([...authors.entries()].sort((a, b) => b[1].lineCount - a[1].lineCount)); + const sortedAuthors = new Map([...authors.entries()].sort((a, b) => b[1].lineCount - a[1].lineCount)); - const blame: GitBlame = { - repoPath: repoPath, - authors: sortedAuthors, - commits: commits, - lines: lines, - }; - return blame; - } + sw?.stop({ suffix: ` parsed ${lines.length} lines, ${commits.size} commits` }); - private static parseEntry( - container: Container, - entry: BlameEntry, - repoPath: string, - commits: Map, - authors: Map, - lines: GitCommitLine[], - currentUser: { name?: string; email?: string } | undefined, - ) { - let commit = commits.get(entry.sha); - if (commit == null) { - if (entry.author != null) { - if ( - currentUser != null && - // Name or e-mail is configured - (currentUser.name != null || currentUser.email != null) && - // Match on name if configured - (currentUser.name == null || currentUser.name === entry.author) && - // Match on email if configured - (currentUser.email == null || currentUser.email === entry.authorEmail) - ) { - entry.author = 'You'; - } + const blame: GitBlame = { + repoPath: repoPath, + authors: sortedAuthors, + commits: commits, + lines: lines, + }; + return blame; +} - let author = authors.get(entry.author); - if (author == null) { - author = { - name: entry.author, - lineCount: 0, - }; - authors.set(entry.author, author); - } +function parseBlameEntry( + container: Container, + entry: BlameEntry, + repoPath: string, + commits: Map, + authors: Map, + lines: GitCommitLine[], + currentUser: { name?: string; email?: string } | undefined, +) { + let commit = commits.get(entry.sha); + if (commit == null) { + if (entry.author != null) { + if ( + currentUser != null && + // Name or e-mail is configured + (currentUser.name != null || currentUser.email != null) && + // Match on name if configured + (currentUser.name == null || currentUser.name === entry.author) && + // Match on email if configured + (currentUser.email == null || currentUser.email === entry.authorEmail) + ) { + entry.author = 'You'; } - commit = new GitCommit( - container, - repoPath, - entry.sha, - new GitCommitIdentity(entry.author, entry.authorEmail, new Date((entry.authorDate as any) * 1000)), - new GitCommitIdentity( - entry.committer, - entry.committerEmail, - new Date((entry.committerDate as any) * 1000), - ), - entry.summary!, - [], - undefined, - new GitFileChange( - repoPath, - entry.path, - GitFileIndexStatus.Modified, - entry.previousPath && entry.previousPath !== entry.path ? entry.previousPath : undefined, - entry.previousSha, - ), - undefined, - [], - ); - - commits.set(entry.sha, commit); + let author = authors.get(entry.author); + if (author == null) { + author = { + name: entry.author, + lineCount: 0, + }; + authors.set(entry.author, author); + } } - for (let i = 0, len = entry.lineCount; i < len; i++) { - const line: GitCommitLine = { - sha: entry.sha, - previousSha: commit.file!.previousSha, - originalLine: entry.originalLine + i, - line: entry.line + i, - }; + commit = new GitCommit( + container, + repoPath, + entry.sha, + new GitCommitIdentity(entry.author, entry.authorEmail, new Date((entry.authorDate as any) * 1000)), + new GitCommitIdentity(entry.committer, entry.committerEmail, new Date((entry.committerDate as any) * 1000)), + entry.summary!, + [], + undefined, + new GitFileChange( + repoPath, + entry.path, + GitFileIndexStatus.Modified, + entry.previousPath && entry.previousPath !== entry.path ? entry.previousPath : undefined, + entry.previousSha, + ), + undefined, + [], + ); + + commits.set(entry.sha, commit); + } - commit.lines.push(line); - lines[line.line - 1] = line; - } + for (let i = 0, len = entry.lineCount; i < len; i++) { + const line: GitCommitLine = { + sha: entry.sha, + previousSha: commit.file!.previousSha, + originalLine: entry.originalLine + i, + line: entry.line + i, + }; + + commit.lines.push(line); + lines[line.line - 1] = line; } } diff --git a/src/git/parsers/branchParser.ts b/src/git/parsers/branchParser.ts index 96bc889c90688..ffb1199a1b9d6 100644 --- a/src/git/parsers/branchParser.ts +++ b/src/git/parsers/branchParser.ts @@ -1,5 +1,5 @@ import type { Container } from '../../container'; -import { debug } from '../../system/decorators/log'; +import { maybeStopWatch } from '../../system/stopwatch'; import { GitBranch } from '../models/branch'; const branchWithTrackingRegex = @@ -9,73 +9,72 @@ const branchWithTrackingRegex = const lb = '%3c'; // `%${'<'.charCodeAt(0).toString(16)}`; const rb = '%3e'; // `%${'>'.charCodeAt(0).toString(16)}`; -// eslint-disable-next-line @typescript-eslint/no-extraneous-class -export class GitBranchParser { - static defaultFormat = [ - `${lb}h${rb}%(HEAD)`, // HEAD indicator - `${lb}n${rb}%(refname)`, // branch name - `${lb}u${rb}%(upstream:short)`, // branch upstream - `${lb}t${rb}%(upstream:track)`, // branch upstream tracking state - `${lb}r${rb}%(objectname)`, // ref - `${lb}d${rb}%(committerdate:iso8601)`, // committer date - ].join(''); +export const parseGitBranchesDefaultFormat = [ + `${lb}h${rb}%(HEAD)`, // HEAD indicator + `${lb}n${rb}%(refname)`, // branch name + `${lb}u${rb}%(upstream:short)`, // branch upstream + `${lb}t${rb}%(upstream:track)`, // branch upstream tracking state + `${lb}r${rb}%(objectname)`, // ref + `${lb}d${rb}%(committerdate:iso8601)`, // committer date +].join(''); - @debug({ args: false, singleLine: true }) - static parse(container: Container, data: string, repoPath: string): GitBranch[] { - const branches: GitBranch[] = []; +export function parseGitBranches(container: Container, data: string, repoPath: string): GitBranch[] { + using sw = maybeStopWatch(`Git.parseBranches(${repoPath})`, { log: false, logLevel: 'debug' }); - if (!data) return branches; + const branches: GitBranch[] = []; + if (!data) return branches; - let current; - let name; - let upstream; - let ahead; - let behind; - let missing; - let ref; - let date; + let current; + let name; + let upstream; + let ahead; + let behind; + let missing; + let ref; + let date; - let remote; + let remote; - let match; - do { - match = branchWithTrackingRegex.exec(data); - if (match == null) break; + let match; + do { + match = branchWithTrackingRegex.exec(data); + if (match == null) break; - [, current, name, upstream, ahead, behind, missing, ref, date] = match; + [, current, name, upstream, ahead, behind, missing, ref, date] = match; - if (name.startsWith('refs/remotes/')) { - // Strip off refs/remotes/ - name = name.substr(13); - if (name.endsWith('/HEAD')) continue; + if (name.startsWith('refs/remotes/')) { + // Strip off refs/remotes/ + name = name.substr(13); + if (name.endsWith('/HEAD')) continue; - remote = true; - } else { - // Strip off refs/heads/ - name = name.substr(11); - remote = false; - } + remote = true; + } else { + // Strip off refs/heads/ + name = name.substr(11); + remote = false; + } - branches.push( - new GitBranch( - container, - repoPath, - name, - remote, - current.charCodeAt(0) === 42, // '*', - date ? new Date(date) : undefined, - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - ref == null || ref.length === 0 ? undefined : ` ${ref}`.substr(1), - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - upstream == null || upstream.length === 0 - ? undefined - : { name: ` ${upstream}`.substr(1), missing: Boolean(missing) }, - Number(ahead) || 0, - Number(behind) || 0, - ), - ); - } while (true); + branches.push( + new GitBranch( + container, + repoPath, + name, + remote, + current.charCodeAt(0) === 42, // '*', + date ? new Date(date) : undefined, + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + ref == null || ref.length === 0 ? undefined : ` ${ref}`.substr(1), + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + upstream == null || upstream.length === 0 + ? undefined + : { name: ` ${upstream}`.substr(1), missing: Boolean(missing) }, + Number(ahead) || 0, + Number(behind) || 0, + ), + ); + } while (true); - return branches; - } + sw?.stop({ suffix: ` parsed ${branches.length} branches` }); + + return branches; } diff --git a/src/git/parsers/diffParser.ts b/src/git/parsers/diffParser.ts index 915a3aa4d5175..12384141d1c85 100644 --- a/src/git/parsers/diffParser.ts +++ b/src/git/parsers/diffParser.ts @@ -1,5 +1,5 @@ import { maybeStopWatch } from '../../system/stopwatch'; -import { getLines, pluralize } from '../../system/string'; +import { getLines } from '../../system/string'; import type { GitDiffFile, GitDiffHunkLine, GitDiffLine, GitDiffShortStat } from '../models/diff'; import { GitDiffHunk } from '../models/diff'; import type { GitFile, GitFileStatus } from '../models/file'; @@ -7,11 +7,10 @@ import type { GitFile, GitFileStatus } from '../models/file'; const shortStatDiffRegex = /(\d+)\s+files? changed(?:,\s+(\d+)\s+insertions?\(\+\))?(?:,\s+(\d+)\s+deletions?\(-\))?/; const unifiedDiffRegex = /^@@ -([\d]+)(?:,([\d]+))? \+([\d]+)(?:,([\d]+))? @@(?:.*?)\n([\s\S]*?)(?=^@@)/gm; -export function parseFileDiff(data: string, includeContents: boolean = false): GitDiffFile | undefined { +export function parseGitFileDiff(data: string, includeContents: boolean = false): GitDiffFile | undefined { + using sw = maybeStopWatch('Git.parseFileDiff', { log: false, logLevel: 'debug' }); if (!data) return undefined; - const sw = maybeStopWatch('parseFileDiff', { log: false, logLevel: 'debug' }); - const hunks: GitDiffHunk[] = []; let previousStart; @@ -54,7 +53,7 @@ export function parseFileDiff(data: string, includeContents: boolean = false): G ); } while (true); - sw?.stop({ suffix: ` parsed ${pluralize('hunk', hunks.length)}` }); + sw?.stop({ suffix: ` parsed ${hunks.length} hunks` }); if (!hunks.length) return undefined; @@ -65,8 +64,11 @@ export function parseFileDiff(data: string, includeContents: boolean = false): G return diff; } -export function parseDiffHunk(hunk: GitDiffHunk): { lines: GitDiffHunkLine[]; state: 'added' | 'changed' | 'removed' } { - const sw = maybeStopWatch('parseDiffHunk', { log: false, logLevel: 'debug' }); +export function parseGitDiffHunk(hunk: GitDiffHunk): { + lines: GitDiffHunkLine[]; + state: 'added' | 'changed' | 'removed'; +} { + using sw = maybeStopWatch('Git.parseDiffHunk', { log: false, logLevel: 'debug' }); const currentStart = hunk.current.position.start; const previousStart = hunk.previous.position.start; @@ -140,7 +142,7 @@ export function parseDiffHunk(hunk: GitDiffHunk): { lines: GitDiffHunkLine[]; st }); } - sw?.stop({ suffix: ` parsed ${pluralize('line', hunkLines.length)}` }); + sw?.stop({ suffix: ` parsed ${hunkLines.length} hunk lines` }); return { lines: hunkLines, @@ -148,11 +150,10 @@ export function parseDiffHunk(hunk: GitDiffHunk): { lines: GitDiffHunkLine[]; st }; } -export function parseDiffNameStatusFiles(data: string, repoPath: string): GitFile[] | undefined { +export function parseGitDiffNameStatusFiles(data: string, repoPath: string): GitFile[] | undefined { + using sw = maybeStopWatch('Git.parseDiffNameStatusFiles', { log: false, logLevel: 'debug' }); if (!data) return undefined; - const sw = maybeStopWatch('parseDiffNameStatusFiles', { log: false, logLevel: 'debug' }); - const files: GitFile[] = []; let status; @@ -172,16 +173,15 @@ export function parseDiffNameStatusFiles(data: string, repoPath: string): GitFil }); } - sw?.stop({ suffix: ` parsed ${pluralize('file', files.length)}` }); + sw?.stop({ suffix: ` parsed ${files.length} files` }); return files; } -export function parseDiffShortStat(data: string): GitDiffShortStat | undefined { +export function parseGitDiffShortStat(data: string): GitDiffShortStat | undefined { + using sw = maybeStopWatch('Git.parseDiffShortStat', { log: false, logLevel: 'debug' }); if (!data) return undefined; - const sw = maybeStopWatch('parseDiffShortStat', { log: false, logLevel: 'debug' }); - const match = shortStatDiffRegex.exec(data); if (match == null) return undefined; @@ -194,9 +194,7 @@ export function parseDiffShortStat(data: string): GitDiffShortStat | undefined { }; sw?.stop({ - suffix: ` parsed ${pluralize('file', diffShortStat.changedFiles)}, +${diffShortStat.additions} -${ - diffShortStat.deletions - }`, + suffix: ` parsed ${diffShortStat.changedFiles} files, +${diffShortStat.additions} -${diffShortStat.deletions}`, }); return diffShortStat; diff --git a/src/git/parsers/logParser.ts b/src/git/parsers/logParser.ts index c47af411e93da..2a57321804bdc 100644 --- a/src/git/parsers/logParser.ts +++ b/src/git/parsers/logParser.ts @@ -1,8 +1,8 @@ import type { Range } from 'vscode'; import type { Container } from '../../container'; import { filterMap } from '../../system/array'; -import { debug } from '../../system/decorators/log'; import { normalizePath, relative } from '../../system/path'; +import { maybeStopWatch } from '../../system/stopwatch'; import { getLines } from '../../system/string'; import type { GitCommitLine, GitStashCommit } from '../models/commit'; import { GitCommit, GitCommitIdentity } from '../models/commit'; @@ -363,581 +363,548 @@ export function createLogParserWithStats>( }); } -// eslint-disable-next-line @typescript-eslint/no-extraneous-class -export class GitLogParser { - // private static _defaultParser: ParserWithFiles<{ - // sha: string; - // author: string; - // authorEmail: string; - // authorDate: string; - // committer: string; - // committerEmail: string; - // committerDate: string; - // message: string; - // parents: string[]; - // }>; - // static get defaultParser() { - // if (this._defaultParser == null) { - // this._defaultParser = GitLogParser.createWithFiles({ - // sha: '%H', - // author: '%aN', - // authorEmail: '%aE', - // authorDate: '%at', - // committer: '%cN', - // committerEmail: '%cE', - // committerDate: '%ct', - // message: '%B', - // parents: '%P', - // }); - // } - // return this._defaultParser; - // } - - static allFormat = [ - `${lb}${sl}f${rb}`, - `${lb}r${rb}${sp}%H`, // ref - `${lb}a${rb}${sp}%aN`, // author - `${lb}e${rb}${sp}%aE`, // author email - `${lb}d${rb}${sp}%at`, // author date - `${lb}n${rb}${sp}%cN`, // committer - `${lb}m${rb}${sp}%cE`, // committer email - `${lb}c${rb}${sp}%ct`, // committer date - `${lb}p${rb}${sp}%P`, // parents - `${lb}t${rb}${sp}%D`, // tips - `${lb}s${rb}`, - '%B', // summary - `${lb}${sl}s${rb}`, - `${lb}f${rb}`, - ].join('%n'); - - static defaultFormat = [ - `${lb}${sl}f${rb}`, - `${lb}r${rb}${sp}%H`, // ref - `${lb}a${rb}${sp}%aN`, // author - `${lb}e${rb}${sp}%aE`, // author email - `${lb}d${rb}${sp}%at`, // author date - `${lb}n${rb}${sp}%cN`, // committer - `${lb}m${rb}${sp}%cE`, // committer email - `${lb}c${rb}${sp}%ct`, // committer date - `${lb}p${rb}${sp}%P`, // parents - `${lb}s${rb}`, - '%B', // summary - `${lb}${sl}s${rb}`, - `${lb}f${rb}`, - ].join('%n'); - - static simpleRefs = `${lb}r${rb}${sp}%H`; - static simpleFormat = `${lb}r${rb}${sp}%H`; - - static shortlog = '%H%x00%aN%x00%aE%x00%at'; - - @debug({ args: false }) - static parse( - container: Container, - data: string, - type: LogType, - repoPath: string | undefined, - fileName: string | undefined, - sha: string | undefined, - currentUser: GitUser | undefined, - limit: number | undefined, - reverse: boolean, - range: Range | undefined, - stashes?: Map, - hasMoreOverride?: boolean, - ): GitLog | undefined { - if (!data) return undefined; - - let relativeFileName: string | undefined; - - let entry: LogEntry = {}; - let line: string | undefined = undefined; - let token: number; - - let i = 0; - let first = true; - - const lines = getLines(`${data}`); - // Skip the first line since it will always be - let next = lines.next(); - if (next.done) return undefined; - - if (repoPath !== undefined) { - repoPath = normalizePath(repoPath); - } +export const parseGitLogAllFormat = [ + `${lb}${sl}f${rb}`, + `${lb}r${rb}${sp}%H`, // ref + `${lb}a${rb}${sp}%aN`, // author + `${lb}e${rb}${sp}%aE`, // author email + `${lb}d${rb}${sp}%at`, // author date + `${lb}n${rb}${sp}%cN`, // committer + `${lb}m${rb}${sp}%cE`, // committer email + `${lb}c${rb}${sp}%ct`, // committer date + `${lb}p${rb}${sp}%P`, // parents + `${lb}t${rb}${sp}%D`, // tips + `${lb}s${rb}`, + '%B', // summary + `${lb}${sl}s${rb}`, + `${lb}f${rb}`, +].join('%n'); +export const parseGitLogDefaultFormat = [ + `${lb}${sl}f${rb}`, + `${lb}r${rb}${sp}%H`, // ref + `${lb}a${rb}${sp}%aN`, // author + `${lb}e${rb}${sp}%aE`, // author email + `${lb}d${rb}${sp}%at`, // author date + `${lb}n${rb}${sp}%cN`, // committer + `${lb}m${rb}${sp}%cE`, // committer email + `${lb}c${rb}${sp}%ct`, // committer date + `${lb}p${rb}${sp}%P`, // parents + `${lb}s${rb}`, + '%B', // summary + `${lb}${sl}s${rb}`, + `${lb}f${rb}`, +].join('%n'); +export const parseGitLogSimpleFormat = `${lb}r${rb}${sp}%H`; + +export function parseGitLog( + container: Container, + data: string, + type: LogType, + repoPath: string | undefined, + fileName: string | undefined, + sha: string | undefined, + currentUser: GitUser | undefined, + limit: number | undefined, + reverse: boolean, + range: Range | undefined, + stashes?: Map, + hasMoreOverride?: boolean, +): GitLog | undefined { + using sw = maybeStopWatch(`Git.parseLog(${repoPath}, fileName=${fileName}, sha=${sha})`, { + log: false, + logLevel: 'debug', + }); + if (!data) return undefined; - const commits = new Map(); - let truncationCount = limit; + let relativeFileName: string | undefined; - let match; - let renamedFileName; - let renamedMatch; + let entry: LogEntry = {}; + let line: string | undefined = undefined; + let token: number; - loop: while (true) { - next = lines.next(); - if (next.done) break; + let i = 0; + let first = true; - line = next.value; + const lines = getLines(`${data}`); + // Skip the first line since it will always be + let next = lines.next(); + if (next.done) return undefined; - // Since log --reverse doesn't properly honor a max count -- enforce it here - if (reverse && limit && i >= limit) break; + if (repoPath !== undefined) { + repoPath = normalizePath(repoPath); + } - // <1-char token> data - // e.g. bd1452a2dc - token = line.charCodeAt(1); + const commits = new Map(); + let truncationCount = limit; - switch (token) { - case 114: // 'r': // ref - entry = { - sha: line.substring(4), - }; - break; + let match; + let renamedFileName; + let renamedMatch; - case 97: // 'a': // author - if (uncommitted === entry.sha) { - entry.author = 'You'; - } else { - entry.author = line.substring(4); - } - break; + loop: while (true) { + next = lines.next(); + if (next.done) break; - case 101: // 'e': // author-mail - entry.authorEmail = line.substring(4); - break; + line = next.value; - case 100: // 'd': // author-date - entry.authorDate = line.substring(4); - break; + // Since log --reverse doesn't properly honor a max count -- enforce it here + if (reverse && limit && i >= limit) break; - case 110: // 'n': // committer - entry.committer = line.substring(4); - break; + // <1-char token> data + // e.g. bd1452a2dc + token = line.charCodeAt(1); - case 109: // 'm': // committer-mail - entry.committedDate = line.substring(4); - break; + switch (token) { + case 114: // 'r': // ref + entry = { + sha: line.substring(4), + }; + break; - case 99: // 'c': // committer-date - entry.committedDate = line.substring(4); - break; + case 97: // 'a': // author + if (uncommitted === entry.sha) { + entry.author = 'You'; + } else { + entry.author = line.substring(4); + } + break; - case 112: // 'p': // parents - line = line.substring(4); - entry.parentShas = line.length !== 0 ? line.split(' ') : undefined; - break; + case 101: // 'e': // author-mail + entry.authorEmail = line.substring(4); + break; - case 116: // 't': // tips - line = line.substring(4); - entry.tips = line.length !== 0 ? line.split(', ') : undefined; - break; + case 100: // 'd': // author-date + entry.authorDate = line.substring(4); + break; - case 115: // 's': // summary - while (true) { - next = lines.next(); - if (next.done) break; + case 110: // 'n': // committer + entry.committer = line.substring(4); + break; - line = next.value; - if (line === '') break; + case 109: // 'm': // committer-mail + entry.committedDate = line.substring(4); + break; - if (entry.summary === undefined) { - entry.summary = line; - } else { - entry.summary += `\n${line}`; - } - } + case 99: // 'c': // committer-date + entry.committedDate = line.substring(4); + break; - // Remove the trailing newline - if (entry.summary != null && entry.summary.charCodeAt(entry.summary.length - 1) === 10) { - entry.summary = entry.summary.slice(0, -1); - } - break; + case 112: // 'p': // parents + line = line.substring(4); + entry.parentShas = line.length !== 0 ? line.split(' ') : undefined; + break; + + case 116: // 't': // tips + line = line.substring(4); + entry.tips = line.length !== 0 ? line.split(', ') : undefined; + break; - case 102: { - // 'f': // files - // Skip the blank line git adds before the files + case 115: // 's': // summary + while (true) { next = lines.next(); + if (next.done) break; - let hasFiles = true; - if (next.done || next.value === '') { - // If this is a merge commit and there are no files returned, skip the commit and reduce our truncationCount to ensure accurate truncation detection - if ((entry.parentShas?.length ?? 0) > 1) { - if (truncationCount) { - truncationCount--; - } + line = next.value; + if (line === '') break; - break; + if (entry.summary === undefined) { + entry.summary = line; + } else { + entry.summary += `\n${line}`; + } + } + + // Remove the trailing newline + if (entry.summary != null && entry.summary.charCodeAt(entry.summary.length - 1) === 10) { + entry.summary = entry.summary.slice(0, -1); + } + break; + + case 102: { + // 'f': // files + // Skip the blank line git adds before the files + next = lines.next(); + + let hasFiles = true; + if (next.done || next.value === '') { + // If this is a merge commit and there are no files returned, skip the commit and reduce our truncationCount to ensure accurate truncation detection + if ((entry.parentShas?.length ?? 0) > 1) { + if (truncationCount) { + truncationCount--; } - hasFiles = false; + break; } - // eslint-disable-next-line no-unmodified-loop-condition - while (hasFiles) { - next = lines.next(); - if (next.done) break; + hasFiles = false; + } - line = next.value; - if (line === '') break; + // eslint-disable-next-line no-unmodified-loop-condition + while (hasFiles) { + next = lines.next(); + if (next.done) break; - if (line.startsWith('warning:')) continue; + line = next.value; + if (line === '') break; - if (type === LogType.Log) { - match = fileStatusRegex.exec(line); - if (match != null) { - if (entry.files === undefined) { - entry.files = []; - } + if (line.startsWith('warning:')) continue; - renamedFileName = match[3]; - if (renamedFileName !== undefined) { - entry.files.push({ - status: match[1] as GitFileIndexStatus, - path: renamedFileName, - originalPath: match[2], - }); - } else { - entry.files.push({ - status: match[1] as GitFileIndexStatus, - path: match[2], - }); - } + if (type === LogType.Log) { + match = fileStatusRegex.exec(line); + if (match != null) { + if (entry.files === undefined) { + entry.files = []; } - } else { - match = diffRegex.exec(line); - if (match != null) { - [, entry.originalPath, entry.path] = match; - if (entry.path === entry.originalPath) { - entry.originalPath = undefined; - entry.status = GitFileIndexStatus.Modified; - } else { - entry.status = GitFileIndexStatus.Renamed; - } - void lines.next(); - void lines.next(); - next = lines.next(); + renamedFileName = match[3]; + if (renamedFileName !== undefined) { + entry.files.push({ + status: match[1] as GitFileIndexStatus, + path: renamedFileName, + originalPath: match[2], + }); + } else { + entry.files.push({ + status: match[1] as GitFileIndexStatus, + path: match[2], + }); + } + } + } else { + match = diffRegex.exec(line); + if (match != null) { + [, entry.originalPath, entry.path] = match; + if (entry.path === entry.originalPath) { + entry.originalPath = undefined; + entry.status = GitFileIndexStatus.Modified; + } else { + entry.status = GitFileIndexStatus.Renamed; + } - match = diffRangeRegex.exec(next.value); - if (match !== null) { - entry.line = { - sha: entry.sha!, - originalLine: parseInt(match[1], 10), - // count: parseInt(match[2], 10), - line: parseInt(match[3], 10), - // count: parseInt(match[4], 10), - }; - } + void lines.next(); + void lines.next(); + next = lines.next(); + + match = diffRangeRegex.exec(next.value); + if (match !== null) { + entry.line = { + sha: entry.sha!, + originalLine: parseInt(match[1], 10), + // count: parseInt(match[2], 10), + line: parseInt(match[3], 10), + // count: parseInt(match[4], 10), + }; + } - while (true) { - next = lines.next(); - if (next.done || next.value === '') break; - } - break; - } else { + while (true) { next = lines.next(); - match = fileStatusAndSummaryRegex.exec(`${line}\n${next.value}`); - if (match != null) { - entry.fileStats = { - additions: Number(match[1]) || 0, - deletions: Number(match[2]) || 0, - changes: 0, - }; - - switch (match[4]) { - case undefined: - entry.status = 'M' as GitFileIndexStatus; - entry.path = match[3]; - break; - case 'copy': - case 'rename': - entry.status = (match[4] === 'copy' ? 'C' : 'R') as GitFileIndexStatus; - - renamedFileName = match[3]; - renamedMatch = - fileStatusAndSummaryRenamedFilePathRegex.exec(renamedFileName); - if (renamedMatch != null) { - const [, start, from, to, end] = renamedMatch; - // If there is no new path, the path part was removed so ensure we don't end up with // - if (!to) { - entry.path = `${ - start.endsWith('/') && end.startsWith('/') - ? start.slice(0, -1) - : start - }${end}`; - } else { - entry.path = `${start}${to}${end}`; - } - - if (!from) { - entry.originalPath = `${ - start.endsWith('/') && end.startsWith('/') - ? start.slice(0, -1) - : start - }${end}`; - } else { - entry.originalPath = `${start}${from}${end}`; - } + if (next.done || next.value === '') break; + } + break; + } else { + next = lines.next(); + match = fileStatusAndSummaryRegex.exec(`${line}\n${next.value}`); + if (match != null) { + entry.fileStats = { + additions: Number(match[1]) || 0, + deletions: Number(match[2]) || 0, + changes: 0, + }; + + switch (match[4]) { + case undefined: + entry.status = 'M' as GitFileIndexStatus; + entry.path = match[3]; + break; + case 'copy': + case 'rename': + entry.status = (match[4] === 'copy' ? 'C' : 'R') as GitFileIndexStatus; + + renamedFileName = match[3]; + renamedMatch = fileStatusAndSummaryRenamedFilePathRegex.exec(renamedFileName); + if (renamedMatch != null) { + const [, start, from, to, end] = renamedMatch; + // If there is no new path, the path part was removed so ensure we don't end up with // + if (!to) { + entry.path = `${ + start.endsWith('/') && end.startsWith('/') + ? start.slice(0, -1) + : start + }${end}`; } else { - renamedMatch = - fileStatusAndSummaryRenamedFileRegex.exec(renamedFileName); - if (renamedMatch != null) { - entry.path = renamedMatch[2]; - entry.originalPath = renamedMatch[1]; - } else { - entry.path = renamedFileName; - } + entry.path = `${start}${to}${end}`; } - break; - case 'create': - entry.status = 'A' as GitFileIndexStatus; - entry.path = match[3]; - break; - case 'delete': - entry.status = 'D' as GitFileIndexStatus; - entry.path = match[3]; - break; - default: - entry.status = 'M' as GitFileIndexStatus; - entry.path = match[3]; - break; - } + if (!from) { + entry.originalPath = `${ + start.endsWith('/') && end.startsWith('/') + ? start.slice(0, -1) + : start + }${end}`; + } else { + entry.originalPath = `${start}${from}${end}`; + } + } else { + renamedMatch = fileStatusAndSummaryRenamedFileRegex.exec(renamedFileName); + if (renamedMatch != null) { + entry.path = renamedMatch[2]; + entry.originalPath = renamedMatch[1]; + } else { + entry.path = renamedFileName; + } + } + + break; + case 'create': + entry.status = 'A' as GitFileIndexStatus; + entry.path = match[3]; + break; + case 'delete': + entry.status = 'D' as GitFileIndexStatus; + entry.path = match[3]; + break; + default: + entry.status = 'M' as GitFileIndexStatus; + entry.path = match[3]; + break; } - - if (next.done || next.value === '') break; } - } - } - if (entry.files !== undefined) { - entry.path = filterMap(entry.files, f => (f.path ? f.path : undefined)).join(', '); + if (next.done || next.value === '') break; + } } + } - if (first && repoPath === undefined && type === LogType.LogFile && fileName !== undefined) { - // Try to get the repoPath from the most recent commit - repoPath = normalizePath( - fileName.replace(fileName.startsWith('/') ? `/${entry.path}` : entry.path!, ''), - ); - relativeFileName = normalizePath(relative(repoPath, fileName)); - } else { - relativeFileName = - entry.path ?? - (repoPath != null && fileName != null - ? normalizePath(relative(repoPath, fileName)) - : undefined); - } - first = false; - - const commit = commits.get(entry.sha!); - if (commit === undefined) { - i++; - if (limit && i > limit) break loop; - } else if (truncationCount) { - // Since this matches an existing commit it will be skipped, so reduce our truncationCount to ensure accurate truncation detection - truncationCount--; - } + if (entry.files !== undefined) { + entry.path = filterMap(entry.files, f => (f.path ? f.path : undefined)).join(', '); + } - GitLogParser.parseEntry( - container, - entry, - commit, - type, - repoPath, - relativeFileName, - commits, - currentUser, - stashes, + if (first && repoPath === undefined && type === LogType.LogFile && fileName !== undefined) { + // Try to get the repoPath from the most recent commit + repoPath = normalizePath( + fileName.replace(fileName.startsWith('/') ? `/${entry.path}` : entry.path!, ''), ); - - break; + relativeFileName = normalizePath(relative(repoPath, fileName)); + } else { + relativeFileName = + entry.path ?? + (repoPath != null && fileName != null + ? normalizePath(relative(repoPath, fileName)) + : undefined); } + first = false; + + const commit = commits.get(entry.sha!); + if (commit === undefined) { + i++; + if (limit && i > limit) break loop; + } else if (truncationCount) { + // Since this matches an existing commit it will be skipped, so reduce our truncationCount to ensure accurate truncation detection + truncationCount--; + } + + parseLogEntry( + container, + entry, + commit, + type, + repoPath, + relativeFileName, + commits, + currentUser, + stashes, + ); + + break; } } - - const log: GitLog = { - repoPath: repoPath!, - commits: commits, - sha: sha, - count: i, - limit: limit, - range: range, - hasMore: hasMoreOverride ?? Boolean(truncationCount && i > truncationCount && truncationCount !== 1), - }; - return log; } - private static parseEntry( - container: Container, - entry: LogEntry, - commit: GitCommit | undefined, - type: LogType, - repoPath: string | undefined, - relativeFileName: string | undefined, - commits: Map, - currentUser: GitUser | undefined, - stashes: Map | undefined, - ): void { - if (commit == null) { - if (entry.author != null) { - if (isUserMatch(currentUser, entry.author, entry.authorEmail)) { - entry.author = 'You'; - } + sw?.stop({ suffix: ` parsed ${commits.size} commits` }); + + const log: GitLog = { + repoPath: repoPath!, + commits: commits, + sha: sha, + count: i, + limit: limit, + range: range, + hasMore: hasMoreOverride ?? Boolean(truncationCount && i > truncationCount && truncationCount !== 1), + }; + return log; +} + +function parseLogEntry( + container: Container, + entry: LogEntry, + commit: GitCommit | undefined, + type: LogType, + repoPath: string | undefined, + relativeFileName: string | undefined, + commits: Map, + currentUser: GitUser | undefined, + stashes: Map | undefined, +): void { + if (commit == null) { + if (entry.author != null) { + if (isUserMatch(currentUser, entry.author, entry.authorEmail)) { + entry.author = 'You'; } + } - if (entry.committer != null) { - if (isUserMatch(currentUser, entry.committer, entry.committerEmail)) { - entry.committer = 'You'; - } + if (entry.committer != null) { + if (isUserMatch(currentUser, entry.committer, entry.committerEmail)) { + entry.committer = 'You'; } + } - const originalFileName = entry.originalPath ?? (relativeFileName !== entry.path ? entry.path : undefined); + const originalFileName = entry.originalPath ?? (relativeFileName !== entry.path ? entry.path : undefined); - const files: { file?: GitFileChange; files?: GitFileChange[] } = { - files: entry.files?.map(f => new GitFileChange(repoPath!, f.path, f.status, f.originalPath)), - }; - if (type === LogType.LogFile && relativeFileName != null) { - files.file = new GitFileChange( - repoPath!, - relativeFileName, - entry.status!, - originalFileName, - undefined, - entry.fileStats, - ); - } + const files: { file?: GitFileChange; files?: GitFileChange[] } = { + files: entry.files?.map(f => new GitFileChange(repoPath!, f.path, f.status, f.originalPath)), + }; + if (type === LogType.LogFile && relativeFileName != null) { + files.file = new GitFileChange( + repoPath!, + relativeFileName, + entry.status!, + originalFileName, + undefined, + entry.fileStats, + ); + } - const stash = stashes?.get(entry.sha!); - if (stash != null) { - commit = new GitCommit( - container, - repoPath!, - stash.sha, - stash.author, - stash.committer, - stash.summary, - stash.parents, - stash.message, - files, - undefined, - entry.line != null ? [entry.line] : [], - entry.tips, - stash.stashName, - stash.stashOnRef, - ); - commits.set(stash.sha, commit); - } else { - commit = new GitCommit( - container, - repoPath!, - entry.sha!, - - new GitCommitIdentity( - entry.author!, - entry.authorEmail, - new Date((entry.authorDate! as any) * 1000), - ), - - new GitCommitIdentity( - entry.committer!, - entry.committerEmail, - new Date((entry.committedDate! as any) * 1000), - ), - entry.summary?.split('\n', 1)[0] ?? '', - entry.parentShas ?? [], - entry.summary ?? '', - files, - undefined, - entry.line != null ? [entry.line] : [], - entry.tips, - ); - commits.set(entry.sha!, commit); - } + const stash = stashes?.get(entry.sha!); + if (stash != null) { + commit = new GitCommit( + container, + repoPath!, + stash.sha, + stash.author, + stash.committer, + stash.summary, + stash.parents, + stash.message, + files, + undefined, + entry.line != null ? [entry.line] : [], + entry.tips, + stash.stashName, + stash.stashOnRef, + ); + commits.set(stash.sha, commit); + } else { + commit = new GitCommit( + container, + repoPath!, + entry.sha!, + + new GitCommitIdentity(entry.author!, entry.authorEmail, new Date((entry.authorDate! as any) * 1000)), + + new GitCommitIdentity( + entry.committer!, + entry.committerEmail, + new Date((entry.committedDate! as any) * 1000), + ), + entry.summary?.split('\n', 1)[0] ?? '', + entry.parentShas ?? [], + entry.summary ?? '', + files, + undefined, + entry.line != null ? [entry.line] : [], + entry.tips, + ); + commits.set(entry.sha!, commit); } } +} + +export function parseGitLogSimple( + data: string, + skip: number, + skipRef?: string, +): [string | undefined, string | undefined, GitFileIndexStatus | undefined] { + // eslint-disable-next-line @typescript-eslint/no-unused-vars + using _sw = maybeStopWatch('Git.parseLogSimple', { log: false, logLevel: 'debug' }); + + let ref; + let diffFile; + let diffRenamed; + let status; + let file; + let renamed; - @debug({ args: false }) - static parseSimple( - data: string, - skip: number, - skipRef?: string, - ): [string | undefined, string | undefined, GitFileIndexStatus | undefined] { - let ref; - let diffFile; - let diffRenamed; - let status; - let file; - let renamed; - - let match; - do { - match = logFileSimpleRegex.exec(data); - if (match == null) break; - - if (match[1] === skipRef) continue; - if (skip-- > 0) continue; - - [, ref, diffFile, diffRenamed, status, file, renamed] = match; - - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - file = ` ${diffRenamed || diffFile || renamed || file}`.substr(1); - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - status = status == null || status.length === 0 ? undefined : ` ${status}`.substr(1); - } while (skip >= 0); - - // Ensure the regex state is reset - logFileSimpleRegex.lastIndex = 0; + let match; + do { + match = logFileSimpleRegex.exec(data); + if (match == null) break; + + if (match[1] === skipRef) continue; + if (skip-- > 0) continue; + + [, ref, diffFile, diffRenamed, status, file, renamed] = match; // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - return [ - ref == null || ref.length === 0 ? undefined : ` ${ref}`.substr(1), - file, - status as GitFileIndexStatus | undefined, - ]; - } + file = ` ${diffRenamed || diffFile || renamed || file}`.substr(1); + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + status = status == null || status.length === 0 ? undefined : ` ${status}`.substr(1); + } while (skip >= 0); + + // Ensure the regex state is reset + logFileSimpleRegex.lastIndex = 0; + + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + return [ + ref == null || ref.length === 0 ? undefined : ` ${ref}`.substr(1), + file, + status as GitFileIndexStatus | undefined, + ]; +} - @debug({ args: false }) - static parseSimpleRenamed( - data: string, - originalFileName: string, - ): [string | undefined, string | undefined, GitFileIndexStatus | undefined] { - let match = logFileSimpleRenamedRegex.exec(data); - if (match == null) return [undefined, undefined, undefined]; +export function parseGitLogSimpleRenamed( + data: string, + originalFileName: string, +): [string | undefined, string | undefined, GitFileIndexStatus | undefined] { + // eslint-disable-next-line @typescript-eslint/no-unused-vars + using _sw = maybeStopWatch('Git.parseLogSimpleRenamed', { log: false, logLevel: 'debug' }); - const [, ref, files] = match; + let match = logFileSimpleRenamedRegex.exec(data); + if (match == null) return [undefined, undefined, undefined]; - let status; - let file; - let renamed; + const [, ref, files] = match; - do { - match = logFileSimpleRenamedFilesRegex.exec(files); - if (match == null) break; + let status; + let file; + let renamed; - [, status, file, renamed] = match; + do { + match = logFileSimpleRenamedFilesRegex.exec(files); + if (match == null) break; - if (originalFileName !== file) { - status = undefined; - file = undefined; - renamed = undefined; - continue; - } + [, status, file, renamed] = match; - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - file = ` ${renamed || file}`.substr(1); - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - status = status == null || status.length === 0 ? undefined : ` ${status}`.substr(1); + if (originalFileName !== file) { + status = undefined; + file = undefined; + renamed = undefined; + continue; + } + + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + file = ` ${renamed || file}`.substr(1); + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + status = status == null || status.length === 0 ? undefined : ` ${status}`.substr(1); - break; - } while (true); + break; + } while (true); - // Ensure the regex state is reset - logFileSimpleRenamedFilesRegex.lastIndex = 0; + // Ensure the regex state is reset + logFileSimpleRenamedFilesRegex.lastIndex = 0; - return [ - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - ref == null || ref.length === 0 || file == null ? undefined : ` ${ref}`.substr(1), - file, - status as GitFileIndexStatus | undefined, - ]; - } + return [ + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + ref == null || ref.length === 0 || file == null ? undefined : ` ${ref}`.substr(1), + file, + status as GitFileIndexStatus | undefined, + ]; } diff --git a/src/git/parsers/reflogParser.ts b/src/git/parsers/reflogParser.ts index 1bbcf49792983..3f56201a3b87c 100644 --- a/src/git/parsers/reflogParser.ts +++ b/src/git/parsers/reflogParser.ts @@ -1,4 +1,4 @@ -import { debug } from '../../system/decorators/log'; +import { maybeStopWatch } from '../../system/stopwatch'; import type { GitReflog } from '../models/reflog'; import { GitReflogRecord } from '../models/reflog'; @@ -10,119 +10,118 @@ const reflogHEADRegex = /.*?\/?HEAD$/; const lb = '%x3c'; // `%x${'<'.charCodeAt(0).toString(16)}`; const rb = '%x3e'; // `%x${'>'.charCodeAt(0).toString(16)}`; -// eslint-disable-next-line @typescript-eslint/no-extraneous-class -export class GitReflogParser { - static defaultFormat = [ - `${lb}r${rb}%H`, // ref - `${lb}d${rb}%gD`, // reflog selector (with iso8601 timestamp) - `${lb}s${rb}%gs`, // reflog subject - // `${lb}n${rb}%D` // ref names - ].join(''); - - @debug({ args: false }) - static parse( - data: string, - repoPath: string, - commands: string[], - limit: number, - totalLimit: number, - ): GitReflog | undefined { - if (!data) return undefined; - - const records: GitReflogRecord[] = []; - - let sha; - let selector; - let date; - let command; - let commandArgs; - let details; - - let head; - let headDate; - let headSha; - - let count = 0; - let total = 0; - let recordDate; - let record: GitReflogRecord | undefined; - - let match; - do { - match = reflogRegex.exec(data); - if (match == null) break; - - [, sha, selector, date, command, commandArgs, details] = match; - - total++; - - if (record !== undefined) { - // If the next record has the same sha as the previous, use it if it is not pointing to just HEAD and the previous is +export const parseGitRefLogDefaultFormat = [ + `${lb}r${rb}%H`, // ref + `${lb}d${rb}%gD`, // reflog selector (with iso8601 timestamp) + `${lb}s${rb}%gs`, // reflog subject + // `${lb}n${rb}%D` // ref names +].join(''); + +export function parseGitRefLog( + data: string, + repoPath: string, + commands: string[], + limit: number, + totalLimit: number, +): GitReflog | undefined { + using sw = maybeStopWatch(`Git.parseRefLog(${repoPath})`, { log: false, logLevel: 'debug' }); + if (!data) return undefined; + + const records: GitReflogRecord[] = []; + + let sha; + let selector; + let date; + let command; + let commandArgs; + let details; + + let head; + let headDate; + let headSha; + + let count = 0; + let total = 0; + let recordDate; + let record: GitReflogRecord | undefined; + + let match; + do { + match = reflogRegex.exec(data); + if (match == null) break; + + [, sha, selector, date, command, commandArgs, details] = match; + + total++; + + if (record !== undefined) { + // If the next record has the same sha as the previous, use it if it is not pointing to just HEAD and the previous is + if ( + sha === record.sha && + (date !== recordDate || !reflogHEADRegex.test(record.selector) || reflogHEADRegex.test(selector)) + ) { + continue; + } + + if (sha !== record.sha) { if ( - sha === record.sha && - (date !== recordDate || !reflogHEADRegex.test(record.selector) || reflogHEADRegex.test(selector)) + head != null && + headDate === recordDate && + headSha == record.sha && + reflogHEADRegex.test(record.selector) ) { - continue; + record.update(sha, head); + } else { + record.update(sha); } - if (sha !== record.sha) { - if ( - head != null && - headDate === recordDate && - headSha == record.sha && - reflogHEADRegex.test(record.selector) - ) { - record.update(sha, head); - } else { - record.update(sha); - } - - records.push(record); - record = undefined; - recordDate = undefined; - - count++; - if (limit !== 0 && count >= limit) break; - } - } - - if (command === 'HEAD') { - head = selector; - headDate = date; - headSha = sha; - - continue; - } + records.push(record); + record = undefined; + recordDate = undefined; - if (commands.includes(command)) { - record = new GitReflogRecord( - repoPath, - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - ` ${sha}`.substr(1), - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - ` ${selector}`.substr(1), - new Date(date), - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - ` ${command}`.substr(1), - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - commandArgs == null || commandArgs.length === 0 ? undefined : commandArgs.substr(1), - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - details == null || details.length === 0 ? undefined : details.substr(1), - ); - recordDate = date; + count++; + if (limit !== 0 && count >= limit) break; } - } while (true); - - // Ensure the regex state is reset - reflogRegex.lastIndex = 0; - - return { - repoPath: repoPath, - records: records, - count: count, - total: total, - limit: limit, - hasMore: (limit !== 0 && count >= limit) || (totalLimit !== 0 && total >= totalLimit), - }; - } + } + + if (command === 'HEAD') { + head = selector; + headDate = date; + headSha = sha; + + continue; + } + + if (commands.includes(command)) { + record = new GitReflogRecord( + repoPath, + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + ` ${sha}`.substr(1), + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + ` ${selector}`.substr(1), + new Date(date), + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + ` ${command}`.substr(1), + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + commandArgs == null || commandArgs.length === 0 ? undefined : commandArgs.substr(1), + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + details == null || details.length === 0 ? undefined : details.substr(1), + ); + recordDate = date; + } + } while (true); + + // Ensure the regex state is reset + reflogRegex.lastIndex = 0; + + sw?.stop({ suffix: ` parsed ${records.length} records` }); + + return { + repoPath: repoPath, + records: records, + count: count, + total: total, + limit: limit, + hasMore: (limit !== 0 && count >= limit) || (totalLimit !== 0 && total >= totalLimit), + }; } diff --git a/src/git/parsers/remoteParser.ts b/src/git/parsers/remoteParser.ts index 7f0059df5d8ab..4cfef2b1530c9 100644 --- a/src/git/parsers/remoteParser.ts +++ b/src/git/parsers/remoteParser.ts @@ -1,4 +1,4 @@ -import { debug } from '../../system/decorators/log'; +import { maybeStopWatch } from '../../system/stopwatch'; import type { GitRemoteType } from '../models/remote'; import { GitRemote } from '../models/remote'; import type { getRemoteProviderMatcher } from '../remotes/remoteProviders'; @@ -7,68 +7,67 @@ const emptyStr = ''; const remoteRegex = /^(.*)\t(.*)\s\((.*)\)$/gm; -// eslint-disable-next-line @typescript-eslint/no-extraneous-class -export class GitRemoteParser { - @debug({ args: false, singleLine: true }) - static parse( - data: string, - repoPath: string, - remoteProviderMatcher: ReturnType, - ): GitRemote[] | undefined { - if (!data) return undefined; - - const remotes = new Map(); - - let name; - let url; - let type; - - let scheme; - let domain; - let path; - - let remote: GitRemote | undefined; - - let match; - do { - match = remoteRegex.exec(data); - if (match == null) break; - - [, name, url, type] = match; - - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - name = ` ${name}`.substr(1); - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - url = ` ${url}`.substr(1); - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - type = ` ${type}`.substr(1); - - [scheme, domain, path] = parseGitRemoteUrl(url); - - remote = remotes.get(name); - if (remote == null) { - remote = new GitRemote(repoPath, name, scheme, domain, path, remoteProviderMatcher(url, domain, path), [ - { url: url, type: type as GitRemoteType }, - ]); - remotes.set(name, remote); - } else { - remote.urls.push({ url: url, type: type as GitRemoteType }); - if (remote.provider != null && type !== 'push') continue; - - if (remote.provider?.hasRichIntegration()) { - remote.provider.dispose(); - } - - const provider = remoteProviderMatcher(url, domain, path); - if (provider == null) continue; - - remote = new GitRemote(repoPath, name, scheme, domain, path, provider, remote.urls); - remotes.set(name, remote); +export function parseGitRemotes( + data: string, + repoPath: string, + remoteProviderMatcher: ReturnType, +): GitRemote[] { + using sw = maybeStopWatch(`Git.parseRemotes(${repoPath})`, { log: false, logLevel: 'debug' }); + if (!data) return []; + + const remotes = new Map(); + + let name; + let url; + let type; + + let scheme; + let domain; + let path; + + let remote: GitRemote | undefined; + + let match; + do { + match = remoteRegex.exec(data); + if (match == null) break; + + [, name, url, type] = match; + + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + name = ` ${name}`.substr(1); + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + url = ` ${url}`.substr(1); + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + type = ` ${type}`.substr(1); + + [scheme, domain, path] = parseGitRemoteUrl(url); + + remote = remotes.get(name); + if (remote == null) { + remote = new GitRemote(repoPath, name, scheme, domain, path, remoteProviderMatcher(url, domain, path), [ + { url: url, type: type as GitRemoteType }, + ]); + remotes.set(name, remote); + } else { + remote.urls.push({ url: url, type: type as GitRemoteType }); + if (remote.provider != null && type !== 'push') continue; + + if (remote.provider?.hasRichIntegration()) { + remote.provider.dispose(); } - } while (true); - return [...remotes.values()]; - } + const provider = remoteProviderMatcher(url, domain, path); + if (provider == null) continue; + + remote = new GitRemote(repoPath, name, scheme, domain, path, provider, remote.urls); + remotes.set(name, remote); + } + } while (true); + + sw?.stop({ suffix: ` parsed ${remotes.size} remotes` }); + + return [...remotes.values()]; } // Test git urls diff --git a/src/git/parsers/statusParser.ts b/src/git/parsers/statusParser.ts index e295b9f5924d6..10eb8d06414a8 100644 --- a/src/git/parsers/statusParser.ts +++ b/src/git/parsers/statusParser.ts @@ -1,5 +1,5 @@ -import { debug } from '../../system/decorators/log'; import { normalizePath } from '../../system/path'; +import { maybeStopWatch } from '../../system/stopwatch'; import { GitStatus, GitStatusFile } from '../models/status'; const emptyStr = ''; @@ -7,137 +7,137 @@ const emptyStr = ''; const aheadStatusV1Regex = /(?:ahead ([0-9]+))/; const behindStatusV1Regex = /(?:behind ([0-9]+))/; -// eslint-disable-next-line @typescript-eslint/no-extraneous-class -export class GitStatusParser { - @debug({ args: false, singleLine: true }) - static parse(data: string, repoPath: string, porcelainVersion: number): GitStatus | undefined { - if (!data) return undefined; +export function parseGitStatus(data: string, repoPath: string, porcelainVersion: number): GitStatus | undefined { + using sw = maybeStopWatch(`Git.parseStatus(${repoPath}, v=${porcelainVersion})`, { + log: false, + logLevel: 'debug', + }); + if (!data) return undefined; - const lines = data.split('\n').filter((i?: T): i is T => Boolean(i)); - if (lines.length === 0) return undefined; + const lines = data.split('\n').filter((i?: T): i is T => Boolean(i)); + if (lines.length === 0) return undefined; - if (porcelainVersion < 2) return this.parseV1(lines, repoPath); + const status = porcelainVersion < 2 ? parseStatusV1(lines, repoPath) : parseStatusV2(lines, repoPath); - return this.parseV2(lines, repoPath); - } + sw?.stop({ suffix: ` parsed ${status.files.length} files` }); - @debug({ args: false, singleLine: true }) - private static parseV1(lines: string[], repoPath: string): GitStatus { - let branch: string | undefined; - const files = []; - const state = { - ahead: 0, - behind: 0, - }; - let upstream; - - let position = -1; - while (++position < lines.length) { - const line = lines[position]; - // Header - if (line.startsWith('##')) { - const lineParts = line.split(' '); - [branch, upstream] = lineParts[1].split('...'); - if (lineParts.length > 2) { - const upstreamStatus = lineParts.slice(2).join(' '); - - const aheadStatus = aheadStatusV1Regex.exec(upstreamStatus); - state.ahead = aheadStatus == null ? 0 : Number(aheadStatus[1]) || 0; - - const behindStatus = behindStatusV1Regex.exec(upstreamStatus); - state.behind = behindStatus == null ? 0 : Number(behindStatus[1]) || 0; - } + return status; +} + +function parseStatusV1(lines: string[], repoPath: string): GitStatus { + let branch: string | undefined; + const files = []; + const state = { + ahead: 0, + behind: 0, + }; + let upstream; + + let position = -1; + while (++position < lines.length) { + const line = lines[position]; + // Header + if (line.startsWith('##')) { + const lineParts = line.split(' '); + [branch, upstream] = lineParts[1].split('...'); + if (lineParts.length > 2) { + const upstreamStatus = lineParts.slice(2).join(' '); + + const aheadStatus = aheadStatusV1Regex.exec(upstreamStatus); + state.ahead = aheadStatus == null ? 0 : Number(aheadStatus[1]) || 0; + + const behindStatus = behindStatusV1Regex.exec(upstreamStatus); + state.behind = behindStatus == null ? 0 : Number(behindStatus[1]) || 0; + } + } else { + const rawStatus = line.substring(0, 2); + const fileName = line.substring(3); + if (rawStatus.startsWith('R') || rawStatus.startsWith('C')) { + const [file1, file2] = fileName.replace(/"/g, emptyStr).split('->'); + files.push(parseStatusFile(repoPath, rawStatus, file2.trim(), file1.trim())); } else { - const rawStatus = line.substring(0, 2); - const fileName = line.substring(3); - if (rawStatus.startsWith('R') || rawStatus.startsWith('C')) { - const [file1, file2] = fileName.replace(/"/g, emptyStr).split('->'); - files.push(this.parseStatusFile(repoPath, rawStatus, file2.trim(), file1.trim())); - } else { - files.push(this.parseStatusFile(repoPath, rawStatus, fileName)); - } + files.push(parseStatusFile(repoPath, rawStatus, fileName)); } } - - return new GitStatus(normalizePath(repoPath), branch ?? emptyStr, emptyStr, files, state, upstream); } - @debug({ args: false, singleLine: true }) - private static parseV2(lines: string[], repoPath: string): GitStatus { - let branch: string | undefined; - const files = []; - let sha: string | undefined; - const state = { - ahead: 0, - behind: 0, - }; - let upstream; - - let position = -1; - while (++position < lines.length) { - const line = lines[position]; - // Headers - if (line.startsWith('#')) { - const lineParts = line.split(' '); - switch (lineParts[1]) { - case 'branch.oid': - sha = lineParts[2]; - break; - case 'branch.head': - branch = lineParts[2]; - break; - case 'branch.upstream': - upstream = lineParts[2]; - break; - case 'branch.ab': - state.ahead = Number(lineParts[2].substring(1)); - state.behind = Number(lineParts[3].substring(1)); - break; - } - } else { - const lineParts = line.split(' '); - switch (lineParts[0][0]) { - case '1': // normal - files.push(this.parseStatusFile(repoPath, lineParts[1], lineParts.slice(8).join(' '))); - break; - case '2': { - // rename - const file = lineParts.slice(9).join(' ').split('\t'); - files.push(this.parseStatusFile(repoPath, lineParts[1], file[0], file[1])); - break; - } - case 'u': // unmerged - files.push(this.parseStatusFile(repoPath, lineParts[1], lineParts.slice(10).join(' '))); - break; - case '?': // untracked - files.push(this.parseStatusFile(repoPath, '??', lineParts.slice(1).join(' '))); - break; + return new GitStatus(normalizePath(repoPath), branch ?? emptyStr, emptyStr, files, state, upstream); +} + +function parseStatusV2(lines: string[], repoPath: string): GitStatus { + let branch: string | undefined; + const files = []; + let sha: string | undefined; + const state = { + ahead: 0, + behind: 0, + }; + let upstream; + + let position = -1; + while (++position < lines.length) { + const line = lines[position]; + // Headers + if (line.startsWith('#')) { + const lineParts = line.split(' '); + switch (lineParts[1]) { + case 'branch.oid': + sha = lineParts[2]; + break; + case 'branch.head': + branch = lineParts[2]; + break; + case 'branch.upstream': + upstream = lineParts[2]; + break; + case 'branch.ab': + state.ahead = Number(lineParts[2].substring(1)); + state.behind = Number(lineParts[3].substring(1)); + break; + } + } else { + const lineParts = line.split(' '); + switch (lineParts[0][0]) { + case '1': // normal + files.push(parseStatusFile(repoPath, lineParts[1], lineParts.slice(8).join(' '))); + break; + case '2': { + // rename + const file = lineParts.slice(9).join(' ').split('\t'); + files.push(parseStatusFile(repoPath, lineParts[1], file[0], file[1])); + break; } + case 'u': // unmerged + files.push(parseStatusFile(repoPath, lineParts[1], lineParts.slice(10).join(' '))); + break; + case '?': // untracked + files.push(parseStatusFile(repoPath, '??', lineParts.slice(1).join(' '))); + break; } } - - return new GitStatus(normalizePath(repoPath), branch ?? emptyStr, sha ?? emptyStr, files, state, upstream); } - static parseStatusFile( - repoPath: string, - rawStatus: string, - fileName: string, - originalFileName?: string, - ): GitStatusFile { - let x = !rawStatus.startsWith('.') ? rawStatus[0].trim() : undefined; - if (x == null || x.length === 0) { - x = undefined; - } + return new GitStatus(normalizePath(repoPath), branch ?? emptyStr, sha ?? emptyStr, files, state, upstream); +} - let y = undefined; - if (rawStatus.length > 1) { - y = rawStatus[1] !== '.' ? rawStatus[1].trim() : undefined; - if (y == null || y.length === 0) { - y = undefined; - } - } +function parseStatusFile( + repoPath: string, + rawStatus: string, + fileName: string, + originalFileName?: string, +): GitStatusFile { + let x = !rawStatus.startsWith('.') ? rawStatus[0].trim() : undefined; + if (x == null || x.length === 0) { + x = undefined; + } - return new GitStatusFile(repoPath, x, y, fileName, originalFileName); + let y = undefined; + if (rawStatus.length > 1) { + y = rawStatus[1] !== '.' ? rawStatus[1].trim() : undefined; + if (y == null || y.length === 0) { + y = undefined; + } } + + return new GitStatusFile(repoPath, x, y, fileName, originalFileName); } diff --git a/src/git/parsers/tagParser.ts b/src/git/parsers/tagParser.ts index 26a59fcc825ce..a63ce47ebda06 100644 --- a/src/git/parsers/tagParser.ts +++ b/src/git/parsers/tagParser.ts @@ -1,4 +1,4 @@ -import { debug } from '../../system/decorators/log'; +import { maybeStopWatch } from '../../system/stopwatch'; import { GitTag } from '../models/tag'; const tagRegex = /^(.+)<\*r>(.*)(.*)(.*)(.*)(.*)$/gm; @@ -7,54 +7,53 @@ const tagRegex = /^(.+)<\*r>(.*)(.*)(.*)(.*)(.*)$/gm; const lb = '%3c'; // `%${'<'.charCodeAt(0).toString(16)}`; const rb = '%3e'; // `%${'>'.charCodeAt(0).toString(16)}`; -// eslint-disable-next-line @typescript-eslint/no-extraneous-class -export class GitTagParser { - static defaultFormat = [ - `${lb}n${rb}%(refname)`, // tag name - `${lb}*r${rb}%(*objectname)`, // ref - `${lb}r${rb}%(objectname)`, // ref - `${lb}d${rb}%(creatordate:iso8601)`, // created date - `${lb}ad${rb}%(authordate:iso8601)`, // author date - `${lb}s${rb}%(subject)`, // message - ].join(''); - - @debug({ args: false, singleLine: true }) - static parse(data: string, repoPath: string): GitTag[] | undefined { - if (!data) return undefined; - - const tags: GitTag[] = []; - - let name; - let ref1; - let ref2; - let date; - let commitDate; - let message; - - let match; - do { - match = tagRegex.exec(data); - if (match == null) break; - - [, name, ref1, ref2, date, commitDate, message] = match; - - // Strip off refs/tags/ - name = name.substr(10); - - tags.push( - new GitTag( - repoPath, - name, - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - ` ${ref1 || ref2}`.substr(1), - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - ` ${message}`.substr(1), - date ? new Date(date) : undefined, - commitDate == null || commitDate.length === 0 ? undefined : new Date(commitDate), - ), - ); - } while (true); - - return tags; - } +export const parseGitTagsDefaultFormat = [ + `${lb}n${rb}%(refname)`, // tag name + `${lb}*r${rb}%(*objectname)`, // ref + `${lb}r${rb}%(objectname)`, // ref + `${lb}d${rb}%(creatordate:iso8601)`, // created date + `${lb}ad${rb}%(authordate:iso8601)`, // author date + `${lb}s${rb}%(subject)`, // message +].join(''); + +export function parseGitTags(data: string, repoPath: string): GitTag[] { + using sw = maybeStopWatch(`Git.parseTags(${repoPath})`, { log: false, logLevel: 'debug' }); + + const tags: GitTag[] = []; + if (!data) return tags; + + let name; + let ref1; + let ref2; + let date; + let commitDate; + let message; + + let match; + do { + match = tagRegex.exec(data); + if (match == null) break; + + [, name, ref1, ref2, date, commitDate, message] = match; + + // Strip off refs/tags/ + name = name.substr(10); + + tags.push( + new GitTag( + repoPath, + name, + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + ` ${ref1 || ref2}`.substr(1), + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + ` ${message}`.substr(1), + date ? new Date(date) : undefined, + commitDate == null || commitDate.length === 0 ? undefined : new Date(commitDate), + ), + ); + } while (true); + + sw?.stop({ suffix: ` parsed ${tags.length} tags` }); + + return tags; } diff --git a/src/git/parsers/treeParser.ts b/src/git/parsers/treeParser.ts index 25b4baeb60992..153680b2d0c61 100644 --- a/src/git/parsers/treeParser.ts +++ b/src/git/parsers/treeParser.ts @@ -1,40 +1,39 @@ -import { debug } from '../../system/decorators/log'; +import { maybeStopWatch } from '../../system/stopwatch'; import type { GitTreeEntry } from '../models/tree'; const emptyStr = ''; const treeRegex = /(?:.+?)\s+(.+?)\s+(.+?)\s+(.+?)\s+(.+)/gm; -// eslint-disable-next-line @typescript-eslint/no-extraneous-class -export class GitTreeParser { - @debug({ args: false, singleLine: true }) - static parse(data: string | undefined): GitTreeEntry[] | undefined { - if (!data) return undefined; - - const trees: GitTreeEntry[] = []; - - let type; - let sha; - let size; - let filePath; - - let match; - do { - match = treeRegex.exec(data); - if (match == null) break; - - [, type, sha, size, filePath] = match; - - trees.push({ - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - commitSha: sha == null || sha.length === 0 ? emptyStr : ` ${sha}`.substr(1), - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - path: filePath == null || filePath.length === 0 ? emptyStr : ` ${filePath}`.substr(1), - size: Number(size) || 0, - // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 - type: (type == null || type.length === 0 ? emptyStr : ` ${type}`.substr(1)) as 'blob' | 'tree', - }); - } while (true); - - return trees; - } +export function parseGitTree(data: string | undefined): GitTreeEntry[] { + using sw = maybeStopWatch(`Git.parseTree`, { log: false, logLevel: 'debug' }); + + const trees: GitTreeEntry[] = []; + if (!data) return trees; + + let type; + let sha; + let size; + let filePath; + + let match; + do { + match = treeRegex.exec(data); + if (match == null) break; + + [, type, sha, size, filePath] = match; + + trees.push({ + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + commitSha: sha == null || sha.length === 0 ? emptyStr : ` ${sha}`.substr(1), + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + path: filePath == null || filePath.length === 0 ? emptyStr : ` ${filePath}`.substr(1), + size: Number(size) || 0, + // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 + type: (type == null || type.length === 0 ? emptyStr : ` ${type}`.substr(1)) as 'blob' | 'tree', + }); + } while (true); + + sw?.stop({ suffix: ` parsed ${trees.length} trees` }); + + return trees; } diff --git a/src/git/parsers/worktreeParser.ts b/src/git/parsers/worktreeParser.ts index 230037b3acd2c..816cb580568cc 100644 --- a/src/git/parsers/worktreeParser.ts +++ b/src/git/parsers/worktreeParser.ts @@ -1,6 +1,6 @@ import { Uri } from 'vscode'; -import { debug } from '../../system/decorators/log'; import { normalizePath } from '../../system/path'; +import { maybeStopWatch } from '../../system/stopwatch'; import { getLines } from '../../system/string'; import { GitWorktree } from '../models/worktree'; @@ -14,88 +14,87 @@ interface WorktreeEntry { prunable?: boolean | string; } -// eslint-disable-next-line @typescript-eslint/no-extraneous-class -export class GitWorktreeParser { - @debug({ args: false, singleLine: true }) - static parse(data: string, repoPath: string): GitWorktree[] { - if (!data) return []; +export function parseGitWorktrees(data: string, repoPath: string): GitWorktree[] { + using sw = maybeStopWatch(`Git.parseWorktrees(${repoPath})`, { log: false, logLevel: 'debug' }); - if (repoPath != null) { - repoPath = normalizePath(repoPath); - } - - const worktrees: GitWorktree[] = []; + const worktrees: GitWorktree[] = []; + if (!data) return worktrees; - let entry: Partial | undefined = undefined; - let line: string; - let index: number; - let key: string; - let value: string; - let locked: string; - let prunable: string; - let main = true; // the first worktree is the main worktree + if (repoPath != null) { + repoPath = normalizePath(repoPath); + } - for (line of getLines(data)) { - index = line.indexOf(' '); - if (index === -1) { - key = line; - value = ''; - } else { - key = line.substring(0, index); - value = line.substring(index + 1); - } + let entry: Partial | undefined = undefined; + let line: string; + let index: number; + let key: string; + let value: string; + let locked: string; + let prunable: string; + let main = true; // the first worktree is the main worktree - if (key.length === 0 && entry != null) { - worktrees.push( - new GitWorktree( - main, - entry.bare ? 'bare' : entry.detached ? 'detached' : 'branch', - repoPath, - Uri.file(entry.path!), - entry.locked ?? false, - entry.prunable ?? false, - entry.sha, - entry.branch, - ), - ); + for (line of getLines(data)) { + index = line.indexOf(' '); + if (index === -1) { + key = line; + value = ''; + } else { + key = line.substring(0, index); + value = line.substring(index + 1); + } - entry = undefined; - main = false; - continue; - } + if (key.length === 0 && entry != null) { + worktrees.push( + new GitWorktree( + main, + entry.bare ? 'bare' : entry.detached ? 'detached' : 'branch', + repoPath, + Uri.file(entry.path!), + entry.locked ?? false, + entry.prunable ?? false, + entry.sha, + entry.branch, + ), + ); - if (entry == null) { - entry = {}; - } + entry = undefined; + main = false; + continue; + } - switch (key) { - case 'worktree': - entry.path = value; - break; - case 'bare': - entry.bare = true; - break; - case 'HEAD': - entry.sha = value; - break; - case 'branch': - // Strip off refs/heads/ - entry.branch = value.substr(11); - break; - case 'detached': - entry.detached = true; - break; - case 'locked': - [, locked] = value.split(' ', 2); - entry.locked = locked?.trim() || true; - break; - case 'prunable': - [, prunable] = value.split(' ', 2); - entry.prunable = prunable?.trim() || true; - break; - } + if (entry == null) { + entry = {}; } - return worktrees; + switch (key) { + case 'worktree': + entry.path = value; + break; + case 'bare': + entry.bare = true; + break; + case 'HEAD': + entry.sha = value; + break; + case 'branch': + // Strip off refs/heads/ + entry.branch = value.substr(11); + break; + case 'detached': + entry.detached = true; + break; + case 'locked': + [, locked] = value.split(' ', 2); + entry.locked = locked?.trim() || true; + break; + case 'prunable': + [, prunable] = value.split(' ', 2); + entry.prunable = prunable?.trim() || true; + break; + } } + + sw?.stop({ suffix: ` parsed ${worktrees.length} worktrees` }); + + return worktrees; } diff --git a/src/system/stopwatch.ts b/src/system/stopwatch.ts index 73c30a87e2e27..9e4351e90c99d 100644 --- a/src/system/stopwatch.ts +++ b/src/system/stopwatch.ts @@ -3,7 +3,10 @@ import type { LogProvider } from './logger'; import { defaultLogProvider } from './logger'; import type { LogLevel } from './logger.constants'; import type { LogScope } from './logger.scope'; -import { getNextLogScopeId } from './logger.scope'; +import { getNewLogScope } from './logger.scope'; + +(Symbol as any).dispose ??= Symbol('Symbol.dispose'); +(Symbol as any).asyncDispose ??= Symbol('Symbol.asyncDispose'); type StopwatchLogOptions = { message?: string; suffix?: string }; type StopwatchOptions = { @@ -13,8 +16,8 @@ type StopwatchOptions = { }; type StopwatchLogLevel = Exclude; -export class Stopwatch { - private readonly instance = `[${String(getNextLogScopeId()).padStart(5)}] `; +export class Stopwatch implements Disposable { + private readonly logScope: LogScope; private readonly logLevel: StopwatchLogLevel; private readonly logProvider: LogProvider; @@ -23,17 +26,10 @@ export class Stopwatch { return this._time; } - constructor( - private readonly scope: string | LogScope | undefined, - options?: StopwatchOptions, - ...params: any[] - ) { - let logScope; - if (typeof scope !== 'string') { - logScope = scope; - scope = ''; - this.instance = ''; - } + private _stopped = false; + + constructor(scope: string | LogScope | undefined, options?: StopwatchOptions, ...params: any[]) { + this.logScope = scope != null && typeof scope !== 'string' ? scope : getNewLogScope(scope ?? ''); let logOptions: StopwatchLogOptions | undefined; if (typeof options?.log === 'boolean') { @@ -52,57 +48,51 @@ export class Stopwatch { if (params.length) { this.logProvider.log( this.logLevel, - logScope, - `${this.instance}${scope}${logOptions.message ?? ''}${logOptions.suffix ?? ''}`, + this.logScope, + `${logOptions.message ?? ''}${logOptions.suffix ?? ''}`, ...params, ); } else { this.logProvider.log( this.logLevel, - logScope, - `${this.instance}${scope}${logOptions.message ?? ''}${logOptions.suffix ?? ''}`, + this.logScope, + `${logOptions.message ?? ''}${logOptions.suffix ?? ''}`, ); } } } + [Symbol.dispose](): void { + this.stop(); + } + elapsed(): number { const [secs, nanosecs] = hrtime(this._time); return secs * 1000 + Math.floor(nanosecs / 1000000); } log(options?: StopwatchLogOptions): void { - this.logCore(this.scope, options, false); + this.logCore(options, false); } restart(options?: StopwatchLogOptions): void { - this.logCore(this.scope, options, true); + this.logCore(options, true); this._time = hrtime(); + this._stopped = false; } stop(options?: StopwatchLogOptions): void { + if (this._stopped) return; + this.restart(options); + this._stopped = true; } - private logCore( - scope: string | LogScope | undefined, - options: StopwatchLogOptions | undefined, - logTotalElapsed: boolean, - ): void { + private logCore(options: StopwatchLogOptions | undefined, logTotalElapsed: boolean): void { if (!this.logProvider.enabled(this.logLevel)) return; - let logScope; - if (typeof scope !== 'string') { - logScope = scope; - scope = ''; - } - if (!logTotalElapsed) { - this.logProvider.log( - this.logLevel, - logScope, - `${this.instance}${scope}${options?.message ?? ''}${options?.suffix ?? ''}`, - ); + this.logProvider.log(this.logLevel, this.logScope, `${options?.message ?? ''}${options?.suffix ?? ''}`); return; } @@ -110,10 +100,10 @@ export class Stopwatch { const [secs, nanosecs] = hrtime(this._time); const ms = secs * 1000 + Math.floor(nanosecs / 1000000); - const prefix = `${this.instance}${scope}${options?.message ?? ''}`; + const prefix = options?.message ?? ''; this.logProvider.log( ms > 250 ? 'warn' : this.logLevel, - logScope, + this.logScope, `${prefix ? `${prefix} ` : ''}[${ms}ms]${options?.suffix ?? ''}`, ); } diff --git a/src/webviews/apps/tsconfig.json b/src/webviews/apps/tsconfig.json index a218684ed405a..a2c68ad8ddb06 100644 --- a/src/webviews/apps/tsconfig.json +++ b/src/webviews/apps/tsconfig.json @@ -2,7 +2,7 @@ "extends": "../../../tsconfig.base.json", "compilerOptions": { "jsx": "react", - "lib": ["dom", "dom.iterable", "es2022"], + "lib": ["dom", "dom.iterable", "es2022", "esnext.disposable"], "outDir": "../../", "paths": { "@env/*": ["src/env/browser/*"] diff --git a/tsconfig.base.json b/tsconfig.base.json index 4aeda77b862ae..4c5295e11e13b 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -6,7 +6,7 @@ "forceConsistentCasingInFileNames": true, "incremental": true, "isolatedModules": true, - "lib": ["es2022"], + "lib": ["es2022", "esnext.disposable"], "module": "esnext", "moduleResolution": "node", "noFallthroughCasesInSwitch": true, diff --git a/tsconfig.browser.json b/tsconfig.browser.json index 66a5af9bb3c0a..13a30b979c108 100644 --- a/tsconfig.browser.json +++ b/tsconfig.browser.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.base.json", "compilerOptions": { - "lib": ["dom", "dom.iterable", "es2022"], + "lib": ["dom", "dom.iterable", "es2022", "esnext.disposable"], "paths": { "@env/*": ["src/env/browser/*"], "path": ["node_modules/path-browserify"] From 75c89e7595bf2c317652d5c54755fbdd27eec34f Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 17 Oct 2023 02:59:22 -0400 Subject: [PATCH 0058/1012] Removes `radius` sensitivity as it breaks clicks Refs: https://github.com/naver/billboard.js/issues/3466 --- src/webviews/apps/plus/timeline/chart.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/webviews/apps/plus/timeline/chart.ts b/src/webviews/apps/plus/timeline/chart.ts index 3f5195ed60f7d..6e23bd366f6a7 100644 --- a/src/webviews/apps/plus/timeline/chart.ts +++ b/src/webviews/apps/plus/timeline/chart.ts @@ -411,9 +411,9 @@ export class TimelineChart implements Disposable { // hide: this.compact ? [...this._authorsByIndex.values()] : undefined, padding: 10, }, - point: { - sensitivity: 'radius', - }, + // point: { + // sensitivity: 'radius', + // }, resize: { auto: false, }, From bbfb66a7e1b7c28e9b7ced8fc7e730990a073107 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 17 Oct 2023 01:09:09 -0400 Subject: [PATCH 0059/1012] Reorders props --- src/container.ts | 56 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/container.ts b/src/container.ts index e7744880de8fb..561027f31d674 100644 --- a/src/container.ts +++ b/src/container.ts @@ -330,6 +330,11 @@ export class Container { return this._accountAuthentication; } + private readonly _accountView: WebviewViewProxy; + get accountView() { + return this._accountView; + } + private readonly _actionRunners: ActionRunners; get actionRunners() { return this._actionRunners; @@ -396,6 +401,11 @@ export class Container { return this._context.extensionMode === ExtensionMode.Development; } + private readonly _deepLinks: DeepLinkService; + get deepLinks() { + return this._deepLinks; + } + @memoize() get env(): Environment { if (this.prereleaseOrDebugging) { @@ -422,21 +432,6 @@ export class Container { return this._fileHistoryView; } - private readonly _git: GitProviderService; - get git() { - return this._git; - } - - private readonly _uri: UriService; - get uri() { - return this._uri; - } - - private readonly _deepLinks: DeepLinkService; - get deepLinks() { - return this._deepLinks; - } - private _focus: FocusService | undefined; get focus() { if (this._focus == null) { @@ -446,6 +441,11 @@ export class Container { return this._focus; } + private readonly _git: GitProviderService; + get git() { + return this._git; + } + private _github: Promise | undefined; get github() { if (this._github == null) { @@ -502,11 +502,6 @@ export class Container { return this._homeView; } - private readonly _accountView: WebviewViewProxy; - get accountView() { - return this._accountView; - } - @memoize() get id() { return this._context.extension.id; @@ -551,6 +546,14 @@ export class Container { return this._lineTracker; } + private _mode: ModeConfig | undefined; + get mode() { + if (this._mode == null) { + this._mode = configuration.get('modes')?.[configuration.get('mode.active')]; + } + return this._mode; + } + private readonly _prerelease; get prerelease() { return this._prerelease; @@ -637,6 +640,11 @@ export class Container { return this._tracker; } + private readonly _uri: UriService; + get uri() { + return this._uri; + } + private readonly _usage: UsageTracker; get usage(): UsageTracker { return this._usage; @@ -678,14 +686,6 @@ export class Container { return this._worktreesView; } - private _mode: ModeConfig | undefined; - get mode() { - if (this._mode == null) { - this._mode = configuration.get('modes')?.[configuration.get('mode.active')]; - } - return this._mode; - } - private ensureModeApplied() { const mode = this.mode; if (mode == null) { From 044887bf00452cd1efeb538861d5adf632448734 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 17 Oct 2023 01:09:54 -0400 Subject: [PATCH 0060/1012] Un-nests ifs --- src/plus/webviews/graph/graphWebview.ts | 12 +++++------- src/plus/webviews/timeline/timelineWebview.ts | 6 ++---- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts index e4f58fe6a2a06..a6cb4eba4d606 100644 --- a/src/plus/webviews/graph/graphWebview.ts +++ b/src/plus/webviews/graph/graphWebview.ts @@ -753,13 +753,11 @@ export class GraphWebviewProvider implements WebviewProvider { } private onThemeChanged(theme: ColorTheme) { - if (this._theme != null) { - if ( - (isDarkTheme(theme) && isDarkTheme(this._theme)) || - (isLightTheme(theme) && isLightTheme(this._theme)) - ) { - return; - } + if ( + this._theme != null && + ((isDarkTheme(theme) && isDarkTheme(this._theme)) || (isLightTheme(theme) && isLightTheme(this._theme))) + ) { + return; } this._theme = theme; diff --git a/src/plus/webviews/timeline/timelineWebview.ts b/src/plus/webviews/timeline/timelineWebview.ts index 6ddf2467c82c1..65550cc3702b0 100644 --- a/src/plus/webviews/timeline/timelineWebview.ts +++ b/src/plus/webviews/timeline/timelineWebview.ts @@ -223,10 +223,8 @@ export class TimelineWebviewProvider implements WebviewProvider { if (e.data == null) return; let uri: Uri | undefined = e.data.uri; - if (uri != null) { - if (!this.container.git.isTrackable(uri)) { - uri = undefined; - } + if (uri != null && !this.container.git.isTrackable(uri)) { + uri = undefined; } if (!this.updatePendingUri(uri)) return; From 7f4466bce83d908877d7dd295732b0b815584129 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 17 Oct 2023 01:24:50 -0400 Subject: [PATCH 0061/1012] Improves graph restore on startup --- src/plus/webviews/graph/graphWebview.ts | 32 +++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts index a6cb4eba4d606..1671ae66044bf 100644 --- a/src/plus/webviews/graph/graphWebview.ts +++ b/src/plus/webviews/graph/graphWebview.ts @@ -217,7 +217,9 @@ export class GraphWebviewProvider implements WebviewProvider { return this._selection?.[0]; } + private _discovering: Promise | undefined; private readonly _disposable: Disposable; + private _etag?: number; private _etagSubscription?: number; private _etagRepository?: number; private _firstSelection = true; @@ -261,7 +263,16 @@ export class GraphWebviewProvider implements WebviewProvider { this._disposable = Disposable.from( configuration.onDidChange(this.onConfigurationChanged, this), this.container.subscription.onDidChange(this.onSubscriptionChanged, this), - this.container.git.onDidChangeRepositories(() => void this.host.refresh(true)), + this.container.git.onDidChangeRepositories(async () => { + if (this._etag !== this.container.git.etag) { + if (this._discovering != null) { + this._etag = await this._discovering; + if (this._etag === this.container.git.etag) return; + } + + void this.host.refresh(true); + } + }), window.onDidChangeActiveColorTheme(this.onThemeChanged, this), { dispose: () => { @@ -284,6 +295,15 @@ export class GraphWebviewProvider implements WebviewProvider { ): Promise { this._firstSelection = true; + this._etag = this.container.git.etag; + if (this.container.git.isDiscoveringRepositories) { + this._discovering = this.container.git.isDiscoveringRepositories.then(r => { + this._discovering = undefined; + return r; + }); + this._etag = await this._discovering; + } + const [arg] = args; if (isRepository(arg)) { this.repository = arg; @@ -508,10 +528,10 @@ export class GraphWebviewProvider implements WebviewProvider { } onFocusChanged(focused: boolean): void { + this._showActiveSelectionDetailsDebounced?.cancel(); void this.notifyDidChangeFocus(focused); if (!focused || this.activeSelection == null || !this.container.commitDetailsView.visible) { - this._showActiveSelectionDetailsDebounced?.cancel(); return; } @@ -810,6 +830,8 @@ export class GraphWebviewProvider implements WebviewProvider { ); } } else if (e.type === 'row' && e.row) { + this._showActiveSelectionDetailsDebounced?.cancel(); + const commit = this.getRevisionReference(this.repository?.path, e.row.id, e.row.type); if (commit != null) { this.container.events.fire( @@ -1166,11 +1188,13 @@ export class GraphWebviewProvider implements WebviewProvider { undefined; private onSelectionChanged(e: UpdateSelectionParams) { + this._showActiveSelectionDetailsDebounced?.cancel(); + const item = e.selection[0]; this.setSelectedRows(item?.id); if (this._fireSelectionChangedDebounced == null) { - this._fireSelectionChangedDebounced = debounce(this.fireSelectionChanged.bind(this), 250); + this._fireSelectionChangedDebounced = debounce(this.fireSelectionChanged.bind(this), 50); } this._fireSelectionChangedDebounced(item?.id, item?.type); @@ -1900,7 +1924,7 @@ export class GraphWebviewProvider implements WebviewProvider { const columnSettings = this.getColumnSettings(columns); const dataPromise = this.container.git.getCommitsForGraph( - this.repository.path, + this.repository.uri, uri => this.host.asWebviewUri(uri), { include: { From 16692734bf24e087672244fd0451b201474c0eec Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 17 Oct 2023 01:42:20 -0400 Subject: [PATCH 0062/1012] Adds support for multi-instance webview panels - Prepares Graph, Focus, & Timeline for multi-instance support --- src/constants.ts | 1 - src/container.ts | 38 ++-- src/plus/webviews/account/accountWebview.ts | 3 +- src/plus/webviews/account/protocol.ts | 7 +- src/plus/webviews/focus/focusWebview.ts | 20 +- src/plus/webviews/focus/protocol.ts | 7 +- src/plus/webviews/focus/registration.ts | 15 +- src/plus/webviews/graph/graphWebview.ts | 21 ++- src/plus/webviews/graph/protocol.ts | 7 +- src/plus/webviews/graph/registration.ts | 25 ++- src/plus/webviews/timeline/protocol.ts | 7 +- src/plus/webviews/timeline/registration.ts | 15 +- src/plus/webviews/timeline/timelineWebview.ts | 47 ++--- src/system/webview.ts | 6 +- .../apps/commitDetails/commitDetails.html | 2 +- src/webviews/apps/home/home.html | 6 +- src/webviews/apps/plus/account/account.html | 2 +- src/webviews/apps/plus/focus/focus.html | 6 +- src/webviews/apps/plus/graph/GraphWrapper.tsx | 14 +- src/webviews/apps/plus/graph/graph.html | 2 +- src/webviews/apps/plus/timeline/timeline.html | 6 +- src/webviews/apps/rebase/rebase.html | 6 +- src/webviews/apps/settings/settings.html | 6 +- src/webviews/apps/welcome/welcome.html | 2 +- .../commitDetails/commitDetailsWebview.ts | 3 +- src/webviews/commitDetails/protocol.ts | 6 +- src/webviews/home/homeWebview.ts | 3 +- src/webviews/home/protocol.ts | 7 +- src/webviews/protocol.ts | 7 + src/webviews/rebase/protocol.ts | 6 +- src/webviews/rebase/rebaseEditor.ts | 2 + src/webviews/settings/protocol.ts | 7 +- src/webviews/settings/registration.ts | 8 +- src/webviews/settings/settingsWebview.ts | 3 +- src/webviews/webviewCommandRegistrar.ts | 19 +- src/webviews/webviewController.ts | 41 ++-- src/webviews/webviewsController.ts | 178 +++++++++++++++--- src/webviews/welcome/protocol.ts | 7 +- src/webviews/welcome/registration.ts | 2 +- src/webviews/welcome/welcomeWebview.ts | 3 +- 40 files changed, 380 insertions(+), 193 deletions(-) diff --git a/src/constants.ts b/src/constants.ts index db3461afd9707..6d91266ac4c1e 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -223,7 +223,6 @@ export const enum Commands { RefreshFocus = 'gitlens.focus.refresh', RefreshGraph = 'gitlens.graph.refresh', RefreshHover = 'gitlens.refreshHover', - RefreshTimelinePage = 'gitlens.timeline.refresh', ResetAvatarCache = 'gitlens.resetAvatarCache', ResetAIKey = 'gitlens.resetAIKey', ResetSuppressedWarnings = 'gitlens.resetSuppressedWarnings', diff --git a/src/container.ts b/src/container.ts index 561027f31d674..4a25bbd836a5e 100644 --- a/src/container.ts +++ b/src/container.ts @@ -27,14 +27,18 @@ import { ServerConnection } from './plus/gk/serverConnection'; import { IntegrationAuthenticationService } from './plus/integrationAuthentication'; import { SubscriptionService } from './plus/subscription/subscriptionService'; import { registerAccountWebviewView } from './plus/webviews/account/registration'; -import { registerFocusWebviewPanel } from './plus/webviews/focus/registration'; +import { registerFocusWebviewCommands, registerFocusWebviewPanel } from './plus/webviews/focus/registration'; import { registerGraphWebviewCommands, registerGraphWebviewPanel, registerGraphWebviewView, } from './plus/webviews/graph/registration'; import { GraphStatusBarController } from './plus/webviews/graph/statusbar'; -import { registerTimelineWebviewPanel, registerTimelineWebviewView } from './plus/webviews/timeline/registration'; +import { + registerTimelineWebviewCommands, + registerTimelineWebviewPanel, + registerTimelineWebviewView, +} from './plus/webviews/timeline/registration'; import { scheduleAddMissingCurrentWorkspaceRepos, WorkspacesService } from './plus/workspaces/workspacesService'; import { StatusBarController } from './statusbar/statusBarController'; import { executeCommand } from './system/command'; @@ -73,7 +77,7 @@ import { import { registerHomeWebviewView } from './webviews/home/registration'; import { RebaseEditorProvider } from './webviews/rebase/rebaseEditor'; import { registerSettingsWebviewCommands, registerSettingsWebviewPanel } from './webviews/settings/registration'; -import type { WebviewPanelProxy, WebviewViewProxy } from './webviews/webviewsController'; +import type { WebviewViewProxy } from './webviews/webviewsController'; import { WebviewsController } from './webviews/webviewsController'; import { registerWelcomeWebviewPanel } from './webviews/welcome/registration'; @@ -220,20 +224,29 @@ export class Container { this._disposables.push((this._codeLensController = new GitCodeLensController(this))); this._disposables.push((this._webviews = new WebviewsController(this))); - this._disposables.push(registerTimelineWebviewPanel(this._webviews)); - this._disposables.push((this._timelineView = registerTimelineWebviewView(this._webviews))); - this._disposables.push((this._graphPanel = registerGraphWebviewPanel(this._webviews))); - this._disposables.push(registerGraphWebviewCommands(this, this._graphPanel)); + const graphPanels = registerGraphWebviewPanel(this._webviews); + this._disposables.push(graphPanels); + this._disposables.push(registerGraphWebviewCommands(this, graphPanels)); this._disposables.push((this._graphView = registerGraphWebviewView(this._webviews))); this._disposables.push(new GraphStatusBarController(this)); - const settingsWebviewPanel = registerSettingsWebviewPanel(this._webviews); - this._disposables.push(settingsWebviewPanel); - this._disposables.push(registerSettingsWebviewCommands(settingsWebviewPanel)); - this._disposables.push(registerWelcomeWebviewPanel(this._webviews)); + const focusPanels = registerFocusWebviewPanel(this._webviews); + this._disposables.push(focusPanels); + this._disposables.push(registerFocusWebviewCommands(focusPanels)); + + const timelinePanels = registerTimelineWebviewPanel(this._webviews); + this._disposables.push(timelinePanels); + this._disposables.push(registerTimelineWebviewCommands(timelinePanels)); + this._disposables.push((this._timelineView = registerTimelineWebviewView(this._webviews))); + this._disposables.push((this._rebaseEditor = new RebaseEditorProvider(this))); - this._disposables.push(registerFocusWebviewPanel(this._webviews)); + + const settingsPanels = registerSettingsWebviewPanel(this._webviews); + this._disposables.push(settingsPanels); + this._disposables.push(registerSettingsWebviewCommands(settingsPanels)); + + this._disposables.push(registerWelcomeWebviewPanel(this._webviews)); this._disposables.push(new ViewFileDecorationProvider()); @@ -491,7 +504,6 @@ export class Container { return this._graphDetailsView; } - private readonly _graphPanel: WebviewPanelProxy; private readonly _graphView: WebviewViewProxy; get graphView() { return this._graphView; diff --git a/src/plus/webviews/account/accountWebview.ts b/src/plus/webviews/account/accountWebview.ts index 0abd69ffb0252..f15b08b443f7f 100644 --- a/src/plus/webviews/account/accountWebview.ts +++ b/src/plus/webviews/account/accountWebview.ts @@ -87,8 +87,7 @@ export class AccountWebviewProvider implements WebviewProvider { const subscriptionResult = await this.getSubscription(subscription); return { - webviewId: this.host.id, - timestamp: Date.now(), + ...this.host.baseWebviewState, webroot: this.host.getWebRoot(), subscription: subscriptionResult.subscription, avatar: subscriptionResult.avatar, diff --git a/src/plus/webviews/account/protocol.ts b/src/plus/webviews/account/protocol.ts index 30b27ffaa6122..75a3ae58fbc0d 100644 --- a/src/plus/webviews/account/protocol.ts +++ b/src/plus/webviews/account/protocol.ts @@ -1,11 +1,8 @@ -import type { WebviewIds, WebviewViewIds } from '../../../constants'; import type { Subscription } from '../../../subscription'; +import type { WebviewState } from '../../../webviews/protocol'; import { IpcNotificationType } from '../../../webviews/protocol'; -export interface State { - webviewId: WebviewIds | WebviewViewIds; - timestamp: number; - +export interface State extends WebviewState { webroot?: string; subscription: Subscription; avatar?: string; diff --git a/src/plus/webviews/focus/focusWebview.ts b/src/plus/webviews/focus/focusWebview.ts index 8b0ac774fb65b..44f3f12c2ab3e 100644 --- a/src/plus/webviews/focus/focusWebview.ts +++ b/src/plus/webviews/focus/focusWebview.ts @@ -24,7 +24,7 @@ import type { GitWorktree } from '../../../git/models/worktree'; import { getWorktreeForBranch } from '../../../git/models/worktree'; import { parseGitRemoteUrl } from '../../../git/parsers/remoteParser'; import type { RichRemoteProvider } from '../../../git/remotes/richRemoteProvider'; -import { executeCommand, registerCommand } from '../../../system/command'; +import { executeCommand } from '../../../system/command'; import { debug } from '../../../system/decorators/log'; import { Logger } from '../../../system/logger'; import { getLogScope } from '../../../system/logger.scope'; @@ -115,10 +115,6 @@ export class FocusWebviewProvider implements WebviewProvider { this._disposable.dispose(); } - registerCommands(): Disposable[] { - return [registerCommand(Commands.RefreshFocus, () => this.host.refresh(true))]; - } - onMessageReceived(e: IpcMessage) { switch (e.method) { case OpenBranchCommandType.method: @@ -433,7 +429,7 @@ export class FocusWebviewProvider implements WebviewProvider { @debug() private async getState(force?: boolean, deferState?: boolean): Promise { - const webviewId = this.host.id; + const baseState = this.host.baseWebviewState; this._etag = this.container.git.etag; if (this.container.git.isDiscoveringRepositories) { @@ -447,8 +443,7 @@ export class FocusWebviewProvider implements WebviewProvider { const access = await this.getAccess(force); if (access.allowed !== true) { return { - webviewId: webviewId, - timestamp: Date.now(), + ...baseState, access: access, }; } @@ -460,8 +455,7 @@ export class FocusWebviewProvider implements WebviewProvider { if (!hasConnectedRepos) { return { - webviewId: webviewId, - timestamp: Date.now(), + ...baseState, access: access, repos: githubRepos.map(r => serializeRepoWithRichRemote(r)), }; @@ -478,8 +472,7 @@ export class FocusWebviewProvider implements WebviewProvider { async function getStateCore() { const [prsResult, issuesResult, enrichedItems] = await statePromise; return { - webviewId: webviewId, - timestamp: Date.now(), + ...baseState, access: access, repos: repos, pullRequests: getSettledValue(prsResult)?.map(pr => ({ @@ -508,8 +501,7 @@ export class FocusWebviewProvider implements WebviewProvider { }); return { - webviewId: webviewId, - timestamp: Date.now(), + ...baseState, access: access, repos: repos, }; diff --git a/src/plus/webviews/focus/protocol.ts b/src/plus/webviews/focus/protocol.ts index f40778ce4eb5b..33d769700e9eb 100644 --- a/src/plus/webviews/focus/protocol.ts +++ b/src/plus/webviews/focus/protocol.ts @@ -1,14 +1,11 @@ -import type { WebviewIds, WebviewViewIds } from '../../../constants'; import type { FeatureAccess } from '../../../features'; import type { IssueShape } from '../../../git/models/issue'; import type { PullRequestShape } from '../../../git/models/pullRequest'; +import type { WebviewState } from '../../../webviews/protocol'; import { IpcCommandType, IpcNotificationType } from '../../../webviews/protocol'; import type { EnrichedItem } from '../../focus/focusService'; -export interface State { - webviewId: WebviewIds | WebviewViewIds; - timestamp: number; - +export interface State extends WebviewState { access: FeatureAccess; pullRequests?: PullRequestResult[]; issues?: IssueResult[]; diff --git a/src/plus/webviews/focus/registration.ts b/src/plus/webviews/focus/registration.ts index 44f70f73c0934..da51309e27b9e 100644 --- a/src/plus/webviews/focus/registration.ts +++ b/src/plus/webviews/focus/registration.ts @@ -1,11 +1,12 @@ -import { ViewColumn } from 'vscode'; +import { Disposable, ViewColumn } from 'vscode'; import { Commands } from '../../../constants'; -import type { WebviewsController } from '../../../webviews/webviewsController'; +import { registerCommand } from '../../../system/command'; +import type { WebviewPanelsProxy, WebviewsController } from '../../../webviews/webviewsController'; import type { State } from './protocol'; export function registerFocusWebviewPanel(controller: WebviewsController) { return controller.registerWebviewPanel( - Commands.ShowFocusPage, + { id: Commands.ShowFocusPage }, { id: 'gitlens.focus', fileName: 'focus.html', @@ -26,3 +27,11 @@ export function registerFocusWebviewPanel(controller: WebviewsController) { }, ); } + +export function registerFocusWebviewCommands(panels: WebviewPanelsProxy) { + return Disposable.from( + registerCommand(`${panels.id}.refresh`, () => { + void panels.getActiveOrFirstInstance()?.refresh(true); + }), + ); +} diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts index 1671ae66044bf..c434563a62039 100644 --- a/src/plus/webviews/graph/graphWebview.ts +++ b/src/plus/webviews/graph/graphWebview.ts @@ -84,6 +84,7 @@ import { RepositoryFolderNode } from '../../../views/nodes/viewNode'; import type { IpcMessage, IpcNotificationType } from '../../../webviews/protocol'; import { onIpc } from '../../../webviews/protocol'; import type { WebviewController, WebviewProvider } from '../../../webviews/webviewController'; +import type { WebviewPanelShowCommandArgs } from '../../../webviews/webviewsController'; import { isSerializedState } from '../../../webviews/webviewsController'; import type { SubscriptionChangeEvent } from '../../subscription/subscriptionService'; import type { @@ -363,13 +364,17 @@ export class GraphWebviewProvider implements WebviewProvider { registerCommands(): Disposable[] { return [ - registerCommand(`${this.host.id}.refresh`, () => this.host.refresh(true)), - ...(this.host.isView() ? [ + registerCommand(`${this.host.id}.refresh`, () => this.host.refresh(true)), registerCommand( `${this.host.id}.openInTab`, - () => void executeCommand(Commands.ShowGraphPage, this.repository), + () => + void executeCommand( + Commands.ShowGraphPage, + undefined, + this.repository, + ), ), ] : []), @@ -668,7 +673,7 @@ export class GraphWebviewProvider implements WebviewProvider { private showActiveSelectionDetailsCore() { const { activeSelection } = this; - if (activeSelection == null) return; + if (activeSelection == null || !this.host.active) return; this.container.events.fire( 'commit:selected', @@ -1209,6 +1214,7 @@ export class GraphWebviewProvider implements WebviewProvider { this._selection = commits; if (commits == null) return; + if (!this._firstSelection && !this.host.active) return; this.container.events.fire( 'commit:selected', @@ -1899,13 +1905,13 @@ export class GraphWebviewProvider implements WebviewProvider { private async getState(deferRows?: boolean): Promise { if (this.container.git.repositoryCount === 0) { - return { webviewId: this.host.id, timestamp: Date.now(), allowed: true, repositories: [] }; + return { ...this.host.baseWebviewState, allowed: true, repositories: [] }; } if (this.repository == null) { this.repository = this.container.git.getBestRepositoryOrFirst(); if (this.repository == null) { - return { webviewId: this.host.id, timestamp: Date.now(), allowed: true, repositories: [] }; + return { ...this.host.baseWebviewState, allowed: true, repositories: [] }; } } @@ -1990,8 +1996,7 @@ export class GraphWebviewProvider implements WebviewProvider { } return { - webviewId: this.host.id, - timestamp: Date.now(), + ...this.host.baseWebviewState, windowFocused: this.isWindowFocused, repositories: formatRepositories(this.container.git.openRepositories), selectedRepository: this.repository.path, diff --git a/src/plus/webviews/graph/protocol.ts b/src/plus/webviews/graph/protocol.ts index cfe1144dd0b03..b23b39217a044 100644 --- a/src/plus/webviews/graph/protocol.ts +++ b/src/plus/webviews/graph/protocol.ts @@ -23,7 +23,6 @@ import type { WorkDirStats, } from '@gitkraken/gitkraken-components'; import type { Config, DateStyle } from '../../../config'; -import type { WebviewIds, WebviewViewIds } from '../../../constants'; import type { RepositoryVisibility } from '../../../git/gitProvider'; import type { GitTrackingState } from '../../../git/models/branch'; import type { GitGraphRowType } from '../../../git/models/graph'; @@ -38,6 +37,7 @@ import type { GitSearchResultData, SearchQuery } from '../../../git/search'; import type { Subscription } from '../../../subscription'; import type { DateTimeFormat } from '../../../system/date'; import type { WebviewItemContext, WebviewItemGroupContext } from '../../../system/webview'; +import type { WebviewState } from '../../../webviews/protocol'; import { IpcCommandType, IpcNotificationType } from '../../../webviews/protocol'; export type { GraphRefType } from '@gitkraken/gitkraken-components'; @@ -81,10 +81,7 @@ export type GraphMinimapMarkerTypes = export const supportedRefMetadataTypes: GraphRefMetadataType[] = ['upstream', 'pullRequest', 'issue']; -export interface State { - webviewId: WebviewIds | WebviewViewIds; - timestamp: number; - +export interface State extends WebviewState { windowFocused?: boolean; repositories?: GraphRepository[]; selectedRepository?: string; diff --git a/src/plus/webviews/graph/registration.ts b/src/plus/webviews/graph/registration.ts index ebc4b9b36c8ef..a331893ec9213 100644 --- a/src/plus/webviews/graph/registration.ts +++ b/src/plus/webviews/graph/registration.ts @@ -10,12 +10,16 @@ import type { CommitFileNode } from '../../../views/nodes/commitFileNode'; import type { CommitNode } from '../../../views/nodes/commitNode'; import type { StashNode } from '../../../views/nodes/stashNode'; import type { TagNode } from '../../../views/nodes/tagNode'; -import type { WebviewPanelProxy, WebviewsController } from '../../../webviews/webviewsController'; +import type { + WebviewPanelShowCommandArgs, + WebviewPanelsProxy, + WebviewsController, +} from '../../../webviews/webviewsController'; import type { ShowInCommitGraphCommandArgs, State } from './protocol'; export function registerGraphWebviewPanel(controller: WebviewsController) { return controller.registerWebviewPanel( - Commands.ShowGraphPage, + { id: Commands.ShowGraphPage }, { id: 'gitlens.graph', fileName: 'graph.html', @@ -57,18 +61,18 @@ export function registerGraphWebviewView(controller: WebviewsController) { ); } -export function registerGraphWebviewCommands(container: Container, webview: WebviewPanelProxy) { +export function registerGraphWebviewCommands(container: Container, panels: WebviewPanelsProxy) { return Disposable.from( - registerCommand(Commands.ShowGraph, (...args: any[]) => + registerCommand(Commands.ShowGraph, (...args: unknown[]) => configuration.get('graph.layout') === 'panel' ? executeCommand(Commands.ShowGraphView, ...args) - : executeCommand(Commands.ShowGraphPage, ...args), + : executeCommand(Commands.ShowGraphPage, undefined, ...args), ), - registerCommand('gitlens.graph.switchToEditorLayout', async () => { + registerCommand(`${panels.id}.switchToEditorLayout`, async () => { await configuration.updateEffective('graph.layout', 'editor'); - queueMicrotask(() => void executeCommand(Commands.ShowGraphPage)); + queueMicrotask(() => void executeCommand(Commands.ShowGraphPage)); }), - registerCommand('gitlens.graph.switchToPanelLayout', async () => { + registerCommand(`${panels.id}.switchToPanelLayout`, async () => { await configuration.updateEffective('graph.layout', 'panel'); queueMicrotask(async () => { await executeCoreCommand('gitlens.views.graph.resetViewLocation'); @@ -107,7 +111,7 @@ export function registerGraphWebviewCommands(container: Container, webview: Webv if (configuration.get('graph.layout') === 'panel') { void container.graphView.show({ preserveFocus: preserveFocus }, args); } else { - void webview.show({ preserveFocus: preserveFocus }, args); + void panels.show({ preserveFocus: preserveFocus }, args); } }, ), @@ -127,5 +131,8 @@ export function registerGraphWebviewCommands(container: Container, webview: Webv void container.graphView.show({ preserveFocus: preserveFocus }, args); }, ), + registerCommand(`${panels.id}.refresh`, () => { + void panels.getActiveOrFirstInstance()?.refresh(true); + }), ); } diff --git a/src/plus/webviews/timeline/protocol.ts b/src/plus/webviews/timeline/protocol.ts index 4666e0690f1b9..7599e648f604b 100644 --- a/src/plus/webviews/timeline/protocol.ts +++ b/src/plus/webviews/timeline/protocol.ts @@ -1,11 +1,8 @@ -import type { WebviewIds, WebviewViewIds } from '../../../constants'; import type { FeatureAccess } from '../../../features'; +import type { WebviewState } from '../../../webviews/protocol'; import { IpcCommandType, IpcNotificationType } from '../../../webviews/protocol'; -export interface State { - webviewId: WebviewIds | WebviewViewIds; - timestamp: number; - +export interface State extends WebviewState { dataset?: Commit[]; period: Period; title?: string; diff --git a/src/plus/webviews/timeline/registration.ts b/src/plus/webviews/timeline/registration.ts index 957cb208cd7e1..8cbf01f4967fc 100644 --- a/src/plus/webviews/timeline/registration.ts +++ b/src/plus/webviews/timeline/registration.ts @@ -1,11 +1,12 @@ -import { ViewColumn } from 'vscode'; +import { Disposable, ViewColumn } from 'vscode'; import { Commands } from '../../../constants'; -import type { WebviewsController } from '../../../webviews/webviewsController'; +import { registerCommand } from '../../../system/command'; +import type { WebviewPanelsProxy, WebviewsController } from '../../../webviews/webviewsController'; import type { State } from './protocol'; export function registerTimelineWebviewPanel(controller: WebviewsController) { return controller.registerWebviewPanel( - Commands.ShowTimelinePage, + { id: Commands.ShowTimelinePage }, { id: 'gitlens.timeline', fileName: 'timeline.html', @@ -46,3 +47,11 @@ export function registerTimelineWebviewView(controller: WebviewsController) { }, ); } + +export function registerTimelineWebviewCommands(panels: WebviewPanelsProxy) { + return Disposable.from( + registerCommand(`${panels.id}.refresh`, () => { + void panels.getActiveOrFirstInstance()?.refresh(true); + }), + ); +} diff --git a/src/plus/webviews/timeline/timelineWebview.ts b/src/plus/webviews/timeline/timelineWebview.ts index 65550cc3702b0..06b964497b44c 100644 --- a/src/plus/webviews/timeline/timelineWebview.ts +++ b/src/plus/webviews/timeline/timelineWebview.ts @@ -1,5 +1,5 @@ import type { TextEditor, ViewColumn } from 'vscode'; -import { commands, Disposable, Uri, window } from 'vscode'; +import { Disposable, Uri, window } from 'vscode'; import { Commands } from '../../../constants'; import type { Container } from '../../../container'; import type { CommitSelectedEvent, FileSelectedEvent } from '../../../eventBus'; @@ -9,7 +9,7 @@ import { GitUri } from '../../../git/gitUri'; import { getChangedFilesCount } from '../../../git/models/commit'; import type { RepositoryChangeEvent } from '../../../git/models/repository'; import { RepositoryChange, RepositoryChangeComparisonMode } from '../../../git/models/repository'; -import { registerCommand } from '../../../system/command'; +import { executeCommand, registerCommand } from '../../../system/command'; import { configuration } from '../../../system/configuration'; import { createFromDateDelta } from '../../../system/date'; import { debug } from '../../../system/decorators/log'; @@ -23,6 +23,7 @@ import type { IpcMessage } from '../../../webviews/protocol'; import { onIpc } from '../../../webviews/protocol'; import type { WebviewController, WebviewProvider } from '../../../webviews/webviewController'; import { updatePendingContext } from '../../../webviews/webviewController'; +import type { WebviewPanelShowCommandArgs } from '../../../webviews/webviewsController'; import { isSerializedState } from '../../../webviews/webviewsController'; import type { SubscriptionChangeEvent } from '../../subscription/subscriptionService'; import type { Commit, Period, State } from './protocol'; @@ -127,14 +128,24 @@ export class TimelineWebviewProvider implements WebviewProvider { } registerCommands(): Disposable[] { - if (this.host.isEditor()) { - return [registerCommand(Commands.RefreshTimelinePage, () => this.host.refresh(true))]; - } - - return [ - registerCommand(`${this.host.id}.refresh`, () => this.host.refresh(true), this), - registerCommand(`${this.host.id}.openInTab`, () => this.openInTab(), this), - ]; + return this.host.isView() + ? [ + registerCommand(`${this.host.id}.refresh`, () => this.host.refresh(true), this), + registerCommand( + `${this.host.id}.openInTab`, + () => { + if (this._context.uri == null) return; + + void executeCommand( + Commands.ShowTimelinePage, + { _type: 'WebviewPanelShowOptions' }, + this._context.uri, + ); + }, + this, + ), + ] + : []; } onVisibilityChanged(visible: boolean) { @@ -280,8 +291,7 @@ export class TimelineWebviewProvider implements WebviewProvider { if (current.uri == null || gitUri == null || repoPath == null || access.allowed === false) { const access = await this.container.git.access(PlusFeatures.Timeline, repoPath); return { - webviewId: this.host.id, - timestamp: Date.now(), + ...this.host.baseWebviewState, period: period, title: gitUri?.relativePath, sha: gitUri?.shortSha, @@ -303,8 +313,7 @@ export class TimelineWebviewProvider implements WebviewProvider { if (log == null) { return { - webviewId: this.host.id, - timestamp: Date.now(), + ...this.host.baseWebviewState, dataset: [], period: period, title: gitUri.relativePath, @@ -362,8 +371,7 @@ export class TimelineWebviewProvider implements WebviewProvider { dataset.sort((a, b) => b.sort - a.sort); return { - webviewId: this.host.id, - timestamp: Date.now(), + ...this.host.baseWebviewState, dataset: dataset, period: period, title: gitUri.relativePath, @@ -441,13 +449,6 @@ export class TimelineWebviewProvider implements WebviewProvider { if (!this.host.isView()) return task(); return window.withProgress({ location: { viewId: this.host.id } }, task); } - - private openInTab() { - const uri = this._context.uri; - if (uri == null) return; - - void commands.executeCommand(Commands.ShowTimelinePage, uri); - } } function getPeriodDate(period: Period): Date | undefined { diff --git a/src/system/webview.ts b/src/system/webview.ts index 4848ce96968c1..6ee2a0d8fb74c 100644 --- a/src/system/webview.ts +++ b/src/system/webview.ts @@ -3,12 +3,16 @@ import type { WebviewIds, WebviewViewIds } from '../constants'; export function createWebviewCommandLink( command: `${WebviewIds | WebviewViewIds}.${string}`, webviewId: WebviewIds | WebviewViewIds, + webviewInstanceId: string | undefined, ): string { - return `command:${command}?${encodeURIComponent(JSON.stringify({ webview: webviewId } satisfies WebviewContext))}`; + return `command:${command}?${encodeURIComponent( + JSON.stringify({ webview: webviewId, webviewInstance: webviewInstanceId } satisfies WebviewContext), + )}`; } export interface WebviewContext { webview: WebviewIds | WebviewViewIds; + webviewInstance: string | undefined; } export function isWebviewContext(item: object | null | undefined): item is WebviewContext { diff --git a/src/webviews/apps/commitDetails/commitDetails.html b/src/webviews/apps/commitDetails/commitDetails.html index 80e3966233598..d6dc36ce0748f 100644 --- a/src/webviews/apps/commitDetails/commitDetails.html +++ b/src/webviews/apps/commitDetails/commitDetails.html @@ -19,7 +19,7 @@ #{endOfBody} diff --git a/src/webviews/apps/home/home.html b/src/webviews/apps/home/home.html index c10bf9b57da84..16ccb17cdca79 100644 --- a/src/webviews/apps/home/home.html +++ b/src/webviews/apps/home/home.html @@ -16,7 +16,11 @@ - +
+

✨ Requires a trial or paid plan to use this on privately hosted repos.
☁️ Requires an account and access is based on your plan, e.g. Free, Pro, etc diff --git a/src/webviews/apps/home/home.scss b/src/webviews/apps/home/home.scss index 5209dadfc16cf..e104a7e7381fa 100644 --- a/src/webviews/apps/home/home.scss +++ b/src/webviews/apps/home/home.scss @@ -373,12 +373,25 @@ gl-button { &__label { font-weight: 600; + width: 100%; + } + + &__access { + position: relative; + left: 1.5rem; + filter: grayscale(1); + opacity: 0.4; } &__item:hover &__label { text-decoration: underline; } + &__item:hover &__access { + filter: none; + opacity: 1; + } + &__title { padding: 0 2rem; } diff --git a/src/webviews/apps/welcome/welcome.html b/src/webviews/apps/welcome/welcome.html index 0a0a3620fd8a1..dfe5f7213b736 100644 --- a/src/webviews/apps/welcome/welcome.html +++ b/src/webviews/apps/welcome/welcome.html @@ -530,6 +530,27 @@

Configuration

> +

Companion Tools

+

Supercharge GitLens with our other dev tools

+ +

Resources

${when( From 61b51c750e7c601dba56d343b00a13d8bf88b76c Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Wed, 8 Nov 2023 14:17:36 -0700 Subject: [PATCH 0176/1012] Fixes initial patch repo location state on cloud patch open --- src/plus/drafts/draftsService.ts | 5 ++++- src/plus/repos/repositoryIdentityService.ts | 22 ++++++++++++--------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/plus/drafts/draftsService.ts b/src/plus/drafts/draftsService.ts index cf27364ef8d07..a5edbc91da0de 100644 --- a/src/plus/drafts/draftsService.ts +++ b/src/plus/drafts/draftsService.ts @@ -479,7 +479,10 @@ export class DraftService implements Disposable { const [contentsResult, repositoryResult] = await Promise.allSettled([ this.getPatchContentsCore(patch.secureLink), - this.container.repositoryIdentity.getRepositoryOrIdentity(patch.gkRepositoryId), + this.container.repositoryIdentity.getRepositoryOrIdentity(patch.gkRepositoryId, { + openIfNeeded: true, + skipRefValidation: true, + }), ]); const contents = getSettledValue(contentsResult)!; diff --git a/src/plus/repos/repositoryIdentityService.ts b/src/plus/repos/repositoryIdentityService.ts index c3353329c1c5b..8ecbf72553002 100644 --- a/src/plus/repos/repositoryIdentityService.ts +++ b/src/plus/repos/repositoryIdentityService.ts @@ -25,17 +25,17 @@ export class RepositoryIdentityService implements Disposable { getRepository( id: GkRepositoryId, - options?: { openIfNeeded?: boolean; prompt?: boolean }, + options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean }, ): Promise; getRepository( identity: RepositoryIdentity, - options?: { openIfNeeded?: boolean; prompt?: boolean }, + options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean }, ): Promise; @log() getRepository( idOrIdentity: GkRepositoryId | RepositoryIdentity, - options?: { openIfNeeded?: boolean; prompt?: boolean }, + options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean }, ): Promise { return this.locateRepository(idOrIdentity, options); } @@ -43,7 +43,7 @@ export class RepositoryIdentityService implements Disposable { @log() async getRepositoryOrIdentity( id: GkRepositoryId, - options?: { openIfNeeded?: boolean; prompt?: boolean }, + options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean }, ): Promise { const identity = await this.getRepositoryIdentity(id); return (await this.locateRepository(identity, options)) ?? identity; @@ -51,20 +51,20 @@ export class RepositoryIdentityService implements Disposable { private async locateRepository( id: GkRepositoryId, - options?: { openIfNeeded?: boolean; prompt?: boolean }, + options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean }, ): Promise; private async locateRepository( identity: RepositoryIdentity, - options?: { openIfNeeded?: boolean; prompt?: boolean }, + options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean }, ): Promise; private async locateRepository( idOrIdentity: GkRepositoryId | RepositoryIdentity, - options?: { openIfNeeded?: boolean; prompt?: boolean }, + options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean }, ): Promise; @log() private async locateRepository( idOrIdentity: GkRepositoryId | RepositoryIdentity, - options?: { openIfNeeded?: boolean; prompt?: boolean }, + options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean }, ): Promise { const identity = typeof idOrIdentity === 'string' ? await this.getRepositoryIdentity(idOrIdentity) : idOrIdentity; @@ -111,7 +111,11 @@ export class RepositoryIdentityService implements Disposable { } } - if (identity.initialCommitSha != null && identity.initialCommitSha !== missingRepositoryId) { + if ( + !options?.skipRefValidation && + identity.initialCommitSha != null && + identity.initialCommitSha !== missingRepositoryId + ) { // Repo ID can be any valid SHA in the repo, though standard practice is to use the // first commit SHA. if (await this.container.git.validateReference(repo.uri, identity.initialCommitSha)) { From a507615cb0a620a903a09e0858d1edc5fd5e7f34 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Wed, 8 Nov 2023 17:33:05 -0500 Subject: [PATCH 0177/1012] Adds links to cloud patches --- package.json | 9 +++++++++ src/commands/showView.ts | 3 +++ src/constants.ts | 1 + src/webviews/apps/home/home.html | 15 +++++++++++++++ src/webviews/apps/welcome/welcome.html | 14 ++++++++++++++ 5 files changed, 42 insertions(+) diff --git a/package.json b/package.json index 441d45bef12a0..8d8b7f674b75c 100644 --- a/package.json +++ b/package.json @@ -5093,6 +5093,11 @@ "title": "Show Contributors View", "category": "GitLens" }, + { + "command": "gitlens.showDraftsView", + "title": "Show Cloud Patches View", + "category": "GitLens" + }, { "command": "gitlens.showFileHistoryView", "title": "Show File History View", @@ -8597,6 +8602,10 @@ "command": "gitlens.showContributorsView", "when": "gitlens:enabled" }, + { + "command": "gitlens.showDraftsView", + "when": "gitlens:enabled" + }, { "command": "gitlens.showFileHistoryView", "when": "gitlens:enabled" diff --git a/src/commands/showView.ts b/src/commands/showView.ts index af4f4f9efec98..be20a6276342e 100644 --- a/src/commands/showView.ts +++ b/src/commands/showView.ts @@ -13,6 +13,7 @@ export class ShowViewCommand extends Command { Commands.ShowCommitDetailsView, Commands.ShowCommitsView, Commands.ShowContributorsView, + Commands.ShowDraftsView, Commands.ShowFileHistoryView, Commands.ShowGraphView, Commands.ShowHomeView, @@ -44,6 +45,8 @@ export class ShowViewCommand extends Command { return this.container.commitsView.show(); case Commands.ShowContributorsView: return this.container.contributorsView.show(); + case Commands.ShowDraftsView: + return this.container.draftsView.show(); case Commands.ShowFileHistoryView: return this.container.fileHistoryView.show(); case Commands.ShowHomeView: diff --git a/src/constants.ts b/src/constants.ts index 360f5506bc16a..815947cdd478c 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -242,6 +242,7 @@ export const enum Commands { ShowCommitsInView = 'gitlens.showCommitsInView', ShowCommitsView = 'gitlens.showCommitsView', ShowContributorsView = 'gitlens.showContributorsView', + ShowDraftsView = 'gitlens.showDraftsView', ShowFileHistoryView = 'gitlens.showFileHistoryView', ShowFocusPage = 'gitlens.showFocusPage', ShowGraph = 'gitlens.showGraph', diff --git a/src/webviews/apps/home/home.html b/src/webviews/apps/home/home.html index c00e9796a0447..96bf7f036888f 100644 --- a/src/webviews/apps/home/home.html +++ b/src/webviews/apps/home/home.html @@ -214,6 +214,21 @@

Popular views

>Search & Compare + Cloud Patches☁️ Side Bar Views aria-label="Show Search & Compare view" >Search & Compare + Cloud Patches ☁️ Popular views aria-label="Show Search & Compare view" >Search & Compare + Cloud Patches ☁️ Date: Wed, 8 Nov 2023 18:10:09 -0500 Subject: [PATCH 0178/1012] Hides patch links for now --- src/webviews/apps/home/home.html | 1 + src/webviews/apps/welcome/welcome.html | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/webviews/apps/home/home.html b/src/webviews/apps/home/home.html index 96bf7f036888f..af67b4826b424 100644 --- a/src/webviews/apps/home/home.html +++ b/src/webviews/apps/home/home.html @@ -220,6 +220,7 @@

Popular views

title="Show Cloud Patches view" aria-label="Show Cloud Patches view" data-requires="repo" + hidden >Cloud PatchesSide Bar Views data-requires="repo" title="Show Cloud Patches view" aria-label="Show Cloud Patches view" + hidden >Cloud Patches ☁️ Popular views data-requires="repo" title="Show Cloud Patches view" aria-label="Show Cloud Patches view" + hidden >Cloud Patches ☁️ Date: Wed, 8 Nov 2023 16:14:15 -0700 Subject: [PATCH 0179/1012] Adds promo messaging --- .../apps/plus/account/components/account-content.ts | 8 ++++++++ .../plus/shared/components/feature-gate-plus-state.ts | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/src/webviews/apps/plus/account/components/account-content.ts b/src/webviews/apps/plus/account/components/account-content.ts index e6f7430e2adcc..03bd16f022388 100644 --- a/src/webviews/apps/plus/account/components/account-content.ts +++ b/src/webviews/apps/plus/account/components/account-content.ts @@ -187,6 +187,10 @@ export class AccountContent extends LitElement { Your GitKraken trial has ended, please upgrade to continue to use ✨ features on privately hosted repos.

+

+ Special: 50% off GitKraken's suite of dev tools
+ 1st & 2nd seats only $4/month each +

Upgrade to Pro @@ -212,6 +216,10 @@ export class AccountContent extends LitElement { ${this.daysRemaining} remaining in your GitKraken trial.`} Once your trial ends, you'll need a paid plan to continue using ✨ features.

+

+ Special: 50% off GitKraken's suite of dev tools
+ 1st & 2nd seats only $4/month each +

Upgrade to Pro diff --git a/src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts b/src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts index f8e1baf0b3730..2e4e5c4b30de6 100644 --- a/src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts +++ b/src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts @@ -99,6 +99,10 @@ export class FeatureGatePlusState extends LitElement { Your GitKraken trial has ended, please upgrade to continue to use this on privately hosted repos.

+

+ Special: 50% off GitKraken's suite of dev tools
+ 1st & 2nd seats only $4/month each +

Upgrade to Pro From ebe7dc2075dee33d103f15652b94275fbe8f566b Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Wed, 8 Nov 2023 16:51:25 -0700 Subject: [PATCH 0180/1012] Fixes incorrect messaging on patch created notification --- src/plus/webviews/patchDetails/patchDetailsWebview.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plus/webviews/patchDetails/patchDetailsWebview.ts b/src/plus/webviews/patchDetails/patchDetailsWebview.ts index 6d2865315a085..8efd1fa6c161e 100644 --- a/src/plus/webviews/patchDetails/patchDetailsWebview.ts +++ b/src/plus/webviews/patchDetails/patchDetailsWebview.ts @@ -381,15 +381,17 @@ export class PatchDetailsWebviewProvider async function showNotification() { const view = { title: 'View Patch' }; const copy = { title: 'Copy Link' }; + let copied = false; while (true) { const result = await window.showInformationMessage( - 'Cloud Patch successfully created \u2014 link copied to the clipboard', + `Cloud Patch successfully created${copied ? '\u2014 link copied to the clipboard' : ''}`, view, copy, ); if (result === copy) { void env.clipboard.writeText(draft.deepLinkUrl); + copied = true; continue; } From 2adc234fa12ec62f2ea65eebc106e76c710e4ef4 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Wed, 8 Nov 2023 18:55:11 -0500 Subject: [PATCH 0181/1012] Fixes repo wip states when creating --- src/plus/webviews/patchDetails/patchDetailsWebview.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plus/webviews/patchDetails/patchDetailsWebview.ts b/src/plus/webviews/patchDetails/patchDetailsWebview.ts index 8efd1fa6c161e..907e34cd44f3c 100644 --- a/src/plus/webviews/patchDetails/patchDetailsWebview.ts +++ b/src/plus/webviews/patchDetails/patchDetailsWebview.ts @@ -555,7 +555,7 @@ export class PatchDetailsWebviewProvider let allRepos = false; if (create.changes != null) { - changesetByRepo = new Map(); + changesetByRepo = this._context.create?.changes ?? new Map(); const updated = new Set(); for (const change of create.changes) { @@ -607,7 +607,7 @@ export class PatchDetailsWebviewProvider sha: uncommitted, }, this.onRepositoryWipChanged.bind(this), - false, + true, true, // TODO revisit ), ]), From 2e4b99d118b27db7565327ef20ddd42c241520de Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 8 Nov 2023 19:42:18 -0500 Subject: [PATCH 0182/1012] Ensure patches view honors its setting --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8d8b7f674b75c..286b4d70f8ccd 100644 --- a/package.json +++ b/package.json @@ -15388,7 +15388,7 @@ { "id": "gitlens.views.drafts", "name": "Cloud Patches", - "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders", + "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && config.gitlens.cloudPatches.enabled", "contextualTitle": "GL", "icon": "$(cloud)", "initialSize": 2, From 64f9feb7460d01e2d8f3d00ad00a861a04309a39 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Wed, 8 Nov 2023 18:59:23 -0700 Subject: [PATCH 0183/1012] Adds account gating for cloud patch create and apply --- src/plus/webviews/patchDetails/patchDetailsWebview.ts | 5 +++++ src/uris/deepLinks/deepLinkService.ts | 4 ++-- src/views/draftsView.ts | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/plus/webviews/patchDetails/patchDetailsWebview.ts b/src/plus/webviews/patchDetails/patchDetailsWebview.ts index 907e34cd44f3c..fba611058dd21 100644 --- a/src/plus/webviews/patchDetails/patchDetailsWebview.ts +++ b/src/plus/webviews/patchDetails/patchDetailsWebview.ts @@ -28,6 +28,7 @@ import { onIpc } from '../../../webviews/protocol'; import type { WebviewController, WebviewProvider } from '../../../webviews/webviewController'; import type { WebviewShowOptions } from '../../../webviews/webviewsController'; import { showPatchesView } from '../../drafts/actions'; +import { ensureAccount } from '../../utils'; import type { ShowInCommitGraphCommandArgs } from '../graph/protocol'; import type { ApplyPatchParams, @@ -310,6 +311,8 @@ export class PatchDetailsWebviewProvider return; } + if (!(await ensureAccount('A GitKraken account is required to apply cloud patches.', this.container))) return; + const changeset = this._context.draft.changesets?.[0]; if (changeset == null) return; @@ -347,6 +350,8 @@ export class PatchDetailsWebviewProvider } private async createDraft({ title, changesets, description }: CreatePatchParams): Promise { + if (!(await ensureAccount('A GitKraken account is required to create cloud patches.', this.container))) return; + const createChanges: CreateDraftChange[] = []; const changes = Object.entries(changesets); diff --git a/src/uris/deepLinks/deepLinkService.ts b/src/uris/deepLinks/deepLinkService.ts index c56a1f1cc5b3a..0e0fc12b0dfdd 100644 --- a/src/uris/deepLinks/deepLinkService.ts +++ b/src/uris/deepLinks/deepLinkService.ts @@ -440,7 +440,7 @@ export class DeepLinkService implements Disposable { if ( !(await ensureAccount( - `Account required to open ${deepLinkTypeToString(targetType)} link`, + `A GitKraken account is required to open ${deepLinkTypeToString(targetType)} links.`, this.container, )) ) { @@ -465,7 +465,7 @@ export class DeepLinkService implements Disposable { if ( !(await ensurePaidPlan( - `Paid plan required to open ${deepLinkTypeToString(targetType)} link`, + `A paid plan is required to open ${deepLinkTypeToString(targetType)} links.`, this.container, )) ) { diff --git a/src/views/draftsView.ts b/src/views/draftsView.ts index 10b8e65e10177..5a8c088e8f2b6 100644 --- a/src/views/draftsView.ts +++ b/src/views/draftsView.ts @@ -110,7 +110,7 @@ export class DraftsView extends ViewBase<'drafts', DraftsViewNode, RepositoriesV const confirm = { title: 'Delete' }; const cancel = { title: 'Cancel', isCloseAffordance: true }; const result = await window.showInformationMessage( - `Are you sure you want to delete draft '${node.draft.title}'?`, + `Are you sure you want to delete Cloud Patch '${node.draft.title}'?`, { modal: true }, confirm, cancel, From e6fa3e034645855fdcfb1bc54021def5a1f446b2 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Thu, 9 Nov 2023 01:06:17 -0500 Subject: [PATCH 0184/1012] Aligns language on GK account --- README.md | 4 ++-- package.json | 4 ++-- src/plus/focus/focusService.ts | 2 +- src/plus/webviews/patchDetails/patchDetailsWebview.ts | 4 ++-- src/uris/deepLinks/deepLinkService.ts | 2 +- src/webviews/apps/home/home.html | 10 +++++----- .../plus/patchDetails/components/gl-patch-create.ts | 2 +- src/webviews/apps/welcome/welcome.html | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index e54748dd96e55..c64855a304bcf 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Use `Switch to Pre-Release Version` on the extension banner to live on the edge All features are free to use on all repos, **except** for features, - marked with a ✨ require a [trial or paid plan](https://www.gitkraken.com/gitlens/pricing) for use on privately hosted repos -- marked with a ☁️ require a GitKraken Account, with access level based on your [plan](https://www.gitkraken.com/gitlens/pricing), e.g. Free, Pro, etc +- marked with a ☁️ require a GitKraken account, with access level based on your [plan](https://www.gitkraken.com/gitlens/pricing), e.g. Free, Pro, etc See the [FAQ](#is-gitlens-free-to-use 'Jump to FAQ') for more details. @@ -272,7 +272,7 @@ Yes. All features are free to use on all repos, **except** for features, - marked with a ✨ require a [trial or paid plan](https://www.gitkraken.com/gitlens/pricing) for use on privately hosted repos - marked with a ☁️ require a GitKraken Account, with access level based on your [plan](https://www.gitkraken.com/gitlens/pricing), e.g. Free, Pro, etc -While GitLens offers a remarkable set of free features, a subset of features tailored for professional developers and teams, marked with a ✨, require a trial or paid plan for use on privately hosted repos — use on local or publicly hosted repos is free for everyone. Additionally some features marked with a ☁️, rely on GitKraken Dev Services which requires an account and access is based on your plan, e.g. Free, Pro, etc. +While GitLens offers a remarkable set of free features, a subset of features tailored for professional developers and teams, marked with a ✨, require a trial or paid plan for use on privately hosted repos — use on local or publicly hosted repos is free for everyone. Additionally some features marked with a ☁️, rely on GitKraken Dev Services which requires a GitKraken account and access is based on your plan, e.g. Free, Pro, etc. Preview ✨ features instantly for free for 3 days without an account, or start a free GitKraken trial to get an additional 7 days and gain access to ☁️ features to experience the full power of GitLens. diff --git a/package.json b/package.json index 286b4d70f8ccd..654a899e3677e 100644 --- a/package.json +++ b/package.json @@ -15316,7 +15316,7 @@ }, { "view": "gitlens.views.drafts", - "contents": "[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free 7-day Pro trial to use Cloud Patches, or [sign in](command:gitlens.plus.loginOrSignUp).\n☁️ Requires an account and access is based on your plan, e.g. Free, Pro, etc", + "contents": "[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free 7-day Pro trial to use Cloud Patches, or [sign in](command:gitlens.plus.loginOrSignUp).\n☁️ Requires a GitKraken account and access is based on your plan, e.g. Free, Pro, etc", "when": "!gitlens:plus" }, { @@ -15330,7 +15330,7 @@ }, { "view": "gitlens.views.workspaces", - "contents": "[Start Free GitKraken Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free 7-day GitKraken trial to use GitKraken Workspaces, or [sign in](command:gitlens.plus.loginOrSignUp).\n☁️ Requires an account and access is based on your plan, e.g. Free, Pro, etc", + "contents": "[Start Free GitKraken Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free 7-day GitKraken trial to use GitKraken Workspaces, or [sign in](command:gitlens.plus.loginOrSignUp).\n☁️ Requires a GitKraken account and access is based on your plan, e.g. Free, Pro, etc", "when": "!gitlens:plus" }, { diff --git a/src/plus/focus/focusService.ts b/src/plus/focus/focusService.ts index 502b5d61bb193..6b1ef2b8d6425 100644 --- a/src/plus/focus/focusService.ts +++ b/src/plus/focus/focusService.ts @@ -107,7 +107,7 @@ export class FocusService implements Disposable { const scope = getLogScope(); try { - if (!(await ensureAccount('Pinning requires an account', this.container))) { + if (!(await ensureAccount('Pinning requires a GitKraken account.', this.container))) { throw new Error('Unable to pin item: account required'); } diff --git a/src/plus/webviews/patchDetails/patchDetailsWebview.ts b/src/plus/webviews/patchDetails/patchDetailsWebview.ts index fba611058dd21..18c301d771972 100644 --- a/src/plus/webviews/patchDetails/patchDetailsWebview.ts +++ b/src/plus/webviews/patchDetails/patchDetailsWebview.ts @@ -311,7 +311,7 @@ export class PatchDetailsWebviewProvider return; } - if (!(await ensureAccount('A GitKraken account is required to apply cloud patches.', this.container))) return; + if (!(await ensureAccount('Cloud Patches require a GitKraken account.', this.container))) return; const changeset = this._context.draft.changesets?.[0]; if (changeset == null) return; @@ -350,7 +350,7 @@ export class PatchDetailsWebviewProvider } private async createDraft({ title, changesets, description }: CreatePatchParams): Promise { - if (!(await ensureAccount('A GitKraken account is required to create cloud patches.', this.container))) return; + if (!(await ensureAccount('Cloud patches require a GitKraken account.', this.container))) return; const createChanges: CreateDraftChange[] = []; diff --git a/src/uris/deepLinks/deepLinkService.ts b/src/uris/deepLinks/deepLinkService.ts index 0e0fc12b0dfdd..6133961c9422b 100644 --- a/src/uris/deepLinks/deepLinkService.ts +++ b/src/uris/deepLinks/deepLinkService.ts @@ -440,7 +440,7 @@ export class DeepLinkService implements Disposable { if ( !(await ensureAccount( - `A GitKraken account is required to open ${deepLinkTypeToString(targetType)} links.`, + `Opening ${deepLinkTypeToString(targetType)} links requires a GitKraken account.`, this.container, )) ) { diff --git a/src/webviews/apps/home/home.html b/src/webviews/apps/home/home.html index af67b4826b424..04cca121ecd69 100644 --- a/src/webviews/apps/home/home.html +++ b/src/webviews/apps/home/home.html @@ -225,8 +225,8 @@

Popular views

>Cloud Patches☁️ @@ -240,8 +240,8 @@

Popular views

>GitKraken Workspaces☁️ @@ -385,7 +385,7 @@

Companion Tools

✨ Requires a trial or paid plan to use this on privately hosted repos.
- ☁️ Requires an account and access is based on your plan, e.g. Free, Pro, etc + ☁️ Requires a GitKraken account and access is based on your plan, e.g. Free, Pro, etc

diff --git a/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts b/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts index 39e0dfc726873..470c7b432dcb0 100644 --- a/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts +++ b/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts @@ -132,7 +132,7 @@ export class GlPatchCreate extends GlTreeBase { Create Cloud Patch

-
`; diff --git a/src/webviews/apps/welcome/welcome.html b/src/webviews/apps/welcome/welcome.html index bf904efe9943a..d1ad0fb7f7e41 100644 --- a/src/webviews/apps/welcome/welcome.html +++ b/src/webviews/apps/welcome/welcome.html @@ -603,7 +603,7 @@

Resources

✨ Requires a trial or paid plan for use on privately hosted repos
- ☁️ Requires an account and access is based on your plan, e.g. Free, Pro, etc + ☁️ Requires a GitKraken account and access is based on your plan, e.g. Free, Pro, etc

#{endOfBody} From 2c75f68f7074479580e5da16055cd3e5e9d4d2fc Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Thu, 9 Nov 2023 10:53:23 -0500 Subject: [PATCH 0185/1012] Adds patch storage confirmation --- src/constants.ts | 1 + src/plus/utils.ts | 29 ++++++++++++++++++- .../patchDetails/patchDetailsWebview.ts | 9 ++++-- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/constants.ts b/src/constants.ts index 815947cdd478c..9689be5339436 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -837,6 +837,7 @@ export type GlobalStorage = { // Keep the pre-release version separate from the released version preVersion: string; 'views:welcome:visible': boolean; + 'confirm:draft:storage': boolean; } & { [key in `confirm:ai:tos:${AIProviders}`]: boolean } & { [key in `provider:authentication:skip:${string}`]: boolean; }; diff --git a/src/plus/utils.ts b/src/plus/utils.ts index d210e00f76cbb..acb552c13a5c6 100644 --- a/src/plus/utils.ts +++ b/src/plus/utils.ts @@ -1,4 +1,5 @@ -import { window } from 'vscode'; +import type { MessageItem } from 'vscode'; +import { env, Uri, window } from 'vscode'; import type { Container } from '../container'; import { isSubscriptionPaidPlan } from './gk/account/subscription'; @@ -107,3 +108,29 @@ export async function ensureAccount(title: string, container: Container): Promis return true; } + +export async function confirmDraftStorage(container: Container): Promise { + if (container.storage.get('confirm:draft:storage', false)) return true; + + const accept: MessageItem = { title: 'Yes' }; + const decline: MessageItem = { title: 'No', isCloseAffordance: true }; + const moreInfo: MessageItem = { title: 'More Info' }; + const result = await window.showInformationMessage( + `Creating a Cloud Patch will store code on GitKraken's servers.\n\nDo you want to continue?`, + { modal: true }, + accept, + decline, + moreInfo, + ); + + if (result === accept) { + void container.storage.store('confirm:draft:storage', true); + return true; + } + + if (result === moreInfo) { + void env.openExternal(Uri.parse('https://help.gitkraken.com/gitlens/security')); + } + + return false; +} diff --git a/src/plus/webviews/patchDetails/patchDetailsWebview.ts b/src/plus/webviews/patchDetails/patchDetailsWebview.ts index 18c301d771972..a0a224a113158 100644 --- a/src/plus/webviews/patchDetails/patchDetailsWebview.ts +++ b/src/plus/webviews/patchDetails/patchDetailsWebview.ts @@ -28,7 +28,7 @@ import { onIpc } from '../../../webviews/protocol'; import type { WebviewController, WebviewProvider } from '../../../webviews/webviewController'; import type { WebviewShowOptions } from '../../../webviews/webviewsController'; import { showPatchesView } from '../../drafts/actions'; -import { ensureAccount } from '../../utils'; +import { confirmDraftStorage, ensureAccount } from '../../utils'; import type { ShowInCommitGraphCommandArgs } from '../graph/protocol'; import type { ApplyPatchParams, @@ -311,7 +311,12 @@ export class PatchDetailsWebviewProvider return; } - if (!(await ensureAccount('Cloud Patches require a GitKraken account.', this.container))) return; + if ( + !(await ensureAccount('Cloud Patches require a GitKraken account.', this.container)) || + !(await confirmDraftStorage(this.container)) + ) { + return; + } const changeset = this._context.draft.changesets?.[0]; if (changeset == null) return; From 86b37bebe6348706261e663472211c0abc2f0a18 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Thu, 9 Nov 2023 12:17:02 -0500 Subject: [PATCH 0186/1012] Updates patch storage confirmation --- src/plus/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plus/utils.ts b/src/plus/utils.ts index acb552c13a5c6..c1e1aa14316af 100644 --- a/src/plus/utils.ts +++ b/src/plus/utils.ts @@ -116,7 +116,7 @@ export async function confirmDraftStorage(container: Container): Promise Date: Thu, 9 Nov 2023 11:34:42 -0700 Subject: [PATCH 0187/1012] Fixes content type on patch upload --- src/plus/drafts/draftsService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plus/drafts/draftsService.ts b/src/plus/drafts/draftsService.ts index a5edbc91da0de..465e1f1211a0e 100644 --- a/src/plus/drafts/draftsService.ts +++ b/src/plus/drafts/draftsService.ts @@ -116,7 +116,7 @@ export class DraftService implements Disposable { await this.connection.fetchRaw(url, { method: method, headers: { - 'Content-Type': 'plain/text', + 'Content-Type': 'text/plain', Host: headers?.['Host']?.['0'] ?? '', }, body: contents, From 213ca034dc23d148d503cbdb9dafe4be67b6fbad Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Thu, 9 Nov 2023 14:32:31 -0700 Subject: [PATCH 0188/1012] Opens cloud patch on row select (hides icon for now) --- package.json | 5 ----- src/views/nodes/draftNode.ts | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 654a899e3677e..fb1073426a648 100644 --- a/package.json +++ b/package.json @@ -11997,11 +11997,6 @@ "when": "viewItem == gitlens:message:signin", "group": "inline@1" }, - { - "command": "gitlens.views.drafts.open", - "when": "viewItem =~ /gitlens:draft\\b/ && gitlens:plus", - "group": "inline@1" - }, { "command": "gitlens.views.drafts.open", "when": "viewItem =~ /gitlens:draft\\b/ && gitlens:plus", diff --git a/src/views/nodes/draftNode.ts b/src/views/nodes/draftNode.ts index 8d769fff38f69..d4fe06e64e2d4 100644 --- a/src/views/nodes/draftNode.ts +++ b/src/views/nodes/draftNode.ts @@ -55,6 +55,11 @@ export class DraftNode extends ViewNode<'draft', DraftsView> { }`, ); item.description = fromNow(this.draft.updatedAt); + item.command = { + title: 'Show Patch', + command: this.view.getQualifiedCommand('open'), + arguments: [this], + }; return item; } } From 30fa83020763e71ff89bb749a6214ae5cda5bbc0 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Thu, 9 Nov 2023 15:01:46 -0500 Subject: [PATCH 0189/1012] Applies patch to branch --- .../patchDetails/patchDetailsWebview.ts | 37 ++++++++++++-- src/plus/webviews/patchDetails/protocol.ts | 1 + src/quickpicks/branchPicker.ts | 51 +++++++++++++++++++ .../components/gl-draft-details.ts | 20 +++++++- .../apps/plus/patchDetails/patchDetails.scss | 4 ++ .../apps/plus/patchDetails/patchDetails.ts | 6 ++- .../apps/shared/components/webview-pane.ts | 2 +- 7 files changed, 113 insertions(+), 8 deletions(-) create mode 100644 src/quickpicks/branchPicker.ts diff --git a/src/plus/webviews/patchDetails/patchDetailsWebview.ts b/src/plus/webviews/patchDetails/patchDetailsWebview.ts index a0a224a113158..678d14ceeaf83 100644 --- a/src/plus/webviews/patchDetails/patchDetailsWebview.ts +++ b/src/plus/webviews/patchDetails/patchDetailsWebview.ts @@ -1,7 +1,7 @@ import type { ConfigurationChangeEvent } from 'vscode'; import { Disposable, env, Uri, window } from 'vscode'; import type { CoreConfiguration } from '../../../constants'; -import { Commands } from '../../../constants'; +import { Commands, GlyphChars } from '../../../constants'; import type { Container } from '../../../container'; import { openChanges, openChangesWithWorking, openFile } from '../../../git/actions/commit'; import type { RepositoriesChangeEvent } from '../../../git/gitProviderService'; @@ -13,6 +13,7 @@ import { createReference } from '../../../git/models/reference'; import { isRepository } from '../../../git/models/repository'; import type { CreateDraftChange, Draft, DraftPatch, DraftPatchFileChange, LocalDraft } from '../../../gk/models/drafts'; import type { GkRepositoryId } from '../../../gk/models/repositoryIdentities'; +import { showBranchPicker } from '../../../quickpicks/branchPicker'; import { executeCommand, registerCommand } from '../../../system/command'; import { configuration } from '../../../system/configuration'; import { setContext } from '../../../system/context'; @@ -321,6 +322,8 @@ export class PatchDetailsWebviewProvider const changeset = this._context.draft.changesets?.[0]; if (changeset == null) return; + // TODO: should be overridable with targetRef + const shouldPickBranch = params.target === 'branch'; for (const patch of changeset.patches) { if (!params.selected.includes(patch.id)) continue; @@ -335,9 +338,35 @@ export class PatchDetailsWebviewProvider continue; } - void this.container.git.applyPatchCommit(commit.repoPath, commit.ref, { - branchName: patch.baseBranchName, - }); + let options: + | { + branchName?: string; + createBranchIfNeeded?: boolean; + createWorktreePath?: string; + } + | undefined = undefined; + + if (shouldPickBranch) { + const repo = commit.getRepository(); + const branch = await showBranchPicker( + `Choose a Branch ${GlyphChars.Dot} ${repo?.name}`, + 'Choose a branch to apply the Cloud Patch to', + repo, + ); + + if (branch == null) { + void window.showErrorMessage( + `Unable apply patch to '${patch.repository!.name}': No branch selected`, + ); + continue; + } + options = { + branchName: branch.ref, + createBranchIfNeeded: true, + }; + } + + void this.container.git.applyPatchCommit(commit.repoPath, commit.ref, options); } catch (ex) { void window.showErrorMessage(`Unable apply patch to '${patch.baseRef}': ${ex.message}`); } diff --git a/src/plus/webviews/patchDetails/protocol.ts b/src/plus/webviews/patchDetails/protocol.ts index 5d586a8904716..ffc43d46fadaa 100644 --- a/src/plus/webviews/patchDetails/protocol.ts +++ b/src/plus/webviews/patchDetails/protocol.ts @@ -168,6 +168,7 @@ export type ShowCommitDetailsViewCommandArgs = string[]; export interface ApplyPatchParams { details: DraftDetails; targetRef?: string; // a branch name. default to HEAD if not supplied + target: 'current' | 'branch' | 'worktree'; selected: PatchDetails['id'][]; } export const ApplyPatchCommandType = new IpcCommandType('patch/apply'); diff --git a/src/quickpicks/branchPicker.ts b/src/quickpicks/branchPicker.ts new file mode 100644 index 0000000000000..a31a73c46e37d --- /dev/null +++ b/src/quickpicks/branchPicker.ts @@ -0,0 +1,51 @@ +import type { Disposable } from 'vscode'; +import { window } from 'vscode'; +import { getBranches } from '../commands/quickCommand.steps'; +import type { Repository } from '../git/models/repository'; +import { getQuickPickIgnoreFocusOut } from '../system/utils'; +import type { BranchQuickPickItem } from './items/gitCommands'; + +export async function showBranchPicker( + title: string | undefined, + placeholder?: string, + repository?: Repository, +): Promise { + if (repository == null) { + return undefined; + } + + const items: BranchQuickPickItem[] = await getBranches(repository, {}); + if (items.length === 0) return undefined; + + const quickpick = window.createQuickPick(); + quickpick.ignoreFocusOut = getQuickPickIgnoreFocusOut(); + + const disposables: Disposable[] = []; + + try { + const pick = await new Promise(resolve => { + disposables.push( + quickpick.onDidHide(() => resolve(undefined)), + quickpick.onDidAccept(() => { + if (quickpick.activeItems.length !== 0) { + resolve(quickpick.activeItems[0]); + } + }), + ); + + quickpick.title = title; + quickpick.placeholder = placeholder; + quickpick.matchOnDescription = true; + quickpick.matchOnDetail = true; + quickpick.items = items; + + quickpick.show(); + }); + if (pick == null) return undefined; + + return pick; + } finally { + quickpick.dispose(); + disposables.forEach(d => void d.dispose()); + } +} diff --git a/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts b/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts index 8db0d2deed4aa..0e57c3c569f6a 100644 --- a/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts +++ b/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts @@ -345,7 +345,20 @@ export class GlDraftDetails extends GlTreeBase {

- Apply Cloud Patch + Apply Patch + + + + Apply to new branch + + +

@@ -577,7 +590,10 @@ export class GlDraftDetails extends GlTreeBase { } onSelectApplyOption(e: CustomEvent<{ target: MenuItem }>) { - if (this.canSubmit === false) return; + if (this.canSubmit === false) { + this.validityMessage = 'Please select changes to apply'; + return; + } const target = e.detail?.target; if (target?.dataset?.value != null) { diff --git a/src/webviews/apps/plus/patchDetails/patchDetails.scss b/src/webviews/apps/plus/patchDetails/patchDetails.scss index bd10a381ad36e..27a07ae0bbf2e 100644 --- a/src/webviews/apps/plus/patchDetails/patchDetails.scss +++ b/src/webviews/apps/plus/patchDetails/patchDetails.scss @@ -160,5 +160,9 @@ gl-patch-create { &__group-fixed { flex: none; + + webview-pane::part(content) { + overflow: visible; + } } } diff --git a/src/webviews/apps/plus/patchDetails/patchDetails.ts b/src/webviews/apps/plus/patchDetails/patchDetails.ts index b909ac587104b..f3a9a682199f8 100644 --- a/src/webviews/apps/plus/patchDetails/patchDetails.ts +++ b/src/webviews/apps/plus/patchDetails/patchDetails.ts @@ -264,7 +264,11 @@ export class PatchDetailsApp extends App> { private onApplyPatch(e: ApplyPatchDetail) { console.log('onApplyPatch', e); if (e.selectedPatches == null || e.selectedPatches.length === 0) return; - this.sendCommand(ApplyPatchCommandType, { details: e.draft, selected: e.selectedPatches }); + this.sendCommand(ApplyPatchCommandType, { + details: e.draft, + target: e.target ?? 'current', + selected: e.selectedPatches, + }); } private onChangePatchBase(e: ChangePatchBaseDetail) { diff --git a/src/webviews/apps/shared/components/webview-pane.ts b/src/webviews/apps/shared/components/webview-pane.ts index c13a22ef11d1a..4f78bee61d4d2 100644 --- a/src/webviews/apps/shared/components/webview-pane.ts +++ b/src/webviews/apps/shared/components/webview-pane.ts @@ -140,7 +140,7 @@ export class WebviewPane extends LitElement { -
+
`; From 31732b1e960d19c8ef54c9af5a21f52605273c86 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Thu, 9 Nov 2023 17:31:11 -0500 Subject: [PATCH 0190/1012] Adds create new branch option for applying patch Co-authored-by: Ramin Tadayon --- .../patchDetails/patchDetailsWebview.ts | 12 ++- src/quickpicks/branchPicker.ts | 101 +++++++++++++++++- .../components/gl-draft-details.ts | 2 +- 3 files changed, 108 insertions(+), 7 deletions(-) diff --git a/src/plus/webviews/patchDetails/patchDetailsWebview.ts b/src/plus/webviews/patchDetails/patchDetailsWebview.ts index 678d14ceeaf83..6e5b73f41f3ec 100644 --- a/src/plus/webviews/patchDetails/patchDetailsWebview.ts +++ b/src/plus/webviews/patchDetails/patchDetailsWebview.ts @@ -13,7 +13,7 @@ import { createReference } from '../../../git/models/reference'; import { isRepository } from '../../../git/models/repository'; import type { CreateDraftChange, Draft, DraftPatch, DraftPatchFileChange, LocalDraft } from '../../../gk/models/drafts'; import type { GkRepositoryId } from '../../../gk/models/repositoryIdentities'; -import { showBranchPicker } from '../../../quickpicks/branchPicker'; +import { showNewOrSelectBranchPicker } from '../../../quickpicks/branchPicker'; import { executeCommand, registerCommand } from '../../../system/command'; import { configuration } from '../../../system/configuration'; import { setContext } from '../../../system/context'; @@ -348,9 +348,9 @@ export class PatchDetailsWebviewProvider if (shouldPickBranch) { const repo = commit.getRepository(); - const branch = await showBranchPicker( + const branch = await showNewOrSelectBranchPicker( `Choose a Branch ${GlyphChars.Dot} ${repo?.name}`, - 'Choose a branch to apply the Cloud Patch to', + // 'Choose a branch to apply the Cloud Patch to', repo, ); @@ -360,9 +360,11 @@ export class PatchDetailsWebviewProvider ); continue; } + + const isString = typeof branch === 'string'; options = { - branchName: branch.ref, - createBranchIfNeeded: true, + branchName: isString ? branch : branch.ref, + createBranchIfNeeded: isString, }; } diff --git a/src/quickpicks/branchPicker.ts b/src/quickpicks/branchPicker.ts index a31a73c46e37d..b098dc2c985ff 100644 --- a/src/quickpicks/branchPicker.ts +++ b/src/quickpicks/branchPicker.ts @@ -1,4 +1,4 @@ -import type { Disposable } from 'vscode'; +import type { Disposable, QuickPickItem } from 'vscode'; import { window } from 'vscode'; import { getBranches } from '../commands/quickCommand.steps'; import type { Repository } from '../git/models/repository'; @@ -49,3 +49,102 @@ export async function showBranchPicker( disposables.forEach(d => void d.dispose()); } } + +export async function showNewBranchPicker( + title: string | undefined, + placeholder?: string, + _repository?: Repository, +): Promise { + const input = window.createInputBox(); + input.ignoreFocusOut = true; + + const disposables: Disposable[] = []; + + let newBranchName: string | undefined; + try { + newBranchName = await new Promise(resolve => { + disposables.push( + input.onDidHide(() => resolve(undefined)), + input.onDidAccept(() => { + const value = input.value.trim(); + if (value == null) { + input.validationMessage = 'Please enter a valid branch name'; + return; + } + + resolve(value); + }), + ); + + input.title = title; + input.placeholder = placeholder; + input.prompt = 'Enter a name for the new branch'; + + input.show(); + }); + } finally { + input.dispose(); + disposables.forEach(d => void d.dispose()); + } + + return newBranchName; +} + +export async function showNewOrSelectBranchPicker( + title: string | undefined, + repository?: Repository, +): Promise { + if (repository == null) { + return undefined; + } + + // TODO: needs updating + const createNewBranch = { + label: 'Create new branch', + description: + 'Creates a branch to apply the Cloud Patch to. (Typing an existing branch name will use that branch.)', + }; + const selectExistingBranch = { + label: 'Select existing branch', + description: 'Selects an existing branch to apply the Cloud Patch to.', + }; + + const items: QuickPickItem[] = [createNewBranch, selectExistingBranch]; + + const quickpick = window.createQuickPick(); + quickpick.ignoreFocusOut = getQuickPickIgnoreFocusOut(); + + const disposables: Disposable[] = []; + + try { + const pick = await new Promise(resolve => { + disposables.push( + quickpick.onDidHide(() => resolve(undefined)), + quickpick.onDidAccept(() => { + if (quickpick.activeItems.length !== 0) { + resolve(quickpick.activeItems[0]); + } + }), + ); + + quickpick.title = title; + quickpick.placeholder = 'Select a branch option'; + quickpick.matchOnDescription = true; + quickpick.matchOnDetail = true; + quickpick.items = items; + + quickpick.show(); + }); + + if (pick === createNewBranch) { + return showNewBranchPicker(title, 'Enter a name for the new branch', repository); + } else if (pick === selectExistingBranch) { + return showBranchPicker(title, 'Select an existing branch', repository); + } + + return undefined; + } finally { + quickpick.dispose(); + disposables.forEach(d => void d.dispose()); + } +} diff --git a/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts b/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts index 0e57c3c569f6a..57c88aebb0d35 100644 --- a/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts +++ b/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts @@ -355,7 +355,7 @@ export class GlDraftDetails extends GlTreeBase { > - Apply to new branch + Apply to a Branch From be6b6b1c77ffbae63d48dfd3900c06d4adc0266e Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Thu, 9 Nov 2023 17:32:17 -0700 Subject: [PATCH 0191/1012] Fixes files not showing when viewing patch after creation --- src/plus/drafts/draftsService.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plus/drafts/draftsService.ts b/src/plus/drafts/draftsService.ts index 465e1f1211a0e..907dd2e110726 100644 --- a/src/plus/drafts/draftsService.ts +++ b/src/plus/drafts/draftsService.ts @@ -112,6 +112,9 @@ export class DraftService implements Disposable { throw new Error(`No contents found for ${patch.baseCommitSha}`); } + const diffFiles = await this.container.git.getDiffFiles(repository.path, contents); + const files = diffFiles?.files.map(f => ({ ...f, gkRepositoryId: patch.gitRepositoryId })) ?? []; + // Upload patch to returned S3 url await this.connection.fetchRaw(url, { method: method, @@ -137,6 +140,7 @@ export class DraftService implements Disposable { secureLink: undefined!, // patch.secureDownloadData, contents: contents, + files: files, repository: repository, }); } From 2346ada9f64f60d3ed315b2196431b95850b472e Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Thu, 9 Nov 2023 22:15:56 -0500 Subject: [PATCH 0192/1012] Adds cloud patch icons --- CONTRIBUTING.md | 2 +- images/icons/cloud-patch-share.svg | 1 + images/icons/cloud-patch.svg | 1 + images/icons/template/mapping.json | 4 +++- package.json | 14 ++++++++++++++ src/webviews/apps/shared/components/code-icon.ts | 6 ++++++ src/webviews/apps/shared/glicons.scss | 8 +++++++- 7 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 images/icons/cloud-patch-share.svg create mode 100644 images/icons/cloud-patch.svg diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 414177efff84d..711072b05a2f1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -207,7 +207,7 @@ The Publish Insiders workflow is no longer available and was replaced with the p To add new icons to the GL Icons font follow the steps below: - Add new SVG icons to the `images/icons` folder -- Update the `images/icons/mappings.json` file with entries for the new icons (append to the end of the file) +- Update the `images/icons/template/mapping.json` file with entries for the new icons (append to the end of the file) - Optimize and build the icons by running the following from a terminal: ``` diff --git a/images/icons/cloud-patch-share.svg b/images/icons/cloud-patch-share.svg new file mode 100644 index 0000000000000..46dbb3f551f25 --- /dev/null +++ b/images/icons/cloud-patch-share.svg @@ -0,0 +1 @@ + diff --git a/images/icons/cloud-patch.svg b/images/icons/cloud-patch.svg new file mode 100644 index 0000000000000..f2dfe4c072f98 --- /dev/null +++ b/images/icons/cloud-patch.svg @@ -0,0 +1 @@ + diff --git a/images/icons/template/mapping.json b/images/icons/template/mapping.json index a1ce4f9e85dea..33b5d5b08e7c1 100644 --- a/images/icons/template/mapping.json +++ b/images/icons/template/mapping.json @@ -39,5 +39,7 @@ "gitlens-inspect": 61732, "workspaces-view": 61733, "confirm-checked": 61734, - "confirm-unchecked": 61735 + "confirm-unchecked": 61735, + "cloud-patch": 61736, + "cloud-patch-share": 61737 } \ No newline at end of file diff --git a/package.json b/package.json index fb1073426a648..7efaac3f607bb 100644 --- a/package.json +++ b/package.json @@ -8522,6 +8522,20 @@ "fontPath": "dist/glicons.woff2", "fontCharacter": "\\f127" } + }, + "gitlens-cloud-patch": { + "description": "cloud-patch icon", + "default": { + "fontPath": "dist/glicons.woff2", + "fontCharacter": "\\f128" + } + }, + "gitlens-cloud-patch-share": { + "description": "cloud-patch-share icon", + "default": { + "fontPath": "dist/glicons.woff2", + "fontCharacter": "\\f129" + } } }, "menus": { diff --git a/src/webviews/apps/shared/components/code-icon.ts b/src/webviews/apps/shared/components/code-icon.ts index d0a21685755cc..796c4844166f7 100644 --- a/src/webviews/apps/shared/components/code-icon.ts +++ b/src/webviews/apps/shared/components/code-icon.ts @@ -1690,6 +1690,12 @@ export class CodeIcon extends LitElement { :host([icon='gl-workspaces-view']):before { content: '\\f125'; } + :host([icon='gl-cloud-patch']):before { + content: '\\f128'; + } + :host([icon='gl-cloud-patch-share']):before { + content: '\\f129'; + } @keyframes codicon-spin { 100% { diff --git a/src/webviews/apps/shared/glicons.scss b/src/webviews/apps/shared/glicons.scss index ebdf90a0d1929..3051ce6c30100 100644 --- a/src/webviews/apps/shared/glicons.scss +++ b/src/webviews/apps/shared/glicons.scss @@ -6,7 +6,7 @@ Must be placed at the end of body in the HTML file of any webview that needs it @font-face { font-family: 'glicons'; font-display: block; - src: url("#{root}/dist/glicons.woff2?30855d21cb614f41edfd373458624529") format("woff2"); + src: url("#{root}/dist/glicons.woff2?2cb9f62ddac44d3fc393ade4471fe802") format("woff2"); } */ @@ -182,3 +182,9 @@ Must be placed at the end of body in the HTML file of any webview that needs it .glicon-confirm-unchecked:before { content: '\f127'; } +.glicon-cloud-patch:before { + content: '\f128'; +} +.glicon-cloud-patch-share:before { + content: '\f129'; +} From 9b0126d0da28591a55ce8b304f1e1ca62d160b93 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Thu, 9 Nov 2023 22:17:11 -0500 Subject: [PATCH 0193/1012] Implements cloud patch icons --- package.json | 2 +- .../components/gl-commit-details.ts | 2 ++ .../components/gl-details-base.ts | 27 ++++++++++++------- .../components/gl-wip-details.ts | 4 ++- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 7efaac3f607bb..32d923b6c9b27 100644 --- a/package.json +++ b/package.json @@ -15391,7 +15391,7 @@ "name": "Patch", "when": "!gitlens:untrusted && config.gitlens.cloudPatches.enabled && gitlens:views:patchDetails:mode", "contextualTitle": "GL", - "icon": "$(gitlens-commit-view)", + "icon": "$(gitlens-cloud-patch)", "initialSize": 24 }, { diff --git a/src/webviews/apps/commitDetails/components/gl-commit-details.ts b/src/webviews/apps/commitDetails/components/gl-commit-details.ts index 525fb31a044b7..c3fcb00c4e508 100644 --- a/src/webviews/apps/commitDetails/components/gl-commit-details.ts +++ b/src/webviews/apps/commitDetails/components/gl-commit-details.ts @@ -19,6 +19,8 @@ interface ExplainState { @customElement('gl-commit-details') export class GlCommitDetails extends GlDetailsBase { + override readonly tab = 'commit'; + @property({ type: Object }) state?: Serialized; diff --git a/src/webviews/apps/commitDetails/components/gl-details-base.ts b/src/webviews/apps/commitDetails/components/gl-details-base.ts index aa47868979622..2cee5cafe01ea 100644 --- a/src/webviews/apps/commitDetails/components/gl-details-base.ts +++ b/src/webviews/apps/commitDetails/components/gl-details-base.ts @@ -12,6 +12,8 @@ type File = Files[0]; type Mode = 'commit' | 'stash' | 'wip'; export class GlDetailsBase extends LitElement { + readonly tab: 'wip' | 'commit' = 'commit'; + @property({ type: Array }) files?: Files; @@ -30,16 +32,21 @@ export class GlDetailsBase extends LitElement { return html` ${label} - + ${when( + this.tab === 'wip', + () => + html` `, + )} `; } diff --git a/src/webviews/apps/commitDetails/components/gl-wip-details.ts b/src/webviews/apps/commitDetails/components/gl-wip-details.ts index f8843630cf104..d2d3bba62b75d 100644 --- a/src/webviews/apps/commitDetails/components/gl-wip-details.ts +++ b/src/webviews/apps/commitDetails/components/gl-wip-details.ts @@ -7,6 +7,8 @@ import { GlDetailsBase } from './gl-details-base'; @customElement('gl-wip-details') export class GlWipDetails extends GlDetailsBase { + override readonly tab = 'wip'; + @property({ type: Object }) wip?: Wip; @@ -46,7 +48,7 @@ export class GlWipDetails extends GlDetailsBase { aria-label="Share as Cloud Patch" title="Share as Cloud Patch" > - + Share Date: Fri, 10 Nov 2023 09:22:07 -0700 Subject: [PATCH 0194/1012] Adds basic welcome section for cloud patches (#3009) --- src/webviews/apps/welcome/welcome.html | 44 ++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/src/webviews/apps/welcome/welcome.html b/src/webviews/apps/welcome/welcome.html index d1ad0fb7f7e41..96d12966ee8d9 100644 --- a/src/webviews/apps/welcome/welcome.html +++ b/src/webviews/apps/welcome/welcome.html @@ -287,6 +287,50 @@

+

+ Cloud Patches + ☁️ + Preview +

+

+ The + Cloud Patches preview feature + allows you to easily share changes with other developers by creating a Cloud Patch from your WIP, + commit or stash and sharing the generated link with your teammates. +

+ +

+ Cloud Patches are + securely stored by GitKraken, and anyone with access to the link and a GitKraken account can view the code for now. More + permissions and controls are coming soon. +

+ +

+ For additional information about Cloud Patches, visit our + help center. +

+

Date: Fri, 10 Nov 2023 11:42:53 -0500 Subject: [PATCH 0195/1012] Updates patch icons on home and welcome --- src/webviews/apps/home/home.html | 2 +- src/webviews/apps/welcome/welcome.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/webviews/apps/home/home.html b/src/webviews/apps/home/home.html index 04cca121ecd69..25505325f25ea 100644 --- a/src/webviews/apps/home/home.html +++ b/src/webviews/apps/home/home.html @@ -221,7 +221,7 @@

Popular views

aria-label="Show Cloud Patches view" data-requires="repo" hidden - >Cloud PatchesSide Bar Views

title="Show Cloud Patches view" aria-label="Show Cloud Patches view" hidden - >Cloud Patches ☁️Cloud Patches ☁️ Popular views title="Show Cloud Patches view" aria-label="Show Cloud Patches view" hidden - >Cloud Patches ☁️Cloud Patches ☁️ Date: Fri, 10 Nov 2023 12:25:49 -0500 Subject: [PATCH 0196/1012] Updates error handling on explain AI for patches --- src/plus/webviews/patchDetails/patchDetailsWebview.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/plus/webviews/patchDetails/patchDetailsWebview.ts b/src/plus/webviews/patchDetails/patchDetailsWebview.ts index 6e5b73f41f3ec..b6c47c6bee6dc 100644 --- a/src/plus/webviews/patchDetails/patchDetailsWebview.ts +++ b/src/plus/webviews/patchDetails/patchDetailsWebview.ts @@ -463,14 +463,21 @@ export class PatchDetailsWebviewProvider try { // TODO@eamodio HACK -- only works for the first patch const patch = await this.getDraftPatch(this._context.draft); - if (patch == null) return; + if (patch == null) { + throw new Error('Unable to find patch'); + } const commit = await this.getOrCreateCommitForPatch(patch.gkRepositoryId); - if (commit == null) return; + if (commit == null) { + throw new Error('Unable to find commit'); + } const summary = await this.container.ai.explainCommit(commit, { progress: { location: { viewId: this.host.id } }, }); + if (summary == null) { + throw new Error('Error retrieving content'); + } params = { summary: summary }; } catch (ex) { debugger; From 772aaaaa7d8d8b9ac23fbcc4d3adb4aa5c5a8bc2 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Fri, 10 Nov 2023 11:48:54 -0700 Subject: [PATCH 0197/1012] Fixes input ordering when generating diff for cloud patch from commit --- src/plus/drafts/draftsService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plus/drafts/draftsService.ts b/src/plus/drafts/draftsService.ts index 907dd2e110726..44296f8bf31bc 100644 --- a/src/plus/drafts/draftsService.ts +++ b/src/plus/drafts/draftsService.ts @@ -217,7 +217,7 @@ export class DraftService implements Disposable { ? this.container.git.getBranch(change.repository.uri).then(b => (b != null ? [b.name] : undefined)) : this.container.git.getCommitBranches(change.repository.uri, change.revision.sha), change.contents == null - ? this.container.git.getDiff(change.repository.path, change.revision.sha, change.revision.baseSha) + ? this.container.git.getDiff(change.repository.path, change.revision.baseSha, change.revision.sha) : undefined, this.container.git.getFirstCommitSha(change.repository.uri), this.container.git.getBestRemoteWithProvider(change.repository.uri), From 2818e6e8ede2accfed1677e3aaabac378628c9af Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Fri, 10 Nov 2023 15:34:47 -0500 Subject: [PATCH 0198/1012] Fixes resuming RepositoryWipChangeset --- src/plus/webviews/patchDetails/repositoryChangeset.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plus/webviews/patchDetails/repositoryChangeset.ts b/src/plus/webviews/patchDetails/repositoryChangeset.ts index 19af2cc696918..8358d70ec69fe 100644 --- a/src/plus/webviews/patchDetails/repositoryChangeset.ts +++ b/src/plus/webviews/patchDetails/repositoryChangeset.ts @@ -133,6 +133,7 @@ export class RepositoryWipChangeset implements RepositoryChangeset { } resume() { + this._files = undefined; if (this._expanded) { this.subscribe(); } From 71410e4fc178e63ab90339b72b8caa5a5789318f Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Fri, 10 Nov 2023 14:26:13 -0700 Subject: [PATCH 0199/1012] Fixes getting diff for WIP changes when creating Cloud Patches --- src/plus/drafts/draftsService.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/plus/drafts/draftsService.ts b/src/plus/drafts/draftsService.ts index 44296f8bf31bc..e5004048bdfb5 100644 --- a/src/plus/drafts/draftsService.ts +++ b/src/plus/drafts/draftsService.ts @@ -1,5 +1,6 @@ import type { Disposable } from 'vscode'; import type { Container } from '../../container'; +import { uncommitted, uncommittedStaged } from '../../git/models/constants'; import { isSha, isUncommitted } from '../../git/models/reference'; import { isRepository } from '../../git/models/repository'; import type { GitUser } from '../../git/models/user'; @@ -212,12 +213,17 @@ export class DraftService implements Disposable { private async getCreateDraftPatchRequestFromChange( change: CreateDraftChange, ): Promise { + const isWIP = change.revision.sha === uncommitted || change.revision.sha === uncommittedStaged; const [branchNamesResult, diffResult, firstShaResult, remoteResult, userResult] = await Promise.allSettled([ isUncommitted(change.revision.sha) ? this.container.git.getBranch(change.repository.uri).then(b => (b != null ? [b.name] : undefined)) : this.container.git.getCommitBranches(change.repository.uri, change.revision.sha), change.contents == null - ? this.container.git.getDiff(change.repository.path, change.revision.baseSha, change.revision.sha) + ? this.container.git.getDiff( + change.repository.path, + isWIP ? change.revision.sha : change.revision.baseSha, + isWIP ? change.revision.baseSha : change.revision.sha, + ) : undefined, this.container.git.getFirstCommitSha(change.repository.uri), this.container.git.getBestRemoteWithProvider(change.repository.uri), From f4d58edc506ae4c258b47a079e98dbb49b62f84e Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Fri, 10 Nov 2023 14:27:01 -0700 Subject: [PATCH 0200/1012] Fixes Share as Cloud Patch being broken in the graph --- package.json | 11 ++++++++++- src/plus/webviews/graph/graphWebview.ts | 13 +++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 32d923b6c9b27..89cb4bb4d9557 100644 --- a/package.json +++ b/package.json @@ -8228,6 +8228,11 @@ "title": "Hide Tag Markers", "category": "GitLens" }, + { + "command": "gitlens.graph.shareAsCloudPatch", + "title": "Share as Cloud Patch...", + "category": "GitLens" + }, { "command": "gitlens.timeline.refresh", "title": "Refresh", @@ -10752,6 +10757,10 @@ "command": "gitlens.graph.scrollMarkerTagOff", "when": "false" }, + { + "command": "gitlens.graph.shareAsCloudPatch", + "when": "false" + }, { "command": "gitlens.enableDebugLogging", "when": "config.gitlens.outputLevel != debug" @@ -13986,7 +13995,7 @@ "group": "1_a_gitlens@1" }, { - "command": "gitlens.shareAsCloudPatch", + "command": "gitlens.graph.shareAsCloudPatch", "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && config.gitlens.cloudPatches.enabled && webviewItem =~ /gitlens:(commit|stash)\\b/", "group": "1_a_gitlens@1" }, diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts index d2535634a3708..33358e352b024 100644 --- a/src/plus/webviews/graph/graphWebview.ts +++ b/src/plus/webviews/graph/graphWebview.ts @@ -8,6 +8,7 @@ import type { CopyMessageToClipboardCommandArgs } from '../../../commands/copyMe import type { CopyShaToClipboardCommandArgs } from '../../../commands/copyShaToClipboard'; import type { OpenOnRemoteCommandArgs } from '../../../commands/openOnRemote'; import type { OpenPullRequestOnRemoteCommandArgs } from '../../../commands/openPullRequestOnRemote'; +import type { CreatePatchCommandArgs } from '../../../commands/patches'; import type { ShowCommitsInViewCommandArgs } from '../../../commands/showCommitsInView'; import type { Config, GraphMinimapMarkersAdditionalTypes, GraphScrollMarkersAdditionalTypes } from '../../../config'; import type { StoredGraphFilters, StoredGraphIncludeOnlyRef, StoredGraphRefType } from '../../../constants'; @@ -530,6 +531,7 @@ export class GraphWebviewProvider implements WebviewProvider(Commands.CreateCloudPatch, { + ref1: ref.ref, + repoPath: ref.repoPath, + }); + } + @debug() private resetCommit(item?: GraphItemContext) { const ref = this.getGraphItemRef(item, 'revision'); From ebf6babe2e6b7e5554d4d8bab573c5733bacad40 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Fri, 10 Nov 2023 17:25:24 -0500 Subject: [PATCH 0201/1012] Updates CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a40dc5d6d3c21..e72b56ccc2ba8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Added +- Adds a preview of [Cloud Patches](https://www.gitkraken.com/solutions/cloud-patches), an all-new ☁️ feature — engage in early collaboration long before the pull request: + + - Share your work with others by creating a Cloud Patch from Working Changes, Commits, Stashes or Comparisons + - View Cloud Patches from URLs shared to you and apply them to your working tree or to a new or existing branch + - Manage your Cloud Patches from the new _Cloud Patches_ view in the GitLens side bar + - Adds support to open multiple instances of the _Commit Graph_, _Focus_, and _Visual File History_ in the editor area - Adds a _Split Commit Graph_ command to the _Commit Graph_ tab context menu - Adds a `gitlens.graph.allowMultiple` setting to specify whether to allow opening multiple instances of the _Commit Graph_ in the editor area From d437f940bc8d21d7eb6ed4d7ce822c81e75f0146 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Fri, 10 Nov 2023 16:03:34 -0700 Subject: [PATCH 0202/1012] Fixes error when creating a cloud patch from a stash --- src/plus/drafts/draftsService.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/plus/drafts/draftsService.ts b/src/plus/drafts/draftsService.ts index e5004048bdfb5..3cd14f4c757af 100644 --- a/src/plus/drafts/draftsService.ts +++ b/src/plus/drafts/draftsService.ts @@ -1,6 +1,5 @@ import type { Disposable } from 'vscode'; import type { Container } from '../../container'; -import { uncommitted, uncommittedStaged } from '../../git/models/constants'; import { isSha, isUncommitted } from '../../git/models/reference'; import { isRepository } from '../../git/models/repository'; import type { GitUser } from '../../git/models/user'; @@ -213,9 +212,10 @@ export class DraftService implements Disposable { private async getCreateDraftPatchRequestFromChange( change: CreateDraftChange, ): Promise { - const isWIP = change.revision.sha === uncommitted || change.revision.sha === uncommittedStaged; + const isWIP = isUncommitted(change.revision.sha); + const [branchNamesResult, diffResult, firstShaResult, remoteResult, userResult] = await Promise.allSettled([ - isUncommitted(change.revision.sha) + isWIP ? this.container.git.getBranch(change.repository.uri).then(b => (b != null ? [b.name] : undefined)) : this.container.git.getCommitBranches(change.repository.uri, change.revision.sha), change.contents == null @@ -267,7 +267,11 @@ export class DraftService implements Disposable { const user = getSettledValue(userResult); - const branchNames = getSettledValue(branchNamesResult); + // We need to get the branch name from the baseSha if the change is a stash. + let branchNames = getSettledValue(branchNamesResult); + if (!isWIP && !branchNames?.length) { + branchNames = await this.container.git.getCommitBranches(change.repository.uri, change.revision.baseSha); + } const branchName = branchNames?.[0] ?? ''; let baseSha = change.revision.baseSha; From 5cff36df9a40a4591dab508b8681a0b49cf2e6da Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 10 Nov 2023 15:59:54 -0500 Subject: [PATCH 0203/1012] Adds new icon to patches view --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 89cb4bb4d9557..2f544fd98e7de 100644 --- a/package.json +++ b/package.json @@ -15296,7 +15296,7 @@ { "id": "gitlensPatch", "title": "Patch", - "icon": "$(cloud)" + "icon": "$(gitlens-cloud-patch)" } ], "panel": [ @@ -15408,7 +15408,7 @@ "name": "Cloud Patches", "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && config.gitlens.cloudPatches.enabled", "contextualTitle": "GL", - "icon": "$(cloud)", + "icon": "$(gitlens-cloud-patch)", "initialSize": 2, "visibility": "visible" }, From 1f55c494b20e98d9d12501b8cb8d60435b2d7768 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sat, 11 Nov 2023 00:48:35 -0500 Subject: [PATCH 0204/1012] Updates dependencies --- ThirdPartyNotices.txt | 10 +- package.json | 22 +- yarn.lock | 484 +++++++++++++++++++++--------------------- 3 files changed, 259 insertions(+), 257 deletions(-) diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index 6a39ffb6d7426..b9d77c83a9f39 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -6,14 +6,14 @@ This project incorporates components from the projects listed below. 1. @lit/react version 1.0.1 (https://github.com/lit/lit) 2. @microsoft/fast-element version 1.12.0 (https://github.com/Microsoft/fast) 3. @octokit/graphql version 7.0.2 (https://github.com/octokit/graphql.js) -4. @octokit/request version 8.1.4 (https://github.com/octokit/request.js) -5. @opentelemetry/api version 1.6.0 (https://github.com/open-telemetry/opentelemetry-js) -6. @opentelemetry/exporter-trace-otlp-http version 0.43.0 (https://github.com/open-telemetry/opentelemetry-js) -7. @opentelemetry/sdk-trace-base version 1.17.0 (https://github.com/open-telemetry/opentelemetry-js) +4. @octokit/request version 8.1.5 (https://github.com/octokit/request.js) +5. @opentelemetry/api version 1.7.0 (https://github.com/open-telemetry/opentelemetry-js) +6. @opentelemetry/exporter-trace-otlp-http version 0.45.1 (https://github.com/open-telemetry/opentelemetry-js) +7. @opentelemetry/sdk-trace-base version 1.18.1 (https://github.com/open-telemetry/opentelemetry-js) 8. @vscode/codicons version 0.0.35 (https://github.com/microsoft/vscode-codicons) 9. @vscode/webview-ui-toolkit version 1.2.2 (https://github.com/microsoft/vscode-webview-ui-toolkit) 10. ansi-regex version 6.0.1 (https://github.com/chalk/ansi-regex) -11. billboard.js version 3.10.2 (https://github.com/naver/billboard.js) +11. billboard.js version 3.10.3 (https://github.com/naver/billboard.js) 12. https-proxy-agent version 5.0.1 (https://github.com/TooTallNate/node-https-proxy-agent) 13. iconv-lite version 0.6.3 (https://github.com/ashtuchkin/iconv-lite) 14. lit version 3.0.2 (https://github.com/lit/lit) diff --git a/package.json b/package.json index 2f544fd98e7de..b96e2f9bd473f 100644 --- a/package.json +++ b/package.json @@ -15739,14 +15739,14 @@ "@lit/react": "1.0.1", "@microsoft/fast-element": "1.12.0", "@octokit/graphql": "7.0.2", - "@octokit/request": "8.1.4", - "@opentelemetry/api": "1.6.0", - "@opentelemetry/exporter-trace-otlp-http": "0.43.0", - "@opentelemetry/sdk-trace-base": "1.17.0", + "@octokit/request": "8.1.5", + "@opentelemetry/api": "1.7.0", + "@opentelemetry/exporter-trace-otlp-http": "0.45.1", + "@opentelemetry/sdk-trace-base": "1.18.1", "@vscode/codicons": "0.0.35", "@vscode/webview-ui-toolkit": "1.2.2", "ansi-regex": "6.0.1", - "billboard.js": "3.10.2", + "billboard.js": "3.10.3", "https-proxy-agent": "5.0.1", "iconv-lite": "0.6.3", "lit": "3.0.2", @@ -15759,14 +15759,14 @@ }, "devDependencies": { "@twbs/fantasticon": "2.7.1", - "@types/mocha": "10.0.1", + "@types/mocha": "10.0.4", "@types/node": "16.11.47", - "@types/react": "17.0.69", + "@types/react": "17.0.70", "@types/react-dom": "17.0.21", - "@types/sortablejs": "1.15.4", + "@types/sortablejs": "1.15.5", "@types/vscode": "1.81.0", - "@typescript-eslint/eslint-plugin": "6.9.1", - "@typescript-eslint/parser": "6.9.1", + "@typescript-eslint/eslint-plugin": "6.10.0", + "@typescript-eslint/parser": "6.10.0", "@vscode/test-electron": "2.3.6", "@vscode/test-web": "0.0.48", "@vscode/vsce": "2.22.0", @@ -15803,7 +15803,7 @@ "sass-loader": "13.3.2", "schema-utils": "4.2.0", "sharp": "0.32.6", - "svgo": "3.0.2", + "svgo": "3.0.3", "terser-webpack-plugin": "5.3.9", "ts-loader": "9.5.0", "tsc-alias": "1.8.8", diff --git a/yarn.lock b/yarn.lock index 6994229dc7ab1..7d5abad2a59d1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -381,9 +381,9 @@ integrity sha512-gQutuDHPKNxUEcQ4pypZT4Wmrbapus+P9s3bR/SEOLsMbNqNoXigGImITygI5zhb+aA5rzflM6O8YWkmRbGkPA== "@microsoft/fast-foundation@^2.38.0", "@microsoft/fast-foundation@^2.41.1": - version "2.49.3" - resolved "https://registry.yarnpkg.com/@microsoft/fast-foundation/-/fast-foundation-2.49.3.tgz#caf2f6ed20985a9ca892cd14d6c75b2d5899f229" - integrity sha512-9+XSYOuZeEbmZEdH5ze+pj+Y/Yqyeb37mQ95eGcz1Mvz2ALdDwcmx3K5ahBWAEYasoTeyIPXB7ZSjR9TJlMi2w== + version "2.49.4" + resolved "https://registry.yarnpkg.com/@microsoft/fast-foundation/-/fast-foundation-2.49.4.tgz#322150cd6f0bed89d6d2238a700e6b9db94ac694" + integrity sha512-5I2tSPo6bnOfVAIX7XzX+LhilahwvD7h+yzl3jW0t5IYmMX9Lci9VUVyx5f8hHdb1O9a8Y9Atb7Asw7yFO/u+w== dependencies: "@microsoft/fast-element" "^1.12.0" "@microsoft/fast-web-utilities" "^5.4.1" @@ -481,10 +481,10 @@ deprecation "^2.0.0" once "^1.4.0" -"@octokit/request@8.1.4", "@octokit/request@^8.0.1": - version "8.1.4" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-8.1.4.tgz#12dfaebdb2ea375eaabb41d39d45182531ac2857" - integrity sha512-M0aaFfpGPEKrg7XoA/gwgRvc9MSXHRO2Ioki1qrPDbl1e9YhjIwVoHE7HIKmv/m3idzldj//xBujcFNqGX6ENA== +"@octokit/request@8.1.5", "@octokit/request@^8.0.1": + version "8.1.5" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-8.1.5.tgz#902ae9565117a1dc410d10b5dbc44c4d27a89b71" + integrity sha512-zVKbNbX1xUluD9ZR4/tPs1yuYrK9xeh5fGZUXA6u04XGsTvomg0YO8/ZUC0FqAd49hAOEMFPAVUTh+2lBhOhLA== dependencies: "@octokit/endpoint" "^9.0.0" "@octokit/request-error" "^5.0.0" @@ -493,99 +493,99 @@ universal-user-agent "^6.0.0" "@octokit/types@^12.0.0": - version "12.1.1" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-12.1.1.tgz#376726d8435625b3a1b6fcd8cd3e1b03ade939dc" - integrity sha512-qnJTldJ1NyGT5MTsCg/Zi+y2IFHZ1Jo5+njNCjJ9FcainV7LjuHgmB697kA0g4MjZeDAJsM3B45iqCVsCLVFZg== + version "12.2.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-12.2.0.tgz#c21044ec70c5e2222043bcbe7fe2c3448a13df31" + integrity sha512-ZkdHqHJdifVndN7Pha10+qrgAjy3AcG//Vmjr/o5UFuTiYCcMhqDj39Yr9VM9zJ/42KO2xAYhV7cvLnLI9Kvwg== dependencies: "@octokit/openapi-types" "^19.0.2" -"@opentelemetry/api-logs@0.43.0": - version "0.43.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.43.0.tgz#472dacbf91488ad6f6b9de39a6f5038b450bdbc6" - integrity sha512-0CXMOYPXgAdLM2OzVkiUfAL6QQwWVhnMfUXCqLsITY42FZ9TxAhZIHkoc4mfVxvPuXsBnRYGR8UQZX86p87z4A== +"@opentelemetry/api-logs@0.45.1": + version "0.45.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.45.1.tgz#9e4f2c652dcce798c5627939b22304c2b5ce19c5" + integrity sha512-zVGq/k70l+kB/Wuv3O/zhptP2hvDhEbhDu9EtHde1iWZJf3FedeYS/nWVcMBkkyPAjS/JKNk86WN4CBQLGUuOw== dependencies: "@opentelemetry/api" "^1.0.0" -"@opentelemetry/api@1.6.0", "@opentelemetry/api@^1.0.0": - version "1.6.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.6.0.tgz#de2c6823203d6f319511898bb5de7e70f5267e19" - integrity sha512-OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g== - -"@opentelemetry/core@1.17.0": - version "1.17.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.17.0.tgz#6a72425f5f953dc68b4c7c66d947c018173d30d2" - integrity sha512-tfnl3h+UefCgx1aeN2xtrmr6BmdWGKXypk0pflQR0urFS40aE88trnkOMc2HTJZbMrqEEl4HsaBeFhwLVXsrJg== - dependencies: - "@opentelemetry/semantic-conventions" "1.17.0" - -"@opentelemetry/exporter-trace-otlp-http@0.43.0": - version "0.43.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.43.0.tgz#4d0a3587a1d372d19c883d9a4720f6eeb7dc9671" - integrity sha512-X6RGl4RTWC13EBrFstAbTh4vKqVqf6afpvFcud9qYhvl2A53OZ5RTAQP+9MrAMhthiKQaftNsEDdB2/0Sq+Xkw== - dependencies: - "@opentelemetry/core" "1.17.0" - "@opentelemetry/otlp-exporter-base" "0.43.0" - "@opentelemetry/otlp-transformer" "0.43.0" - "@opentelemetry/resources" "1.17.0" - "@opentelemetry/sdk-trace-base" "1.17.0" - -"@opentelemetry/otlp-exporter-base@0.43.0": - version "0.43.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.43.0.tgz#3ac36e959897050ceba8838bb2af7145a9e73d2c" - integrity sha512-LXNtRFVuPRXB9q0qdvrLikQ3NtT9Jmv255Idryz3RJPhOh/Fa03sBASQoj3D55OH3xazmA90KFHfhJ/d8D8y4A== - dependencies: - "@opentelemetry/core" "1.17.0" - -"@opentelemetry/otlp-transformer@0.43.0": - version "0.43.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-transformer/-/otlp-transformer-0.43.0.tgz#d4b12ba52d5193a35840d9e1a5e646c4e7e06a5b" - integrity sha512-KXYmgzWdVBOD5NvPmGW1nEMJjyQ8gK3N8r6pi4HvmEhTp0v4T13qDSax4q0HfsqmbPJR355oqQSJUnu1dHNutw== - dependencies: - "@opentelemetry/api-logs" "0.43.0" - "@opentelemetry/core" "1.17.0" - "@opentelemetry/resources" "1.17.0" - "@opentelemetry/sdk-logs" "0.43.0" - "@opentelemetry/sdk-metrics" "1.17.0" - "@opentelemetry/sdk-trace-base" "1.17.0" - -"@opentelemetry/resources@1.17.0": - version "1.17.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.17.0.tgz#ee29144cfd7d194c69698c8153dbadec7fe6819f" - integrity sha512-+u0ciVnj8lhuL/qGRBPeVYvk7fL+H/vOddfvmOeJaA1KC+5/3UED1c9KoZQlRsNT5Kw1FaK8LkY2NVLYfOVZQw== - dependencies: - "@opentelemetry/core" "1.17.0" - "@opentelemetry/semantic-conventions" "1.17.0" - -"@opentelemetry/sdk-logs@0.43.0": - version "0.43.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-logs/-/sdk-logs-0.43.0.tgz#ad40803f0e8893d1839af3a32756d5f46f0f7bbe" - integrity sha512-JyJ2BBRKm37Mc4cSEhFmsMl5ASQn1dkGhEWzAAMSlhPtLRTv5PfvJwhR+Mboaic/eDLAlciwsgijq8IFlf6IgQ== - dependencies: - "@opentelemetry/core" "1.17.0" - "@opentelemetry/resources" "1.17.0" - -"@opentelemetry/sdk-metrics@1.17.0": - version "1.17.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-metrics/-/sdk-metrics-1.17.0.tgz#e51d39e0bb749780d17f9b1df12f0490438dec1a" - integrity sha512-HlWM27yGmYuwCoVRe3yg2PqKnIsq0kEF0HQgvkeDWz2NYkq9fFaSspR6kvjxUTbghAlZrabiqbgyKoYpYaXS3w== - dependencies: - "@opentelemetry/core" "1.17.0" - "@opentelemetry/resources" "1.17.0" +"@opentelemetry/api@1.7.0", "@opentelemetry/api@^1.0.0": + version "1.7.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.7.0.tgz#b139c81999c23e3c8d3c0a7234480e945920fc40" + integrity sha512-AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw== + +"@opentelemetry/core@1.18.1": + version "1.18.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.18.1.tgz#d2e45f6bd6be4f00d20d18d4f1b230ec33805ae9" + integrity sha512-kvnUqezHMhsQvdsnhnqTNfAJs3ox/isB0SVrM1dhVFw7SsB7TstuVa6fgWnN2GdPyilIFLUvvbTZoVRmx6eiRg== + dependencies: + "@opentelemetry/semantic-conventions" "1.18.1" + +"@opentelemetry/exporter-trace-otlp-http@0.45.1": + version "0.45.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.45.1.tgz#2265181bd4787dc6660bdac33d658490a883283a" + integrity sha512-a6CGqSG66n5R1mghzLMzyzn3iGap1b0v+0PjKFjfYuwLtpHQBxh2PHxItu+m2mXSwnM4R0GJlk9oUW5sQkCE0w== + dependencies: + "@opentelemetry/core" "1.18.1" + "@opentelemetry/otlp-exporter-base" "0.45.1" + "@opentelemetry/otlp-transformer" "0.45.1" + "@opentelemetry/resources" "1.18.1" + "@opentelemetry/sdk-trace-base" "1.18.1" + +"@opentelemetry/otlp-exporter-base@0.45.1": + version "0.45.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.45.1.tgz#7170ec200152f89d74b2cf82fcf21fd32deebf03" + integrity sha512-Jvd6x8EwWGKEPWF4tkP4LpTPXiIkkafMNMvMJUfJd5DyNAftL1vAz+48jmi3URL2LMPkGryrvWPz8Tdu917gQw== + dependencies: + "@opentelemetry/core" "1.18.1" + +"@opentelemetry/otlp-transformer@0.45.1": + version "0.45.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-transformer/-/otlp-transformer-0.45.1.tgz#8f6590b93f177510983bea3055e5a3f3d30faad2" + integrity sha512-FhIHgfC0b0XtoBrS5ISfva939yWffNl47ypXR8I7Ru+dunlySpmf2TLocKHYLHGcWiuoeSNO5O4dZCmSKOtpXw== + dependencies: + "@opentelemetry/api-logs" "0.45.1" + "@opentelemetry/core" "1.18.1" + "@opentelemetry/resources" "1.18.1" + "@opentelemetry/sdk-logs" "0.45.1" + "@opentelemetry/sdk-metrics" "1.18.1" + "@opentelemetry/sdk-trace-base" "1.18.1" + +"@opentelemetry/resources@1.18.1": + version "1.18.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.18.1.tgz#e27bdc4715bccc8cd4a72d4aca3995ad0a496fe7" + integrity sha512-JjbcQLYMttXcIabflLRuaw5oof5gToYV9fuXbcsoOeQ0BlbwUn6DAZi++PNsSz2jjPeASfDls10iaO/8BRIPRA== + dependencies: + "@opentelemetry/core" "1.18.1" + "@opentelemetry/semantic-conventions" "1.18.1" + +"@opentelemetry/sdk-logs@0.45.1": + version "0.45.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-logs/-/sdk-logs-0.45.1.tgz#d59a99147ab15eb36757932517dfc9a10e1645e9" + integrity sha512-z0RRgW4LeKEKnhXS4F/HnqB6+7gsy63YK47F4XAJYHs4s1KKg8XnQ2RkbuL31i/a9nXkylttYtvsT50CGr487g== + dependencies: + "@opentelemetry/core" "1.18.1" + "@opentelemetry/resources" "1.18.1" + +"@opentelemetry/sdk-metrics@1.18.1": + version "1.18.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-metrics/-/sdk-metrics-1.18.1.tgz#1dd334744a1e5d2eec27e9e9765c73cd2f43aef3" + integrity sha512-TEFgeNFhdULBYiCoHbz31Y4PDsfjjxRp8Wmdp6ybLQZPqMNEb+dRq+XN8Xw3ivIgTaf9gYsomgV5ensX99RuEQ== + dependencies: + "@opentelemetry/core" "1.18.1" + "@opentelemetry/resources" "1.18.1" lodash.merge "^4.6.2" -"@opentelemetry/sdk-trace-base@1.17.0": - version "1.17.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.17.0.tgz#05a21763c9efa72903c20b8930293cdde344b681" - integrity sha512-2T5HA1/1iE36Q9eg6D4zYlC4Y4GcycI1J6NsHPKZY9oWfAxWsoYnRlkPfUqyY5XVtocCo/xHpnJvGNHwzT70oQ== +"@opentelemetry/sdk-trace-base@1.18.1": + version "1.18.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.18.1.tgz#256605d90b202002d5672305c66dbcf377132379" + integrity sha512-tRHfDxN5dO+nop78EWJpzZwHsN1ewrZRVVwo03VJa3JQZxToRDH29/+MB24+yoa+IArerdr7INFJiX/iN4gjqg== dependencies: - "@opentelemetry/core" "1.17.0" - "@opentelemetry/resources" "1.17.0" - "@opentelemetry/semantic-conventions" "1.17.0" + "@opentelemetry/core" "1.18.1" + "@opentelemetry/resources" "1.18.1" + "@opentelemetry/semantic-conventions" "1.18.1" -"@opentelemetry/semantic-conventions@1.17.0": - version "1.17.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.17.0.tgz#af10baa9f05ce1e64a14065fc138b5739bfb65f6" - integrity sha512-+fguCd2d8d2qruk0H0DsCEy2CTK3t0Tugg7MhZ/UQMvmewbZLNnJ6heSYyzIZWG5IPfAXzoj4f4F/qpM7l4VBA== +"@opentelemetry/semantic-conventions@1.18.1": + version "1.18.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.18.1.tgz#8e47caf57a84b1dcc1722b2025693348cdf443b4" + integrity sha512-+NLGHr6VZwcgE/2lw8zDIufOCGnzsA5CbQIMleXZTrgkBd0TanCX+MiDYJ1TOS4KL/Tqk0nFRxawnaYr6pkZkA== "@pkgjs/parseargs@^0.11.0": version "0.11.0" @@ -642,38 +642,38 @@ ttf2woff "^3.0.0" ttf2woff2 "^5.0.0" -"@types/d3-selection@*", "@types/d3-selection@^3.0.8": - version "3.0.8" - resolved "https://registry.yarnpkg.com/@types/d3-selection/-/d3-selection-3.0.8.tgz#9423511db3ed00a55aad4217ac8d546db5d8e5f5" - integrity sha512-pxCZUfQyedq/DIlPXIR5wE1mIH37omOdx1yxRudL3KZ4AC+156jMjOv1z5RVlGq62f8WX2kyO0hTVgEx627QFg== +"@types/d3-selection@*", "@types/d3-selection@^3.0.9": + version "3.0.10" + resolved "https://registry.yarnpkg.com/@types/d3-selection/-/d3-selection-3.0.10.tgz#98cdcf986d0986de6912b5892e7c015a95ca27fe" + integrity sha512-cuHoUgS/V3hLdjJOLTT691+G2QoqAjCVLmr4kJXR4ha56w1Zdu8UUQ5TxLRqudgNjwXeQxKMq4j+lyf9sWuslg== -"@types/d3-transition@^3.0.6": - version "3.0.6" - resolved "https://registry.yarnpkg.com/@types/d3-transition/-/d3-transition-3.0.6.tgz#141684ef8046f4dc5da2d5b015c497513eba541c" - integrity sha512-K0To23B5UxNwFtKORnS5JoNYvw/DnknU5MzhHIS9czJ/lTqFFDeU6w9lArOdoTl0cZFNdNrMJSFCbRCEHccH2w== +"@types/d3-transition@^3.0.7": + version "3.0.8" + resolved "https://registry.yarnpkg.com/@types/d3-transition/-/d3-transition-3.0.8.tgz#677707f5eed5b24c66a1918cde05963021351a8f" + integrity sha512-ew63aJfQ/ms7QQ4X7pk5NxQ9fZH/z+i24ZfJ6tJSfqxJMrYLiK01EAs2/Rtw/JreGUsS3pLPNV644qXFGnoZNQ== dependencies: "@types/d3-selection" "*" "@types/eslint-scope@^3.7.3": - version "3.7.6" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.6.tgz#585578b368ed170e67de8aae7b93f54a1b2fdc26" - integrity sha512-zfM4ipmxVKWdxtDaJ3MP3pBurDXOCoyjvlpE3u6Qzrmw4BPbfm4/ambIeTk/r/J0iq/+2/xp0Fmt+gFvXJY2PQ== + version "3.7.7" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5" + integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg== dependencies: "@types/eslint" "*" "@types/estree" "*" "@types/eslint@*": - version "8.44.6" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.6.tgz#60e564551966dd255f4c01c459f0b4fb87068603" - integrity sha512-P6bY56TVmX8y9J87jHNgQh43h6VVU+6H7oN7hgvivV81K2XY8qJZ5vqPy/HdUoVIelii2kChYVzQanlswPWVFw== + version "8.44.7" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.7.tgz#430b3cc96db70c81f405e6a08aebdb13869198f5" + integrity sha512-f5ORu2hcBbKei97U73mf+l9t4zTGl74IqZ0GQk4oVea/VS8tQZYkUveSYojk+frraAVYId0V2WC9O4PTNru2FQ== dependencies: "@types/estree" "*" "@types/json-schema" "*" "@types/estree@*", "@types/estree@^1.0.0": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.4.tgz#d9748f5742171b26218516cf1828b8eafaf8a9fa" - integrity sha512-2JwWnHK9H+wUZNorf2Zr6ves96WHoWDJIftkcxPKsS7Djta6Zu519LarhRNljPXkpsZR2ZMwNCPeW7omW07BJw== + version "1.0.5" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" + integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== "@types/glob@^7.1.1": version "7.2.0" @@ -689,28 +689,28 @@ integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg== "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#fdfdd69fa16d530047d9963635bd77c71a08c068" - integrity sha512-zONci81DZYCZjiLe0r6equvZut0b+dBRPBN5kBDjsONnutYNtJMoWQ9uR2RkL1gLG9NMTzvf+29e5RFfPbeKhQ== + version "2.0.6" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7" + integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w== "@types/istanbul-lib-report@*": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.2.tgz#394798d5f727402eb5ec99eb9618ffcd2b7645a1" - integrity sha512-8toY6FgdltSdONav1XtUHl4LN1yTmLza+EuDazb/fEmRNCwjyqNVIQWs2IfC74IqjHkREs/nQ2FWq5kZU9IC0w== + version "3.0.3" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz#53047614ae72e19fc0401d872de3ae2b4ce350bf" + integrity sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA== dependencies: "@types/istanbul-lib-coverage" "*" "@types/istanbul-reports@^3.0.0": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.3.tgz#0313e2608e6d6955d195f55361ddeebd4b74c6e7" - integrity sha512-1nESsePMBlf0RPRffLZi5ujYh7IH1BWL4y9pr+Bn3cJBdxz+RTP8bUFljLz9HvzhhOSWKdyBZ4DIivdL6rvgZg== + version "3.0.4" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz#0f03e3d2f670fbdac586e34b433783070cc16f54" + integrity sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ== dependencies: "@types/istanbul-lib-report" "*" "@types/json-schema@*", "@types/json-schema@^7.0.12", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": - version "7.0.14" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.14.tgz#74a97a5573980802f32c8e47b663530ab3b6b7d1" - integrity sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw== + version "7.0.15" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" + integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== "@types/json5@^0.0.29": version "0.0.29" @@ -723,19 +723,19 @@ integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== "@types/minimist@^1.2.2": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.4.tgz#81f886786411c45bba3f33e781ab48bd56bfca2e" - integrity sha512-Kfe/D3hxHTusnPNRbycJE1N77WHDsdS4AjUYIzlDzhDrS47NrwuL3YW4VITxwR7KCVpzwgy4Rbj829KSSQmwXQ== + version "1.2.5" + resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e" + integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== -"@types/mocha@10.0.1": - version "10.0.1" - resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-10.0.1.tgz#2f4f65bb08bc368ac39c96da7b2f09140b26851b" - integrity sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q== +"@types/mocha@10.0.4": + version "10.0.4" + resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-10.0.4.tgz#b5331955ebca216604691fd4fcd2dbdc2bd559a4" + integrity sha512-xKU7bUjiFTIttpWaIZ9qvgg+22O1nmbA+HRxdlR+u6TWsGfmFdXrheJoK4fFxrHNVIOBDvDNKZG+LYBpMHpX3w== "@types/node@*": - version "20.8.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.10.tgz#a5448b895c753ae929c26ce85cab557c6d4a365e" - integrity sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w== + version "20.9.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.9.0.tgz#bfcdc230583aeb891cf51e73cfdaacdd8deae298" + integrity sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw== dependencies: undici-types "~5.26.4" @@ -745,19 +745,19 @@ integrity sha512-fpP+jk2zJ4VW66+wAMFoBJlx1bxmBKx4DUFf68UHgdGCOuyUTDlLWqsaNPJh7xhNDykyJ9eIzAygilP/4WoN8g== "@types/normalize-package-data@^2.4.0": - version "2.4.3" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.3.tgz#291c243e4b94dbfbc0c0ee26b7666f1d5c030e2c" - integrity sha512-ehPtgRgaULsFG8x0NeYJvmyH1hmlfsNLujHe9dQEia/7MAJYdzMSi19JtchUHjmBA6XC/75dK55mzZH+RyieSg== + version "2.4.4" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901" + integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA== "@types/parse-json@^4.0.0": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.1.tgz#27f7559836ad796cea31acb63163b203756a5b4e" - integrity sha512-3YmXzzPAdOTVljVMkTMBdBEvlOLg2cDQaDhnnhT3nT9uDbnJzjWhKlzb+desT12Y7tGqaN6d+AbozcKzyL36Ng== + version "4.0.2" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239" + integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw== "@types/prop-types@*": - version "15.7.9" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.9.tgz#b6f785caa7ea1fe4414d9df42ee0ab67f23d8a6d" - integrity sha512-n1yyPsugYNSmHgxDFjicaI2+gCNjsBck8UX9kuofAKlc0h1bL+20oSF72KeNaW2DUlesbEVCFgyV2dPGTiY42g== + version "15.7.10" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.10.tgz#892afc9332c4d62a5ea7e897fe48ed2085bbb08a" + integrity sha512-mxSnDQxPqsZxmeShFH+uwQ4kO4gcJcGahjjMFeLbKE95IAZiiZyiEepGZjtXJ7hN/yfu0bu9xN2ajcU0JcxX6A== "@types/react-dom@17.0.21": version "17.0.21" @@ -766,34 +766,34 @@ dependencies: "@types/react" "^17" -"@types/react@17.0.69", "@types/react@^17": - version "17.0.69" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.69.tgz#245a0cf2f5b0fb1d645691d3083e3c7d4409b98f" - integrity sha512-klEeru//GhiQvXUBayz0Q4l3rKHWsBR/EUOhOeow6hK2jV7MlO44+8yEk6+OtPeOlRfnpUnrLXzGK+iGph5aeg== +"@types/react@17.0.70", "@types/react@^17": + version "17.0.70" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.70.tgz#35301a9cb94ba1a65dc306b7ce169a2c4fda1986" + integrity sha512-yqYMK49/cnqw+T8R9/C+RNjRddYmPDGI5lKHi3bOYceQCBAh8X2ngSbZP0gnVeyvHr0T7wEgIIGKT1usNol08w== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" csstype "^3.0.2" "@types/scheduler@*": - version "0.16.5" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.5.tgz#4751153abbf8d6199babb345a52e1eb4167d64af" - integrity sha512-s/FPdYRmZR8SjLWGMCuax7r3qCWQw9QKHzXVukAuuIJkXkDRwp+Pu5LMIVFi0Fxbav35WURicYr8u1QsoybnQw== + version "0.16.6" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.6.tgz#eb26db6780c513de59bee0b869ef289ad3068711" + integrity sha512-Vlktnchmkylvc9SnwwwozTv04L/e1NykF5vgoQ0XTmI8DD+wxfjQuHuvHS3p0r2jz2x2ghPs2h1FVeDirIteWA== "@types/semver@^7.5.0": - version "7.5.4" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.4.tgz#0a41252ad431c473158b22f9bfb9a63df7541cff" - integrity sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ== + version "7.5.5" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.5.tgz#deed5ab7019756c9c90ea86139106b0346223f35" + integrity sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg== -"@types/sortablejs@1.15.4": - version "1.15.4" - resolved "https://registry.yarnpkg.com/@types/sortablejs/-/sortablejs-1.15.4.tgz#9ccaa84a64205defcbb78df63176a3722121ccd7" - integrity sha512-7oL7CcPSfoyoNx3Ba1+79ykJzpEKVhHUyfAiN5eT/FoeDXOR3eBDLXf9ndDNuxaExmjpI+zVi2dMMuaoXUOzNA== +"@types/sortablejs@1.15.5": + version "1.15.5" + resolved "https://registry.yarnpkg.com/@types/sortablejs/-/sortablejs-1.15.5.tgz#c59e51765bc53c920192de0d0202f75b7ce4cb3f" + integrity sha512-qqqbEFbB1EZt08I1Ok2BA3Sx0zlI8oizdIguMsajk4Yo/iHgXhCb3GM6N09JOJqT9xIMYM9LTFy8vit3RNY71Q== "@types/trusted-types@^2.0.2": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.5.tgz#5cac7e7df3275bb95f79594f192d97da3b4fd5fe" - integrity sha512-I3pkr8j/6tmQtKV/ZzHtuaqYSQvyjGRKH4go60Rr0IDLlFxuRT5V32uvB1mecM5G1EVAUyF/4r4QZ1GHgz+mxA== + version "2.0.6" + resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.6.tgz#d12451beaeb9c3838f12024580dc500b7e88b0ad" + integrity sha512-HYtNooPvUY9WAVRBr4u+4Qa9fYD1ze2IUlAD3HoA6oehn1taGwBx3Oa52U4mTslTS+GAExKpaFu39Y5xUEwfjg== "@types/vscode@1.81.0": version "1.81.0" @@ -801,27 +801,27 @@ integrity sha512-YIaCwpT+O2E7WOMq0eCgBEABE++SX3Yl/O02GoMIF2DO3qAtvw7m6BXFYsxnc6XyzwZgh6/s/UG78LSSombl2w== "@types/yargs-parser@*": - version "21.0.2" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.2.tgz#7bd04c5da378496ef1695a1008bf8f71847a8b8b" - integrity sha512-5qcvofLPbfjmBfKaLfj/+f+Sbd6pN4zl7w7VSVI5uz7m9QZTuB2aZAa2uo1wHFBNN2x6g/SoTkXmd8mQnQF2Cw== + version "21.0.3" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15" + integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ== "@types/yargs@^17.0.8": - version "17.0.29" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.29.tgz#06aabc72497b798c643c812a8b561537fea760cf" - integrity sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA== + version "17.0.31" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.31.tgz#8fd0089803fd55d8a285895a18b88cb71a99683c" + integrity sha512-bocYSx4DI8TmdlvxqGpVNXOgCNR1Jj0gNPhhAY+iz1rgKDAaYrAYdFYnhDV1IFuiuVc9HkOwyDcFxaTElF3/wg== dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.9.1.tgz#d8ce497dc0ed42066e195c8ecc40d45c7b1254f4" - integrity sha512-w0tiiRc9I4S5XSXXrMHOWgHgxbrBn1Ro+PmiYhSg2ZVdxrAJtQgzU5o2m1BfP6UOn7Vxcc6152vFjQfmZR4xEg== +"@typescript-eslint/eslint-plugin@6.10.0": + version "6.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.10.0.tgz#cfe2bd34e26d2289212946b96ab19dcad64b661a" + integrity sha512-uoLj4g2OTL8rfUQVx2AFO1hp/zja1wABJq77P6IclQs6I/m9GLrm7jCdgzZkvWdDCQf1uEvoa8s8CupsgWQgVg== dependencies: "@eslint-community/regexpp" "^4.5.1" - "@typescript-eslint/scope-manager" "6.9.1" - "@typescript-eslint/type-utils" "6.9.1" - "@typescript-eslint/utils" "6.9.1" - "@typescript-eslint/visitor-keys" "6.9.1" + "@typescript-eslint/scope-manager" "6.10.0" + "@typescript-eslint/type-utils" "6.10.0" + "@typescript-eslint/utils" "6.10.0" + "@typescript-eslint/visitor-keys" "6.10.0" debug "^4.3.4" graphemer "^1.4.0" ignore "^5.2.4" @@ -829,72 +829,72 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/parser@6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.9.1.tgz#4f685f672f8b9580beb38d5fb99d52fc3e34f7a3" - integrity sha512-C7AK2wn43GSaCUZ9do6Ksgi2g3mwFkMO3Cis96kzmgudoVaKyt62yNzJOktP0HDLb/iO2O0n2lBOzJgr6Q/cyg== +"@typescript-eslint/parser@6.10.0": + version "6.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.10.0.tgz#578af79ae7273193b0b6b61a742a2bc8e02f875a" + integrity sha512-+sZwIj+s+io9ozSxIWbNB5873OSdfeBEH/FR0re14WLI6BaKuSOnnwCJ2foUiu8uXf4dRp1UqHP0vrZ1zXGrog== dependencies: - "@typescript-eslint/scope-manager" "6.9.1" - "@typescript-eslint/types" "6.9.1" - "@typescript-eslint/typescript-estree" "6.9.1" - "@typescript-eslint/visitor-keys" "6.9.1" + "@typescript-eslint/scope-manager" "6.10.0" + "@typescript-eslint/types" "6.10.0" + "@typescript-eslint/typescript-estree" "6.10.0" + "@typescript-eslint/visitor-keys" "6.10.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.9.1.tgz#e96afeb9a68ad1cd816dba233351f61e13956b75" - integrity sha512-38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg== +"@typescript-eslint/scope-manager@6.10.0": + version "6.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.10.0.tgz#b0276118b13d16f72809e3cecc86a72c93708540" + integrity sha512-TN/plV7dzqqC2iPNf1KrxozDgZs53Gfgg5ZHyw8erd6jd5Ta/JIEcdCheXFt9b1NYb93a1wmIIVW/2gLkombDg== dependencies: - "@typescript-eslint/types" "6.9.1" - "@typescript-eslint/visitor-keys" "6.9.1" + "@typescript-eslint/types" "6.10.0" + "@typescript-eslint/visitor-keys" "6.10.0" -"@typescript-eslint/type-utils@6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.9.1.tgz#efd5db20ed35a74d3c7d8fba51b830ecba09ce32" - integrity sha512-eh2oHaUKCK58qIeYp19F5V5TbpM52680sB4zNSz29VBQPTWIlE/hCj5P5B1AChxECe/fmZlspAWFuRniep1Skg== +"@typescript-eslint/type-utils@6.10.0": + version "6.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.10.0.tgz#1007faede067c78bdbcef2e8abb31437e163e2e1" + integrity sha512-wYpPs3hgTFblMYwbYWPT3eZtaDOjbLyIYuqpwuLBBqhLiuvJ+9sEp2gNRJEtR5N/c9G1uTtQQL5AhV0fEPJYcg== dependencies: - "@typescript-eslint/typescript-estree" "6.9.1" - "@typescript-eslint/utils" "6.9.1" + "@typescript-eslint/typescript-estree" "6.10.0" + "@typescript-eslint/utils" "6.10.0" debug "^4.3.4" ts-api-utils "^1.0.1" -"@typescript-eslint/types@6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.9.1.tgz#a6cfc20db0fcedcb2f397ea728ef583e0ee72459" - integrity sha512-BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ== +"@typescript-eslint/types@6.10.0": + version "6.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.10.0.tgz#f4f0a84aeb2ac546f21a66c6e0da92420e921367" + integrity sha512-36Fq1PWh9dusgo3vH7qmQAj5/AZqARky1Wi6WpINxB6SkQdY5vQoT2/7rW7uBIsPDcvvGCLi4r10p0OJ7ITAeg== -"@typescript-eslint/typescript-estree@6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz#8c77910a49a04f0607ba94d78772da07dab275ad" - integrity sha512-U+mUylTHfcqeO7mLWVQ5W/tMLXqVpRv61wm9ZtfE5egz7gtnmqVIw9ryh0mgIlkKk9rZLY3UHygsBSdB9/ftyw== +"@typescript-eslint/typescript-estree@6.10.0": + version "6.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.10.0.tgz#667381eed6f723a1a8ad7590a31f312e31e07697" + integrity sha512-ek0Eyuy6P15LJVeghbWhSrBCj/vJpPXXR+EpaRZqou7achUWL8IdYnMSC5WHAeTWswYQuP2hAZgij/bC9fanBg== dependencies: - "@typescript-eslint/types" "6.9.1" - "@typescript-eslint/visitor-keys" "6.9.1" + "@typescript-eslint/types" "6.10.0" + "@typescript-eslint/visitor-keys" "6.10.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/utils@6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.9.1.tgz#763da41281ef0d16974517b5f0d02d85897a1c1e" - integrity sha512-L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA== +"@typescript-eslint/utils@6.10.0": + version "6.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.10.0.tgz#4d76062d94413c30e402c9b0df8c14aef8d77336" + integrity sha512-v+pJ1/RcVyRc0o4wAGux9x42RHmAjIGzPRo538Z8M1tVx6HOnoQBCX/NoadHQlZeC+QO2yr4nNSFWOoraZCAyg== dependencies: "@eslint-community/eslint-utils" "^4.4.0" "@types/json-schema" "^7.0.12" "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "6.9.1" - "@typescript-eslint/types" "6.9.1" - "@typescript-eslint/typescript-estree" "6.9.1" + "@typescript-eslint/scope-manager" "6.10.0" + "@typescript-eslint/types" "6.10.0" + "@typescript-eslint/typescript-estree" "6.10.0" semver "^7.5.4" -"@typescript-eslint/visitor-keys@6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.1.tgz#6753a9225a0ba00459b15d6456b9c2780b66707d" - integrity sha512-MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw== +"@typescript-eslint/visitor-keys@6.10.0": + version "6.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.10.0.tgz#b9eaf855a1ac7e95633ae1073af43d451e8f84e3" + integrity sha512-xMGluxQIEtOM7bqFCo+rCMh5fqI+ZxV5RUUOa29iVPz1OgCZrtc7rFnz5cLUazlkPKYqX+75iuDq7m0HQ48nCg== dependencies: - "@typescript-eslint/types" "6.9.1" + "@typescript-eslint/types" "6.10.0" eslint-visitor-keys "^3.4.1" "@ungap/structured-clone@^1.2.0": @@ -1456,13 +1456,13 @@ big.js@^5.2.2: resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== -billboard.js@3.10.2: - version "3.10.2" - resolved "https://registry.yarnpkg.com/billboard.js/-/billboard.js-3.10.2.tgz#86e7472d0bf12594b7bd092e49d6ae7fec6b67eb" - integrity sha512-iBOGlc0P3VaupNKZ9JM/quxBqlSjudw+p+XG7skMn3xuPSpsMFD49wHeYOVOxASGGo+SvBn8T5lkFdRbQOYsow== +billboard.js@3.10.3: + version "3.10.3" + resolved "https://registry.yarnpkg.com/billboard.js/-/billboard.js-3.10.3.tgz#e328d59f7f4cf495bbbfd43d4da1d798e63643bd" + integrity sha512-GtexPEGbN4gkcxKL6/9iU2VK5YBaUUdJ1wcG7eJEtihJMx/LWrAxqKCd2H0Kfrypc557yhs14SFsfhr9xD1BWA== dependencies: - "@types/d3-selection" "^3.0.8" - "@types/d3-transition" "^3.0.6" + "@types/d3-selection" "^3.0.9" + "@types/d3-transition" "^3.0.7" d3-axis "^3.0.0" d3-brush "^3.0.0" d3-drag "^3.0.0" @@ -2169,7 +2169,7 @@ cssnano@^6.0.1: cssnano-preset-default "^6.0.1" lilconfig "^2.1.0" -csso@^5.0.5: +csso@5.0.5: version "5.0.5" resolved "https://registry.yarnpkg.com/csso/-/csso-5.0.5.tgz#f9b7fe6cc6ac0b7d90781bb16d5e9874303e2ca6" integrity sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ== @@ -2616,9 +2616,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.4.535: - version "1.4.576" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.576.tgz#0c6940fdc0d60f7e34bd742b29d8fa847c9294d1" - integrity sha512-yXsZyXJfAqzWk1WKryr0Wl0MN2D47xodPvEEwlVePBnhU5E7raevLQR+E6b9JAD3GfL/7MbAL9ZtWQQPcLx7wA== + version "1.4.581" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.581.tgz#23b684c67bf56d4284e95598c05a5d266653b6d8" + integrity sha512-6uhqWBIapTJUxgPTCHH9sqdbxIMPt7oXl0VcAL1kOtlU6aECdcMncCrX5Z7sHQ/invtrC9jUQUef7+HhO8vVFw== emoji-regex@^8.0.0: version "8.0.0" @@ -2745,9 +2745,9 @@ es-abstract@^1.22.1: which-typed-array "^1.1.13" es-module-lexer@^1.2.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.1.tgz#c1b0dd5ada807a3b3155315911f364dc4e909db1" - integrity sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q== + version "1.4.0" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.0.tgz#285182e7f8f536ff5f4c57f2309836ef851474d8" + integrity sha512-lcCr3v3OLezdfFyx9r5NRYHOUTQNnFEQ9E87Mx8Kc+iqyJNkO7MJoB4GQRTlIMw9kLLTwGw0OAkm4BQQud/d9g== es-set-tostringtag@^2.0.1: version "2.0.2" @@ -3064,9 +3064,9 @@ fast-fifo@^1.1.0, fast-fifo@^1.2.0: integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ== fast-glob@^3.2.11, fast-glob@^3.2.7, fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4" - integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg== + version "3.3.2" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" + integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -4537,9 +4537,11 @@ lru-cache@^7.5.1, lru-cache@^7.7.1: integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== "lru-cache@^9.1.1 || ^10.0.0": - version "10.0.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a" - integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g== + version "10.0.2" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.2.tgz#34504678cc3266b09b8dfd6fab4e1515258271b7" + integrity sha512-Yj9mA8fPiVgOUpByoTZO5pNrcl5Yk37FcSHsUINpAsaBIEZIuqcCclDZJCVxqQShDsmYX8QG63svJiTbOATZwg== + dependencies: + semver "^7.3.5" lz-string@1.5.0: version "1.5.0" @@ -4891,9 +4893,9 @@ nanoid@3.3.3: integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== nanoid@^3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" - integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== + version "3.3.7" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" + integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== napi-build-utils@^1.0.1: version "1.0.2" @@ -6555,9 +6557,9 @@ stream-shift@^1.0.0: integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== streamx@^2.15.0: - version "2.15.2" - resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.2.tgz#680eacebdc9c43ede7362c2e6695b34dd413c741" - integrity sha512-b62pAV/aeMjUoRN2C/9F0n+G8AfcJjNC0zw/ZmOHeFsIe4m4GzjVW9m6VHXVjk536NbdU9JRwKMJRfkc+zUFTg== + version "2.15.4" + resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.4.tgz#497b8102d076ae12b43c456e0bb16940d1ba0999" + integrity sha512-uSXKl88bibiUCQ1eMpItRljCzDENcDx18rsfDmV79r0e/ThfrAwxG4Y2FarQZ2G4/21xcOKmFFd1Hue+ZIDwHw== dependencies: fast-fifo "^1.1.0" queue-tick "^1.0.1" @@ -6718,16 +6720,16 @@ svgicons2svgfont@^12.0.0: sax "^1.2.4" svg-pathdata "^6.0.3" -svgo@3.0.2, svgo@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.0.2.tgz#5e99eeea42c68ee0dc46aa16da093838c262fe0a" - integrity sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ== +svgo@3.0.3, svgo@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.0.3.tgz#8cdfece6d4a0dc1dc116766d806daf817c1798b8" + integrity sha512-X4UZvLhOglD5Xrp834HzGHf8RKUW0Ahigg/08yRO1no9t2NxffOkMiQ0WmaMIbaGlVTlSst2zWANsdhz5ybXgA== dependencies: "@trysound/sax" "0.2.0" commander "^7.2.0" css-select "^5.1.0" css-tree "^2.2.1" - csso "^5.0.5" + csso "5.0.5" picocolors "^1.0.0" svgpath@^2.1.5: From 4476ba83a9543892ee8f8272c19c9768a363e648 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sat, 11 Nov 2023 16:16:39 -0500 Subject: [PATCH 0205/1012] Renames to decoration and fixes alignment --- .../patchDetails/components/gl-tree-base.ts | 2 +- .../apps/shared/components/tree/base.ts | 12 ++++----- .../shared/components/tree/tree-generator.ts | 26 +++++++++---------- .../apps/shared/components/tree/tree-item.ts | 6 ++--- .../apps/shared/components/tree/tree.css.ts | 8 +++++- 5 files changed, 30 insertions(+), 24 deletions(-) diff --git a/src/webviews/apps/plus/patchDetails/components/gl-tree-base.ts b/src/webviews/apps/plus/patchDetails/components/gl-tree-base.ts index ca9a5ee5d0291..92b14c52da9af 100644 --- a/src/webviews/apps/plus/patchDetails/components/gl-tree-base.ts +++ b/src/webviews/apps/plus/patchDetails/components/gl-tree-base.ts @@ -208,7 +208,7 @@ export class GlTreeBase extends GlElement extends TreeItemBase { label: string; @@ -55,7 +55,7 @@ interface TreeModelBase extends TreeItemBase { description?: string; context?: Context; actions?: TreeItemAction[]; - decorators?: TreeItemDecorator[]; + decorations?: TreeItemDecoration[]; contextData?: unknown; } diff --git a/src/webviews/apps/shared/components/tree/tree-generator.ts b/src/webviews/apps/shared/components/tree/tree-generator.ts index 493abd69837f6..e3cc2da97cd0d 100644 --- a/src/webviews/apps/shared/components/tree/tree-generator.ts +++ b/src/webviews/apps/shared/components/tree/tree-generator.ts @@ -86,25 +86,25 @@ export class GlTreeGenerator extends GlElement { }); } - private renderDecorators(model: TreeModelFlat) { - const decorators = model.decorators; - if (decorators == null || decorators.length === 0) return nothing; + private renderDecorations(model: TreeModelFlat) { + const decorations = model.decorations; + if (decorations == null || decorations.length === 0) return nothing; - return decorators.map(decorator => { - if (decorator.type === 'icon') { + return decorations.map(decoration => { + if (decoration.type === 'icon') { return html``; } - if (decorator.type === 'text') { - return html`${decorator.label}`; + if (decoration.type === 'text') { + return html`${decoration.label}`; } - // TODO: implement badge and indicator decorators + // TODO: implement badge and indicator decorations return undefined; }); @@ -132,7 +132,7 @@ export class GlTreeGenerator extends GlElement { model.description != null, () => html`${model.description}`, )} - ${this.renderActions(model)} ${this.renderDecorators(model)} + ${this.renderActions(model)} ${this.renderDecorations(model)} `; } diff --git a/src/webviews/apps/shared/components/tree/tree-item.ts b/src/webviews/apps/shared/components/tree/tree-item.ts index d648aac488c53..037be48972753 100644 --- a/src/webviews/apps/shared/components/tree/tree-item.ts +++ b/src/webviews/apps/shared/components/tree/tree-item.ts @@ -164,8 +164,8 @@ export class GlTreeItem extends GlElement { return html``; } - private renderDecorators() { - return html``; + private renderDecorations() { + return html``; } override render() { @@ -184,7 +184,7 @@ export class GlTreeItem extends GlElement { - ${this.renderActions()}${this.renderDecorators()} + ${this.renderActions()}${this.renderDecorations()} `; } diff --git a/src/webviews/apps/shared/components/tree/tree.css.ts b/src/webviews/apps/shared/components/tree/tree.css.ts index ac7ae4a72d525..0058144ecc84f 100644 --- a/src/webviews/apps/shared/components/tree/tree.css.ts +++ b/src/webviews/apps/shared/components/tree/tree.css.ts @@ -11,7 +11,8 @@ export const treeItemStyles = [ --tree-connector-size: var(--gitlens-tree-indent, 1.6rem); box-sizing: border-box; padding-left: var(--gitlens-gutter-width); - padding-right: var(--gitlens-scrollbar-gutter-width); + /* padding-right: var(--gitlens-scrollbar-gutter-width); */ + padding-right: 0.5rem; padding-top: 0.1rem; padding-bottom: 0.1rem; line-height: 2.2rem; @@ -213,5 +214,10 @@ export const treeItemStyles = [ .checkbox__input:checked + .checkbox__check { opacity: 1; } + + slot[name='decorations'] { + display: inline-block; + margin-left: 0.4rem; + } `, ]; From e052b44fad06865362e33fb8886e556c0e7e79b6 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sun, 12 Nov 2023 00:46:47 -0500 Subject: [PATCH 0206/1012] Unifies webview panel show command args --- package.json | 84 ++++++++++++------------- src/constants.ts | 28 ++++----- src/plus/webviews/graph/graphWebview.ts | 2 +- src/plus/webviews/graph/registration.ts | 14 +---- src/webviews/apps/home/home.html | 2 +- src/webviews/apps/welcome/welcome.html | 4 +- src/webviews/settings/registration.ts | 2 +- src/webviews/webviewsController.ts | 19 +----- 8 files changed, 66 insertions(+), 89 deletions(-) diff --git a/package.json b/package.json index b96e2f9bd473f..42d73b1191639 100644 --- a/package.json +++ b/package.json @@ -5200,85 +5200,85 @@ "icon": "$(gear)" }, { - "command": "gitlens.showSettingsPage#views", + "command": "gitlens.showSettingsPage!views", "title": "Open Settings", "category": "GitLens", "icon": "$(gear)" }, { - "command": "gitlens.showSettingsPage#autolinks", + "command": "gitlens.showSettingsPage!autolinks", "title": "Configure Autolinks", "category": "GitLens", "icon": "$(gear)" }, { - "command": "gitlens.showSettingsPage#branches-view", + "command": "gitlens.showSettingsPage!branches-view", "title": "Open View Settings", "category": "GitLens", "icon": "$(gear)" }, { - "command": "gitlens.showSettingsPage#commits-view", + "command": "gitlens.showSettingsPage!commits-view", "title": "Open View Settings", "category": "GitLens", "icon": "$(gear)" }, { - "command": "gitlens.showSettingsPage#contributors-view", + "command": "gitlens.showSettingsPage!contributors-view", "title": "Open View Settings", "category": "GitLens", "icon": "$(gear)" }, { - "command": "gitlens.showSettingsPage#file-history-view", + "command": "gitlens.showSettingsPage!file-history-view", "title": "Open View Settings", "category": "GitLens", "icon": "$(gear)" }, { - "command": "gitlens.showSettingsPage#line-history-view", + "command": "gitlens.showSettingsPage!line-history-view", "title": "Open View Settings", "category": "GitLens", "icon": "$(gear)" }, { - "command": "gitlens.showSettingsPage#remotes-view", + "command": "gitlens.showSettingsPage!remotes-view", "title": "Open View Settings", "category": "GitLens", "icon": "$(gear)" }, { - "command": "gitlens.showSettingsPage#repositories-view", + "command": "gitlens.showSettingsPage!repositories-view", "title": "Open View Settings", "category": "GitLens", "icon": "$(gear)" }, { - "command": "gitlens.showSettingsPage#search-compare-view", + "command": "gitlens.showSettingsPage!search-compare-view", "title": "Open View Settings", "category": "GitLens", "icon": "$(gear)" }, { - "command": "gitlens.showSettingsPage#stashes-view", + "command": "gitlens.showSettingsPage!stashes-view", "title": "Open View Settings", "category": "GitLens", "icon": "$(gear)" }, { - "command": "gitlens.showSettingsPage#tags-view", + "command": "gitlens.showSettingsPage!tags-view", "title": "Open View Settings", "category": "GitLens", "icon": "$(gear)" }, { - "command": "gitlens.showSettingsPage#worktrees-view", + "command": "gitlens.showSettingsPage!worktrees-view", "title": "Open View Settings", "category": "GitLens", "icon": "$(gear)" }, { - "command": "gitlens.showSettingsPage#commit-graph", + "command": "gitlens.showSettingsPage!commit-graph", "title": "Open Commit Graph Settings", "category": "GitLens", "icon": "$(gear)" @@ -8694,55 +8694,55 @@ "when": "gitlens:enabled" }, { - "command": "gitlens.showSettingsPage#views", + "command": "gitlens.showSettingsPage!views", "when": "false" }, { - "command": "gitlens.showSettingsPage#branches-view", + "command": "gitlens.showSettingsPage!branches-view", "when": "false" }, { - "command": "gitlens.showSettingsPage#commits-view", + "command": "gitlens.showSettingsPage!commits-view", "when": "false" }, { - "command": "gitlens.showSettingsPage#contributors-view", + "command": "gitlens.showSettingsPage!contributors-view", "when": "false" }, { - "command": "gitlens.showSettingsPage#file-history-view", + "command": "gitlens.showSettingsPage!file-history-view", "when": "false" }, { - "command": "gitlens.showSettingsPage#line-history-view", + "command": "gitlens.showSettingsPage!line-history-view", "when": "false" }, { - "command": "gitlens.showSettingsPage#remotes-view", + "command": "gitlens.showSettingsPage!remotes-view", "when": "false" }, { - "command": "gitlens.showSettingsPage#repositories-view", + "command": "gitlens.showSettingsPage!repositories-view", "when": "false" }, { - "command": "gitlens.showSettingsPage#search-compare-view", + "command": "gitlens.showSettingsPage!search-compare-view", "when": "false" }, { - "command": "gitlens.showSettingsPage#stashes-view", + "command": "gitlens.showSettingsPage!stashes-view", "when": "false" }, { - "command": "gitlens.showSettingsPage#tags-view", + "command": "gitlens.showSettingsPage!tags-view", "when": "false" }, { - "command": "gitlens.showSettingsPage#worktrees-view", + "command": "gitlens.showSettingsPage!worktrees-view", "when": "false" }, { - "command": "gitlens.showSettingsPage#commit-graph", + "command": "gitlens.showSettingsPage!commit-graph", "when": "false" }, { @@ -11959,57 +11959,57 @@ "group": "navigation@-98" }, { - "command": "gitlens.showSettingsPage#branches-view", + "command": "gitlens.showSettingsPage!branches-view", "when": "view =~ /^gitlens\\.views\\.branches/", "group": "9_gitlens@1" }, { - "command": "gitlens.showSettingsPage#commits-view", + "command": "gitlens.showSettingsPage!commits-view", "when": "view =~ /^gitlens\\.views\\.commits/", "group": "9_gitlens@1" }, { - "command": "gitlens.showSettingsPage#contributors-view", + "command": "gitlens.showSettingsPage!contributors-view", "when": "view =~ /^gitlens\\.views\\.contributors/", "group": "9_gitlens@1" }, { - "command": "gitlens.showSettingsPage#file-history-view", + "command": "gitlens.showSettingsPage!file-history-view", "when": "view =~ /^gitlens\\.views\\.fileHistory/", "group": "9_gitlens@1" }, { - "command": "gitlens.showSettingsPage#line-history-view", + "command": "gitlens.showSettingsPage!line-history-view", "when": "view =~ /^gitlens\\.views\\.lineHistory/", "group": "9_gitlens@1" }, { - "command": "gitlens.showSettingsPage#remotes-view", + "command": "gitlens.showSettingsPage!remotes-view", "when": "view =~ /^gitlens\\.views\\.remotes/", "group": "9_gitlens@1" }, { - "command": "gitlens.showSettingsPage#repositories-view", + "command": "gitlens.showSettingsPage!repositories-view", "when": "view =~ /^gitlens\\.views\\.repositories/", "group": "9_gitlens@1" }, { - "command": "gitlens.showSettingsPage#search-compare-view", + "command": "gitlens.showSettingsPage!search-compare-view", "when": "view =~ /^gitlens\\.views\\.searchAndCompare\\b/", "group": "9_gitlens@1" }, { - "command": "gitlens.showSettingsPage#stashes-view", + "command": "gitlens.showSettingsPage!stashes-view", "when": "view =~ /^gitlens\\.views\\.stashes/", "group": "9_gitlens@1" }, { - "command": "gitlens.showSettingsPage#tags-view", + "command": "gitlens.showSettingsPage!tags-view", "when": "view =~ /^gitlens\\.views\\.tags/", "group": "9_gitlens@1" }, { - "command": "gitlens.showSettingsPage#worktrees-view", + "command": "gitlens.showSettingsPage!worktrees-view", "when": "view =~ /^gitlens\\.views\\.worktrees/", "group": "9_gitlens@1" } @@ -12692,12 +12692,12 @@ "alt": "gitlens.copyRemoteFileUrlWithoutRange" }, { - "command": "gitlens.showSettingsPage#autolinks", + "command": "gitlens.showSettingsPage!autolinks", "when": "viewItem =~ /gitlens:autolinked:items\\b/", "group": "inline@99" }, { - "command": "gitlens.showSettingsPage#autolinks", + "command": "gitlens.showSettingsPage!autolinks", "when": "viewItem =~ /gitlens:autolinked:items\\b/", "group": "1_gitlens_actions@99" }, @@ -14531,7 +14531,7 @@ "group": "1_gitlens@1" }, { - "command": "gitlens.showSettingsPage#commit-graph", + "command": "gitlens.showSettingsPage!commit-graph", "group": "9_gitlens@1" } ], @@ -15636,7 +15636,7 @@ { "id": "gitlens.welcome.hostingServiceIntegrations", "title": "Integrate with Git hosting services", - "description": "Simplify your workflow and quickly gain insights with automatic linking of issues and pull requests across multiple Git hosting services including GitHub, GitHub Enterprise ✨, GitLab, GitLab self-managed ✨, Gitea, Gerrit, Google Source, Bitbucket, Bitbucket Server, Azure DevOps, and custom servers.\n\nAll integration provide automatic linking, while rich integrations with GitHub & GitLab offer detailed hover information for autolinks, and correlations between pull requests, branches, and commits, as well as user avatars for added context.\n\n**Define your own autolinks**\nUse autolinks to linkify external references, like Jira issues or Zendesk tickets, in commit messages.\n\n[Configure Autolinks](command:gitlens.showSettingsPage?%22autolinks%22)", + "description": "Simplify your workflow and quickly gain insights with automatic linking of issues and pull requests across multiple Git hosting services including GitHub, GitHub Enterprise ✨, GitLab, GitLab self-managed ✨, Gitea, Gerrit, Google Source, Bitbucket, Bitbucket Server, Azure DevOps, and custom servers.\n\nAll integration provide automatic linking, while rich integrations with GitHub & GitLab offer detailed hover information for autolinks, and correlations between pull requests, branches, and commits, as well as user avatars for added context.\n\n**Define your own autolinks**\nUse autolinks to linkify external references, like Jira issues or Zendesk tickets, in commit messages.\n\n[Configure Autolinks](command:gitlens.showSettingsPage!autolinks)", "media": { "markdown": "walkthroughs/welcome/integrations.md" } diff --git a/src/constants.ts b/src/constants.ts index 9689be5339436..382ff6b856a17 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -272,20 +272,20 @@ export const enum Commands { ShowRepositoriesView = 'gitlens.showRepositoriesView', ShowSearchAndCompareView = 'gitlens.showSearchAndCompareView', ShowSettingsPage = 'gitlens.showSettingsPage', - ShowSettingsPageAndJumpToBranchesView = 'gitlens.showSettingsPage#branches-view', - ShowSettingsPageAndJumpToCommitsView = 'gitlens.showSettingsPage#commits-view', - ShowSettingsPageAndJumpToContributorsView = 'gitlens.showSettingsPage#contributors-view', - ShowSettingsPageAndJumpToFileHistoryView = 'gitlens.showSettingsPage#file-history-view', - ShowSettingsPageAndJumpToLineHistoryView = 'gitlens.showSettingsPage#line-history-view', - ShowSettingsPageAndJumpToRemotesView = 'gitlens.showSettingsPage#remotes-view', - ShowSettingsPageAndJumpToRepositoriesView = 'gitlens.showSettingsPage#repositories-view', - ShowSettingsPageAndJumpToSearchAndCompareView = 'gitlens.showSettingsPage#search-compare-view', - ShowSettingsPageAndJumpToStashesView = 'gitlens.showSettingsPage#stashes-view', - ShowSettingsPageAndJumpToTagsView = 'gitlens.showSettingsPage#tags-view', - ShowSettingsPageAndJumpToWorkTreesView = 'gitlens.showSettingsPage#worktrees-view', - ShowSettingsPageAndJumpToViews = 'gitlens.showSettingsPage#views', - ShowSettingsPageAndJumpToCommitGraph = 'gitlens.showSettingsPage#commit-graph', - ShowSettingsPageAndJumpToAutolinks = 'gitlens.showSettingsPage#autolinks', + ShowSettingsPageAndJumpToBranchesView = 'gitlens.showSettingsPage!branches-view', + ShowSettingsPageAndJumpToCommitsView = 'gitlens.showSettingsPage!commits-view', + ShowSettingsPageAndJumpToContributorsView = 'gitlens.showSettingsPage!contributors-view', + ShowSettingsPageAndJumpToFileHistoryView = 'gitlens.showSettingsPage!file-history-view', + ShowSettingsPageAndJumpToLineHistoryView = 'gitlens.showSettingsPage!line-history-view', + ShowSettingsPageAndJumpToRemotesView = 'gitlens.showSettingsPage!remotes-view', + ShowSettingsPageAndJumpToRepositoriesView = 'gitlens.showSettingsPage!repositories-view', + ShowSettingsPageAndJumpToSearchAndCompareView = 'gitlens.showSettingsPage!search-compare-view', + ShowSettingsPageAndJumpToStashesView = 'gitlens.showSettingsPage!stashes-view', + ShowSettingsPageAndJumpToTagsView = 'gitlens.showSettingsPage!tags-view', + ShowSettingsPageAndJumpToWorkTreesView = 'gitlens.showSettingsPage!worktrees-view', + ShowSettingsPageAndJumpToViews = 'gitlens.showSettingsPage!views', + ShowSettingsPageAndJumpToCommitGraph = 'gitlens.showSettingsPage!commit-graph', + ShowSettingsPageAndJumpToAutolinks = 'gitlens.showSettingsPage!autolinks', ShowStashesView = 'gitlens.showStashesView', ShowTagsView = 'gitlens.showTagsView', ShowTimelinePage = 'gitlens.showTimelinePage', diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts index 33358e352b024..3da475945fe9e 100644 --- a/src/plus/webviews/graph/graphWebview.ts +++ b/src/plus/webviews/graph/graphWebview.ts @@ -395,7 +395,7 @@ export class GraphWebviewProvider implements WebviewProvider void executeCommand( Commands.ShowGraphPage, - { _type: 'WebviewPanelShowOptions' }, + undefined, this.repository, ), ), diff --git a/src/plus/webviews/graph/registration.ts b/src/plus/webviews/graph/registration.ts index 30cb1c33d1892..73c6165719d67 100644 --- a/src/plus/webviews/graph/registration.ts +++ b/src/plus/webviews/graph/registration.ts @@ -99,21 +99,11 @@ export function registerGraphWebviewCommands( return executeCommand(Commands.ShowGraphView, ...args); } - return executeCommand( - Commands.ShowGraphPage, - { _type: 'WebviewPanelShowOptions' }, - undefined, - ...args, - ); + return executeCommand(Commands.ShowGraphPage, undefined, ...args); }), registerCommand(`${panels.id}.switchToEditorLayout`, async () => { await configuration.updateEffective('graph.layout', 'editor'); - queueMicrotask( - () => - void executeCommand(Commands.ShowGraphPage, { - _type: 'WebviewPanelShowOptions', - }), - ); + queueMicrotask(() => void executeCommand(Commands.ShowGraphPage)); }), registerCommand(`${panels.id}.switchToPanelLayout`, async () => { await configuration.updateEffective('graph.layout', 'panel'); diff --git a/src/webviews/apps/home/home.html b/src/webviews/apps/home/home.html index 25505325f25ea..68e9d32eb14a3 100644 --- a/src/webviews/apps/home/home.html +++ b/src/webviews/apps/home/home.html @@ -322,7 +322,7 @@

Configuration

> Integrations Use autolinks to linkify external references, like Jira issues or Zendesk tickets, in commit messages.

- Configure Autolinks @@ -583,7 +583,7 @@

Configuration

>GitLens Settings Autolinks Settings(panels: WebviewPanelsProxy { // The show and jump commands are structured to have a # separating the base command from the anchor let anchor: string | undefined; - const match = /.*?#(.*)/.exec(c); + const match = /.*?!(.*)/.exec(c); if (match != null) { [, anchor] = match; } diff --git a/src/webviews/webviewsController.ts b/src/webviews/webviewsController.ts index 00a7a17b8997f..53431834c5165 100644 --- a/src/webviews/webviewsController.ts +++ b/src/webviews/webviewsController.ts @@ -357,13 +357,8 @@ export class WebviewsController implements Disposable { }), registerCommand( command.id, - (...args: unknown[]) => { - if (hasWebviewPanelShowOptions(args)) { - const [{ _type, ...opts }, ...rest] = args; - return show({ ...command.options, ...opts }, ...(rest as ShowingArgs)); - } - - return show({ ...command.options }, ...(args as ShowingArgs)); + (opts: WebviewPanelShowOptions | undefined, ...args: unknown[]) => { + return show({ ...command.options, ...opts }, ...(args as ShowingArgs)); }, this, ), @@ -415,10 +410,7 @@ interface WebviewPanelsShowOptions extends WebviewPanelShowOptions { preserveInstance?: string | boolean; } -export type WebviewPanelShowCommandArgs = [ - WebviewPanelsShowOptions & { _type: 'WebviewPanelShowOptions' }, - ...args: unknown[], -]; +export type WebviewPanelShowCommandArgs = [WebviewPanelsShowOptions | undefined, ...args: unknown[]]; export interface WebviewViewShowOptions { column?: never; @@ -518,8 +510,3 @@ function getBestController(o: unknown): o is { state: Partial } { return o != null && typeof o === 'object' && 'state' in o && o.state != null && typeof o.state === 'object'; } - -function hasWebviewPanelShowOptions(args: unknown[]): args is WebviewPanelShowCommandArgs { - const [arg] = args; - return arg != null && typeof arg === 'object' && '_type' in arg && arg._type === 'WebviewPanelShowOptions'; -} From 167aec2804549f5a9f7f6490838350fd53bfbf8a Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sun, 12 Nov 2023 01:14:04 -0500 Subject: [PATCH 0207/1012] Updates feature usage type to avoid duplication Fixes worktrees and workspaces view usage key --- src/telemetry/usageTracker.ts | 29 ++++------------------------- src/views/workspacesView.ts | 2 +- src/views/worktreesView.ts | 2 +- 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/src/telemetry/usageTracker.ts b/src/telemetry/usageTracker.ts index 1fdc0c1b43315..bdba5680be30c 100644 --- a/src/telemetry/usageTracker.ts +++ b/src/telemetry/usageTracker.ts @@ -1,5 +1,6 @@ import type { Disposable, Event } from 'vscode'; import { EventEmitter } from 'vscode'; +import type { CustomEditorTypes, TreeViewTypes, WebviewTypes, WebviewViewTypes } from '../constants'; import type { Container } from '../container'; import { updateRecordValue } from '../system/object'; import type { Storage } from '../system/storage'; @@ -11,31 +12,9 @@ export interface TrackedUsage { } export type TrackedUsageFeatures = - | 'accountView' - | 'branchesView' - | 'commitDetailsView' - | 'commitsView' - | 'contributorsView' - | 'draftsView' - | 'fileHistoryView' - | 'focusWebview' - | 'graphDetailsView' - | 'graphView' - | 'graphWebview' - | 'homeView' - | 'lineHistoryView' - | 'patchDetailsView' - | 'rebaseEditor' - | 'remotesView' - | 'repositoriesView' - | 'stashesView' - | 'settingsWebview' - | 'searchAndCompareView' - | 'tagsView' - | 'timelineWebview' - | 'timelineView' - | 'welcomeWebview' - | 'workspaceView'; + | `${WebviewTypes}Webview` + | `${TreeViewTypes | WebviewViewTypes}View` + | `${CustomEditorTypes}Editor`; export type TrackedUsageKeys = `${TrackedUsageFeatures}:shown`; export type UsageChangeEvent = { diff --git a/src/views/workspacesView.ts b/src/views/workspacesView.ts index a4d72e5e1f872..5e064e46c6339 100644 --- a/src/views/workspacesView.ts +++ b/src/views/workspacesView.ts @@ -83,7 +83,7 @@ export class WorkspacesView extends ViewBase<'workspaces', WorkspacesViewNode, W private _disposable: Disposable | undefined; constructor(container: Container) { - super(container, 'workspaces', 'Workspaces', 'workspaceView'); + super(container, 'workspaces', 'Workspaces', 'workspacesView'); this.description = `PREVIEW\u00a0\u00a0☁️`; this.disposables.push(container.workspaces.onDidResetWorkspaces(() => void this.refresh(true))); diff --git a/src/views/worktreesView.ts b/src/views/worktreesView.ts index 5f82c3016333d..be3e56ecd3734 100644 --- a/src/views/worktreesView.ts +++ b/src/views/worktreesView.ts @@ -97,7 +97,7 @@ export class WorktreesView extends ViewBase<'worktrees', WorktreesViewNode, Work protected readonly configKey = 'worktrees'; constructor(container: Container) { - super(container, 'worktrees', 'Worktrees', 'workspaceView'); + super(container, 'worktrees', 'Worktrees', 'worktreesView'); this.disposables.push( window.registerFileDecorationProvider({ From 96d1e9300bceac30e54a301451fa44743fdf44fd Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sun, 12 Nov 2023 01:14:29 -0500 Subject: [PATCH 0208/1012] Adds experimental editor layout for Cloud Patches --- package.json | 24 ++++++++++++ src/config.ts | 3 ++ src/constants.ts | 3 +- src/container.ts | 7 +++- .../patchDetails/patchDetailsWebview.ts | 36 ++++++++++++++--- .../webviews/patchDetails/registration.ts | 39 ++++++++++++++++++- 6 files changed, 104 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 42d73b1191639..ae6f34e7f2eec 100644 --- a/package.json +++ b/package.json @@ -2695,6 +2695,21 @@ "markdownDescription": "Specifies whether to enable the preview of _Cloud Patches_, which allow you to easily and securely share code with your teammates or other developers", "scope": "window", "order": 10 + }, + "gitlens.cloudPatches.experimental.layout": { + "type": "string", + "default": "view", + "enum": [ + "editor", + "view" + ], + "enumDescriptions": [ + "Prefer showing Cloud Patches in the editor area", + "Prefer showing Cloud Patches in a view" + ], + "markdownDescription": "Specifies the preferred layout of for _Cloud Patches_", + "scope": "window", + "order": 11 } } }, @@ -5048,6 +5063,11 @@ "title": "Get Started", "category": "GitLens" }, + { + "command": "gitlens.showPatchDetailsPage", + "title": "Show Patch Details", + "category": "GitLens" + }, { "command": "gitlens.createPatch", "title": "Create Patch...", @@ -8581,6 +8601,10 @@ "command": "gitlens.plus.refreshRepositoryAccess", "when": "gitlens:enabled" }, + { + "command": "gitlens.showPatchDetailsPage", + "when": "gitlens:enabled && config.gitlens.cloudPatches.enabled" + }, { "command": "gitlens.createPatch", "when": "false && gitlens:enabled" diff --git a/src/config.ts b/src/config.ts index 801ba14aeb4fb..3199a489ec7b9 100644 --- a/src/config.ts +++ b/src/config.ts @@ -43,6 +43,9 @@ export interface Config { }; readonly cloudPatches: { readonly enabled: boolean; + readonly experimental: { + readonly layout: 'editor' | 'view'; + }; }; readonly codeLens: CodeLensConfig; readonly currentLine: { diff --git a/src/constants.ts b/src/constants.ts index 382ff6b856a17..f476489466459 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -258,6 +258,7 @@ export const enum Commands { ShowLineCommitInView = 'gitlens.showLineCommitInView', ShowLineHistoryView = 'gitlens.showLineHistoryView', OpenOnlyChangedFiles = 'gitlens.openOnlyChangedFiles', + ShowPatchDetailsPage = 'gitlens.showPatchDetailsPage', ShowQuickBranchHistory = 'gitlens.showQuickBranchHistory', ShowQuickCommit = 'gitlens.showQuickCommitDetails', ShowQuickCommitFile = 'gitlens.showQuickCommitFileDetails', @@ -470,7 +471,7 @@ export type TreeViewTypes = | 'worktrees'; export type TreeViewIds = `gitlens.views.${TreeViewTypes}`; -export type WebviewTypes = 'graph' | 'settings' | 'timeline' | 'welcome' | 'focus'; +export type WebviewTypes = 'focus' | 'graph' | 'patchDetails' | 'settings' | 'timeline' | 'welcome'; export type WebviewIds = `gitlens.${WebviewTypes}`; export type WebviewViewTypes = diff --git a/src/container.ts b/src/container.ts index 3ffb9e95b7e3d..2dd04b0dd8783 100644 --- a/src/container.ts +++ b/src/container.ts @@ -38,7 +38,10 @@ import { } from './plus/webviews/graph/registration'; import { GraphStatusBarController } from './plus/webviews/graph/statusbar'; import type { PatchDetailsWebviewShowingArgs } from './plus/webviews/patchDetails/registration'; -import { registerPatchDetailsWebviewView } from './plus/webviews/patchDetails/registration'; +import { + registerPatchDetailsWebviewPanel, + registerPatchDetailsWebviewView, +} from './plus/webviews/patchDetails/registration'; import type { TimelineWebviewShowingArgs } from './plus/webviews/timeline/registration'; import { registerTimelineWebviewCommands, @@ -260,6 +263,8 @@ export class Container { this._disposables.push((this._repositoriesView = new RepositoriesView(this))); this._disposables.push((this._commitDetailsView = registerCommitDetailsWebviewView(this._webviews))); + const patchDetailsPanels = registerPatchDetailsWebviewPanel(this._webviews); + this._disposables.push(patchDetailsPanels); this._disposables.push((this._patchDetailsView = registerPatchDetailsWebviewView(this._webviews))); this._disposables.push((this._graphDetailsView = registerGraphDetailsWebviewView(this._webviews))); this._disposables.push((this._commitsView = new CommitsView(this))); diff --git a/src/plus/webviews/patchDetails/patchDetailsWebview.ts b/src/plus/webviews/patchDetails/patchDetailsWebview.ts index b6c47c6bee6dc..9c1856cbff5bc 100644 --- a/src/plus/webviews/patchDetails/patchDetailsWebview.ts +++ b/src/plus/webviews/patchDetails/patchDetailsWebview.ts @@ -115,6 +115,27 @@ export class PatchDetailsWebviewProvider this._disposable.dispose(); } + canReuseInstance(...args: PatchDetailsWebviewShowingArgs): boolean | undefined { + const [arg] = args; + if (arg?.mode === 'view' && arg.draft != null) { + switch (arg.draft.draftType) { + case 'cloud': + return ( + this._context.draft?.draftType === arg.draft.draftType && + this._context.draft.id === arg.draft.id + ); + + case 'local': + return ( + this._context.draft?.draftType === arg.draft.draftType && + this._context.draft.patch.contents === arg.draft.patch?.contents + ); + } + } + + return false; + } + async onShowing( _loading: boolean, options: WebviewShowOptions, @@ -142,10 +163,12 @@ export class PatchDetailsWebviewProvider } registerCommands(): Disposable[] { - return [ - registerCommand(`${this.host.id}.refresh`, () => this.host.refresh(true)), - registerCommand(`${this.host.id}.close`, () => this.closeView()), - ]; + return this.host.isView() + ? [ + registerCommand(`${this.host.id}.refresh`, () => this.host.refresh(true)), + registerCommand(`${this.host.id}.close`, () => this.closeView()), + ] + : []; } onMessageReceived(e: IpcMessage) { @@ -293,7 +316,10 @@ export class PatchDetailsWebviewProvider private setMode(mode: Mode, silent?: boolean) { this._context.mode = mode; this.setHostTitle(mode); - void setContext('gitlens:views:patchDetails:mode', mode); + void setContext( + 'gitlens:views:patchDetails:mode', + configuration.get('cloudPatches.experimental.layout') === 'editor' ? undefined : mode, + ); if (!silent) { this.updateState(true); } diff --git a/src/plus/webviews/patchDetails/registration.ts b/src/plus/webviews/patchDetails/registration.ts index d6cfaa59abbed..a7c0397b89f6a 100644 --- a/src/plus/webviews/patchDetails/registration.ts +++ b/src/plus/webviews/patchDetails/registration.ts @@ -1,8 +1,12 @@ +import { ViewColumn } from 'vscode'; +import { Commands } from '../../../constants'; import type { DraftSelectedEvent } from '../../../eventBus'; import type { Repository } from '../../../git/models/repository'; +import { executeCommand } from '../../../system/command'; +import { configuration } from '../../../system/configuration'; import { setContext } from '../../../system/context'; import type { Serialized } from '../../../system/serialize'; -import type { WebviewsController } from '../../../webviews/webviewsController'; +import type { WebviewPanelShowCommandArgs, WebviewsController } from '../../../webviews/webviewsController'; import type { Change, State } from './protocol'; interface CreateDraftFromChanges { @@ -54,6 +58,12 @@ export function registerPatchDetailsWebviewView(controller: WebviewsController) return new PatchDetailsWebviewProvider(container, host); }, async (...args) => { + if (configuration.get('cloudPatches.experimental.layout') === 'editor') { + await setContext('gitlens:views:patchDetails:mode', undefined); + void executeCommand(Commands.ShowPatchDetailsPage, undefined, ...args); + return; + } + const arg = args[0]; if (arg == null) return; @@ -61,3 +71,30 @@ export function registerPatchDetailsWebviewView(controller: WebviewsController) }, ); } + +export function registerPatchDetailsWebviewPanel(controller: WebviewsController) { + return controller.registerWebviewPanel, PatchDetailsWebviewShowingArgs>( + { id: Commands.ShowPatchDetailsPage, options: { preserveInstance: true } }, + { + id: 'gitlens.patchDetails', + fileName: 'patchDetails.html', + iconPath: 'images/gitlens-icon.png', + title: 'Patch', + contextKeyPrefix: `gitlens:webview:patchDetails`, + trackingFeature: 'patchDetailsWebview', + plusFeature: true, + column: ViewColumn.Active, + webviewHostOptions: { + retainContextWhenHidden: false, + enableFindWidget: false, + }, + allowMultipleInstances: true, + }, + async (container, host) => { + const { PatchDetailsWebviewProvider } = await import( + /* webpackChunkName: "patchDetails" */ './patchDetailsWebview' + ); + return new PatchDetailsWebviewProvider(container, host); + }, + ); +} From 685340b13c07435e30a6fa6a8ca8e6be687da12c Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 13 Nov 2023 00:26:44 -0500 Subject: [PATCH 0209/1012] Changes `getDiff` to use to/from args for clarity Changes `PatchRevisionRange` to use to/from args for clarity Changes `openChanges`/`openAllChanges` to use lhs/rhs args for clarity Ensures comparisons -> patch works properly --- src/commands/patches.ts | 240 ++++++------------ src/env/node/git/localGitProvider.ts | 36 +-- src/git/actions/commit.ts | 77 +++--- src/git/gitProvider.ts | 4 +- src/git/gitProviderService.ts | 6 +- src/git/models/diff.ts | 3 +- src/git/models/patch.ts | 10 +- src/plus/drafts/draftsService.ts | 25 +- src/plus/webviews/graph/graphWebview.ts | 2 +- .../patchDetails/patchDetailsWebview.ts | 40 ++- src/plus/webviews/patchDetails/protocol.ts | 20 +- .../webviews/patchDetails/registration.ts | 21 +- src/views/viewCommands.ts | 4 +- .../commitDetails/commitDetailsWebview.ts | 5 +- 14 files changed, 193 insertions(+), 300 deletions(-) diff --git a/src/commands/patches.ts b/src/commands/patches.ts index 376c7a5a0e11e..e34cddbd24690 100644 --- a/src/commands/patches.ts +++ b/src/commands/patches.ts @@ -2,12 +2,11 @@ import type { TextEditor } from 'vscode'; import { window, workspace } from 'vscode'; import { Commands } from '../constants'; import type { Container } from '../container'; -import type { PatchRevisionRange } from '../git/models/patch'; -import { shortenRevision } from '../git/models/reference'; +import { isSha, shortenRevision } from '../git/models/reference'; import type { Repository } from '../git/models/repository'; import type { Draft, LocalDraft } from '../gk/models/drafts'; import { showPatchesView } from '../plus/drafts/actions'; -import type { Change } from '../plus/webviews/patchDetails/protocol'; +import type { Change, CreateDraft } from '../plus/webviews/patchDetails/protocol'; import { getRepositoryOrShowPicker } from '../quickpicks/repositoryPicker'; import { command } from '../system/command'; import type { CommandContext } from './base'; @@ -19,8 +18,8 @@ import { } from './base'; export interface CreatePatchCommandArgs { - ref1?: string; - ref2?: string; + to?: string; + from?: string; repoPath?: string; } @@ -36,13 +35,13 @@ export class CreatePatchCommand extends Command { if (isCommandContextViewNodeHasCommit(context)) { args = { repoPath: context.node.commit.repoPath, - ref1: context.node.commit.ref, + to: context.node.commit.ref, }; } else if (isCommandContextViewNodeHasComparison(context)) { args = { repoPath: context.node.uri.fsPath, - ref1: context.node.compareWithRef.ref, - ref2: context.node.compareRef.ref, + to: context.node.compareRef.ref, + from: context.node.compareWithRef.ref, }; } } @@ -59,22 +58,11 @@ export class CreatePatchCommand extends Command { repo = this.container.git.getRepository(args.repoPath); } if (repo == null) return undefined; - if (args?.ref1 == null) return; + if (args?.to == null) return; - const diff = await getDiffContents(this.container, repo, args); + const diff = await this.container.git.getDiff(repo.uri, args.to ?? 'HEAD', args.from); if (diff == null) return; - // let repo; - // if (args?.repoPath == null) { - // repo = await getRepositoryOrShowPicker('Create Patch'); - // } else { - // repo = this.container.git.getRepository(args.repoPath); - // } - // if (repo == null) return; - - // const diff = await this.container.git.getDiff(repo.uri, args?.ref1 ?? 'HEAD', args?.ref2); - // if (diff == null) return; - const d = await workspace.openTextDocument({ content: diff.contents, language: 'diff' }); await window.showTextDocument(d); @@ -88,101 +76,6 @@ export class CreatePatchCommand extends Command { } } -async function getDiffContents( - container: Container, - repository: Repository, - args: CreatePatchCommandArgs, -): Promise<{ contents: string; revision: PatchRevisionRange } | undefined> { - const sha = args.ref1 ?? 'HEAD'; - - const diff = await container.git.getDiff(repository.uri, sha, args.ref2); - if (diff == null) return undefined; - - return { - contents: diff.contents, - revision: { - baseSha: args.ref2 ?? `${sha}^`, - sha: sha, - }, - }; -} - -interface CreateLocalChange { - title?: string; - description?: string; - changes: Change[]; -} - -async function createLocalChange( - container: Container, - repository: Repository, - args: CreatePatchCommandArgs, -): Promise { - if (args.ref1 == null) return undefined; - - const sha = args.ref1 ?? 'HEAD'; - // const [branchName] = await container.git.getCommitBranches(repository.uri, sha); - - const change: Change = { - type: 'revision', - repository: { - name: repository.name, - path: repository.path, - uri: repository.uri.toString(), - }, - files: undefined!, - revision: { - sha: sha, - baseSha: args.ref2 ?? `${sha}^`, - // branchName: branchName ?? 'HEAD', - }, - }; - - const create: CreateLocalChange = { changes: [change] }; - - const commit = await container.git.getCommit(repository.uri, sha); - if (commit == null) return undefined; - - const message = commit.message!.trim(); - const index = message.indexOf('\n'); - if (index < 0) { - create.title = message; - } else { - create.title = message.substring(0, index); - create.description = message.substring(index + 1); - } - - if (args.ref2 == null) { - change.files = commit.files != null ? [...commit.files] : []; - } else { - const diff = await getDiffContents(container, repository, args); - if (diff == null) return undefined; - - const result = await container.git.getDiffFiles(repository.uri, diff.contents); - if (result?.files == null) return; - - create.title = `Comparing ${shortenRevision(args.ref2)} with ${shortenRevision(args.ref1)}`; - - change.files = result.files; - } - - // const change: Change = { - // type: 'commit', - // repository: { - // name: repository.name, - // path: repository.path, - // uri: repository.uri.toString(), - // }, - // files: result.files, - // range: { - // ...range, - // branchName: branchName ?? 'HEAD', - // }, - // }; - - return create; -} - @command() export class CreateCloudPatchCommand extends Command { constructor(private readonly container: Container) { @@ -195,13 +88,13 @@ export class CreateCloudPatchCommand extends Command { if (isCommandContextViewNodeHasCommit(context)) { args = { repoPath: context.node.commit.repoPath, - ref1: context.node.commit.ref, + to: context.node.commit.ref, }; } else if (isCommandContextViewNodeHasComparison(context)) { args = { repoPath: context.node.uri.fsPath, - ref1: context.node.compareWithRef.ref, - ref2: context.node.compareRef.ref, + to: context.node.compareRef.ref, + from: context.node.compareWithRef.ref, }; } } @@ -220,7 +113,7 @@ export class CreateCloudPatchCommand extends Command { return showPatchesView({ mode: 'create' }); } - const create = await createLocalChange(this.container, repo, args); + const create = await createDraft(this.container, repo, args); if (create == null) { return showPatchesView({ mode: 'create', create: { repositories: [repo] } }); } @@ -366,60 +259,83 @@ export class OpenCloudPatchCommand extends Command { async execute(args?: OpenCloudPatchCommandArgs) { if (args?.id == null && args?.draft == null) { - void window.showErrorMessage('Cannot open cloud patch: no patch or patch id provided'); + void window.showErrorMessage('Cannot open Cloud Patch; no patch or patch id provided'); return; } const draft = args?.draft ?? (await this.container.drafts.getDraft(args?.id)); if (draft == null) { - void window.showErrorMessage(`Cannot open cloud patch: patch ${args.id} not found`); + void window.showErrorMessage(`Cannot open Cloud Patch; patch '${args.id}' not found`); return; } - // let patch: DraftPatch | undefined; - // if (args?.patchId) { - // patch = await this.container.drafts.getPatch(args.patchId); - // } else { - // const patches = draft.changesets?.[0]?.patches; - - // if (patches == null || patches.length === 0) { - // void window.showErrorMessage(`Cannot open cloud patch: no patch found under id ${args.patchId}`); - // return; - // } - - // patch = patches[0]; - - // if (patch.repo == null && patch.repoData != null) { - // const repo = await this.container.git.findMatchingRepository({ - // firstSha: patch.repoData.initialCommitSha, - // remoteUrl: patch.repoData.remote?.url, - // }); - // if (repo != null) { - // patch.repo = repo; - // } - // } + void showPatchesView({ mode: 'view', draft: draft }); + } +} - // if (patch.repo == null) { - // void window.showErrorMessage(`Cannot open cloud patch: no repository found for patch ${args.patchId}`); - // return; - // } +async function createDraft( + container: Container, + repository: Repository, + args: CreatePatchCommandArgs, +): Promise { + if (args.to == null) return undefined; - // // Opens the patch repository if it's not already open - // void this.container.git.getOrOpenRepository(patch.repo.uri); + const to = args.to ?? 'HEAD'; - // const patchContents = await this.container.drafts.getPatchContents(patch.id); - // if (patchContents == null) { - // void window.showErrorMessage(`Cannot open cloud patch: patch not found of contents empty`); - // return; - // } - // patch.contents = patchContents; - // } + const change: Change = { + type: 'revision', + repository: { + name: repository.name, + path: repository.path, + uri: repository.uri.toString(), + }, + files: undefined!, + revision: { to: to, from: args.from ?? `${to}^` }, + }; - // if (patch == null) { - // void window.showErrorMessage(`Cannot open cloud patch: patch not found`); - // return; - // } + const create: CreateDraft = { changes: [change] }; - void showPatchesView({ mode: 'view', draft: draft }); + const commit = await container.git.getCommit(repository.uri, to); + if (commit == null) return undefined; + + const message = commit.message!.trim(); + const index = message.indexOf('\n'); + if (index < 0) { + create.title = message; + } else { + create.title = message.substring(0, index); + create.description = message.substring(index + 1); } + + if (args.from == null) { + if (commit.files == null) return; + + change.files = [...commit.files]; + } else { + const diff = await container.git.getDiff(repository.uri, to, args.from); + if (diff == null) return; + + const result = await container.git.getDiffFiles(repository.uri, diff.contents); + if (result?.files == null) return; + + change.files = result.files; + + create.title = `Comparing ${shortenRevision(args.to)} with ${shortenRevision(args.from)}`; + + if (!isSha(args.to)) { + const commit = await container.git.getCommit(repository.uri, args.to); + if (commit != null) { + change.revision.to = commit.sha; + } + } + + if (!isSha(args.from)) { + const commit = await container.git.getCommit(repository.uri, args.from); + if (commit != null) { + change.revision.from = commit.sha; + } + } + } + + return create; } diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts index 1acc0fd717c12..29a69127f5f09 100644 --- a/src/env/node/git/localGitProvider.ts +++ b/src/env/node/git/localGitProvider.ts @@ -2955,38 +2955,38 @@ export class LocalGitProvider implements GitProvider, Disposable { @log() async getDiff( repoPath: string, - ref1: string, - ref2?: string, + to: string, + from?: string, options?: { context?: number }, ): Promise { const scope = getLogScope(); const params = [`-U${options?.context ?? 3}`]; - if (ref1 === uncommitted) { - if (ref2 != null) { - params.push(ref2); + if (to === uncommitted) { + if (from != null) { + params.push(from); } else { // Get only unstaged changes - ref2 = 'HEAD'; + from = 'HEAD'; } - } else if (ref1 === uncommittedStaged) { + } else if (to === uncommittedStaged) { params.push('--staged'); - if (ref2 != null) { - params.push(ref2); + if (from != null) { + params.push(from); } else { // Get only staged changes - ref2 = 'HEAD'; + from = 'HEAD'; } - } else if (ref2 == null) { - if (ref1 === '' || ref1.toUpperCase() === 'HEAD') { - ref2 = 'HEAD'; - params.push(ref2); + } else if (from == null) { + if (to === '' || to.toUpperCase() === 'HEAD') { + from = 'HEAD'; + params.push(from); } else { - ref2 = ref1; - params.push(`${ref1}^`, ref2); + from = `${to}^`; + params.push(from, to); } } else { - params.push(ref1, ref2); + params.push(from, to); } let data; @@ -2998,7 +2998,7 @@ export class LocalGitProvider implements GitProvider, Disposable { return undefined; } - const diff: GitDiff = { baseSha: ref2, contents: data }; + const diff: GitDiff = { contents: data, from: from, to: to }; return diff; } diff --git a/src/git/actions/commit.ts b/src/git/actions/commit.ts index c87545af76519..600f9be778b1f 100644 --- a/src/git/actions/commit.ts +++ b/src/git/actions/commit.ts @@ -22,6 +22,9 @@ import type { GitFile } from '../models/file'; import type { GitRevisionReference } from '../models/reference'; import { getReferenceFromRevision, isUncommitted, isUncommittedStaged } from '../models/reference'; +type Ref = { repoPath: string; ref: string }; +type RefRange = { repoPath: string; rhs: string; lhs: string }; + export async function applyChanges(file: string | GitFile, rev1: GitRevisionReference, rev2?: GitRevisionReference) { let create = false; let ref1 = rev1.ref; @@ -58,11 +61,11 @@ export async function applyChanges(file: string | GitFile, rev1: GitRevisionRefe } } -export async function copyIdToClipboard(ref: { repoPath: string; ref: string } | GitCommit) { +export async function copyIdToClipboard(ref: Ref | GitCommit) { await env.clipboard.writeText(ref.ref); } -export async function copyMessageToClipboard(ref: { repoPath: string; ref: string } | GitCommit): Promise { +export async function copyMessageToClipboard(ref: Ref | GitCommit): Promise { let commit; if (isCommit(ref)) { commit = ref; @@ -81,16 +84,16 @@ export async function copyMessageToClipboard(ref: { repoPath: string; ref: strin export async function openAllChanges(commit: GitCommit, options?: TextDocumentShowOptions): Promise; export async function openAllChanges( files: GitFile[], - refs: { repoPath: string; ref1: string; ref2: string }, + refs: RefRange, options?: TextDocumentShowOptions, ): Promise; export async function openAllChanges( commitOrFiles: GitCommit | GitFile[], - refsOrOptions: { repoPath: string; ref1: string; ref2: string } | TextDocumentShowOptions | undefined, + refsOrOptions: RefRange | TextDocumentShowOptions | undefined, options?: TextDocumentShowOptions, ) { let files; - let refs; + let refs: RefRange | undefined; if (isCommit(commitOrFiles)) { if (commitOrFiles.files == null) { await commitOrFiles.ensureFullDetails(); @@ -99,15 +102,15 @@ export async function openAllChanges( files = commitOrFiles.files ?? []; refs = { repoPath: commitOrFiles.repoPath, + rhs: commitOrFiles.sha, // Don't need to worry about verifying the previous sha, as the DiffWith command will - ref1: commitOrFiles.unresolvedPreviousSha, - ref2: commitOrFiles.sha, + lhs: commitOrFiles.unresolvedPreviousSha, }; options = refsOrOptions as TextDocumentShowOptions | undefined; } else { files = commitOrFiles; - refs = refsOrOptions as { repoPath: string; ref1: string; ref2: string }; + refs = refsOrOptions as RefRange; } if (files.length > 10) { @@ -127,14 +130,8 @@ export async function openAllChanges( } export async function openAllChangesWithDiffTool(commit: GitCommit): Promise; -export async function openAllChangesWithDiffTool( - files: GitFile[], - ref: { repoPath: string; ref: string }, -): Promise; -export async function openAllChangesWithDiffTool( - commitOrFiles: GitCommit | GitFile[], - ref?: { repoPath: string; ref: string }, -) { +export async function openAllChangesWithDiffTool(files: GitFile[], ref: Ref): Promise; +export async function openAllChangesWithDiffTool(commitOrFiles: GitCommit | GitFile[], ref?: Ref) { let files; if (isCommit(commitOrFiles)) { if (commitOrFiles.files == null) { @@ -167,12 +164,12 @@ export async function openAllChangesWithDiffTool( export async function openAllChangesWithWorking(commit: GitCommit, options?: TextDocumentShowOptions): Promise; export async function openAllChangesWithWorking( files: GitFile[], - ref: { repoPath: string; ref: string }, + ref: Ref, options?: TextDocumentShowOptions, ): Promise; export async function openAllChangesWithWorking( commitOrFiles: GitCommit | GitFile[], - refOrOptions: { repoPath: string; ref: string } | TextDocumentShowOptions | undefined, + refOrOptions: Ref | TextDocumentShowOptions | undefined, options?: TextDocumentShowOptions, ) { let files; @@ -191,7 +188,7 @@ export async function openAllChangesWithWorking( options = refOrOptions as TextDocumentShowOptions | undefined; } else { files = commitOrFiles; - ref = refOrOptions as { repoPath: string; ref: string }; + ref = refOrOptions as Ref; } if (files.length > 10) { @@ -217,17 +214,17 @@ export async function openChanges( ): Promise; export async function openChanges( file: GitFile, - refs: { repoPath: string; ref1: string; ref2: string }, + refs: RefRange, options?: TextDocumentShowOptions & { lhsTitle?: string; rhsTitle?: string }, ): Promise; export async function openChanges( file: GitFile, - commitOrRefs: GitCommit | { repoPath: string; ref1: string; ref2: string }, + commitOrRefs: GitCommit | RefRange, options?: TextDocumentShowOptions & { lhsTitle?: string; rhsTitle?: string }, ): Promise; export async function openChanges( file: string | GitFile, - commitOrRefs: GitCommit | { repoPath: string; ref1: string; ref2: string }, + commitOrRefs: GitCommit | RefRange, options?: TextDocumentShowOptions & { lhsTitle?: string; rhsTitle?: string }, ) { const isArgCommit = isCommit(commitOrRefs); @@ -253,38 +250,30 @@ export async function openChanges( return; } - const refs = isArgCommit + const refs: RefRange = isArgCommit ? { repoPath: commitOrRefs.repoPath, + rhs: commitOrRefs.sha, // Don't need to worry about verifying the previous sha, as the DiffWith command will - ref1: commitOrRefs.unresolvedPreviousSha, - ref2: commitOrRefs.sha, + lhs: commitOrRefs.unresolvedPreviousSha, } : commitOrRefs; const rhsUri = GitUri.fromFile(file, refs.repoPath); const lhsUri = - file.status === 'R' || file.status === 'C' ? GitUri.fromFile(file, refs.repoPath, refs.ref1, true) : rhsUri; + file.status === 'R' || file.status === 'C' ? GitUri.fromFile(file, refs.repoPath, refs.lhs, true) : rhsUri; void (await executeCommand(Commands.DiffWith, { repoPath: refs.repoPath, - lhs: { uri: lhsUri, sha: refs.ref1, title: options?.lhsTitle }, - rhs: { uri: rhsUri, sha: refs.ref2, title: options?.rhsTitle }, + lhs: { uri: lhsUri, sha: refs.lhs, title: options?.lhsTitle }, + rhs: { uri: rhsUri, sha: refs.rhs, title: options?.rhsTitle }, showOptions: options, })); } export function openChangesWithDiffTool(file: string | GitFile, commit: GitCommit, tool?: string): Promise; -export function openChangesWithDiffTool( - file: GitFile, - ref: { repoPath: string; ref: string }, - tool?: string, -): Promise; -export async function openChangesWithDiffTool( - file: string | GitFile, - commitOrRef: GitCommit | { repoPath: string; ref: string }, - tool?: string, -) { +export function openChangesWithDiffTool(file: GitFile, ref: Ref, tool?: string): Promise; +export async function openChangesWithDiffTool(file: string | GitFile, commitOrRef: GitCommit | Ref, tool?: string) { if (typeof file === 'string') { if (!isCommit(commitOrRef)) throw new Error('Invalid arguments'); @@ -313,12 +302,12 @@ export async function openChangesWithWorking( ): Promise; export async function openChangesWithWorking( file: GitFile, - ref: { repoPath: string; ref: string }, + ref: Ref, options?: TextDocumentShowOptions & { lhsTitle?: string }, ): Promise; export async function openChangesWithWorking( file: string | GitFile, - commitOrRef: GitCommit | { repoPath: string; ref: string }, + commitOrRef: GitCommit | Ref, options?: TextDocumentShowOptions & { lhsTitle?: string }, ) { if (typeof file === 'string') { @@ -360,15 +349,11 @@ export async function openDirectoryCompare( return Container.instance.git.openDirectoryCompare(repoPath, ref, ref2, tool); } -export async function openDirectoryCompareWithPrevious( - ref: { repoPath: string; ref: string } | GitCommit, -): Promise { +export async function openDirectoryCompareWithPrevious(ref: Ref | GitCommit): Promise { return openDirectoryCompare(ref.repoPath, ref.ref, `${ref.ref}^`); } -export async function openDirectoryCompareWithWorking( - ref: { repoPath: string; ref: string } | GitCommit, -): Promise { +export async function openDirectoryCompareWithWorking(ref: Ref | GitCommit): Promise { return openDirectoryCompare(ref.repoPath, ref.ref, undefined); } diff --git a/src/git/gitProvider.ts b/src/git/gitProvider.ts index 8a428a829a22b..3bae8ef8f9037 100644 --- a/src/git/gitProvider.ts +++ b/src/git/gitProvider.ts @@ -285,8 +285,8 @@ export interface GitProvider extends Disposable { getDefaultBranchName(repoPath: string | undefined, remote?: string): Promise; getDiff?( repoPath: string | Uri, - ref1: string, - ref2?: string, + to: string, + from?: string, options?: { context?: number }, ): Promise; getDiffFiles?(repoPath: string | Uri, contents: string): Promise; diff --git a/src/git/gitProviderService.ts b/src/git/gitProviderService.ts index e7d77d1119fb3..f065cba3e95a0 100644 --- a/src/git/gitProviderService.ts +++ b/src/git/gitProviderService.ts @@ -1834,12 +1834,12 @@ export class GitProviderService implements Disposable { @log() async getDiff( repoPath: string | Uri, - ref1: string, - ref2?: string, + to: string, + from?: string, options?: { context?: number }, ): Promise { const { provider, path } = this.getProvider(repoPath); - return provider.getDiff?.(path, ref1, ref2, options); + return provider.getDiff?.(path, to, from, options); } @log({ args: { 1: false } }) diff --git a/src/git/models/diff.ts b/src/git/models/diff.ts index f2c6011d6f43c..afe146d4e801e 100644 --- a/src/git/models/diff.ts +++ b/src/git/models/diff.ts @@ -1,8 +1,9 @@ import type { GitFileChange } from './file'; export interface GitDiff { - readonly baseSha: string; readonly contents: string; + readonly from: string; + readonly to: string; } export interface GitDiffHunkLine { diff --git a/src/git/models/patch.ts b/src/git/models/patch.ts index 8fc15b21d554b..ad9319f8ad036 100644 --- a/src/git/models/patch.ts +++ b/src/git/models/patch.ts @@ -4,13 +4,13 @@ import type { GitDiffFiles } from './diff'; import type { Repository } from './repository'; /** - * For a single commit `sha` is the commit SHA and `baseSha` is its parent `^` - * For a commit range `sha` is the tip SHA and `baseSha` is the base SHA - * For a WIP `sha` is the "uncommitted" SHA and `baseSha` is the current HEAD SHA + * For a single commit `to` is the commit SHA and `from` is its parent `^` + * For a commit range `to` is the tip SHA and `from` is the base SHA + * For a WIP `to` is the "uncommitted" SHA and `from` is the current HEAD SHA */ export interface PatchRevisionRange { - baseSha: string; - sha: string; + from: string; + to: string; } export interface GitPatch { diff --git a/src/plus/drafts/draftsService.ts b/src/plus/drafts/draftsService.ts index 3cd14f4c757af..87fc9b81fc15a 100644 --- a/src/plus/drafts/draftsService.ts +++ b/src/plus/drafts/draftsService.ts @@ -212,18 +212,20 @@ export class DraftService implements Disposable { private async getCreateDraftPatchRequestFromChange( change: CreateDraftChange, ): Promise { - const isWIP = isUncommitted(change.revision.sha); + const isWIP = isUncommitted(change.revision.to); const [branchNamesResult, diffResult, firstShaResult, remoteResult, userResult] = await Promise.allSettled([ isWIP ? this.container.git.getBranch(change.repository.uri).then(b => (b != null ? [b.name] : undefined)) - : this.container.git.getCommitBranches(change.repository.uri, change.revision.sha), + : this.container.git + .getCommitBranches(change.repository.uri, change.revision.to) + .then(branches => + branches.length + ? branches + : this.container.git.getCommitBranches(change.repository.uri, change.revision.from), + ), change.contents == null - ? this.container.git.getDiff( - change.repository.path, - isWIP ? change.revision.sha : change.revision.baseSha, - isWIP ? change.revision.baseSha : change.revision.sha, - ) + ? this.container.git.getDiff(change.repository.path, change.revision.to, change.revision.from) : undefined, this.container.git.getFirstCommitSha(change.repository.uri), this.container.git.getBestRemoteWithProvider(change.repository.uri), @@ -263,18 +265,15 @@ export class DraftService implements Disposable { const diff = getSettledValue(diffResult); const contents = change.contents ?? diff?.contents; - if (contents == null) throw new Error(`Unable to diff ${change.revision.baseSha} and ${change.revision.sha}`); + if (contents == null) throw new Error(`Unable to diff ${change.revision.from} and ${change.revision.to}`); const user = getSettledValue(userResult); // We need to get the branch name from the baseSha if the change is a stash. - let branchNames = getSettledValue(branchNamesResult); - if (!isWIP && !branchNames?.length) { - branchNames = await this.container.git.getCommitBranches(change.repository.uri, change.revision.baseSha); - } + const branchNames = getSettledValue(branchNamesResult); const branchName = branchNames?.[0] ?? ''; - let baseSha = change.revision.baseSha; + let baseSha = change.revision.from; if (!isSha(baseSha)) { const commit = await this.container.git.getCommit(change.repository.uri, baseSha); if (commit != null) { diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts index 3da475945fe9e..cc0db2ba048b5 100644 --- a/src/plus/webviews/graph/graphWebview.ts +++ b/src/plus/webviews/graph/graphWebview.ts @@ -2443,7 +2443,7 @@ export class GraphWebviewProvider implements WebviewProvider(Commands.CreateCloudPatch, { - ref1: ref.ref, + to: ref.ref, repoPath: ref.repoPath, }); } diff --git a/src/plus/webviews/patchDetails/patchDetailsWebview.ts b/src/plus/webviews/patchDetails/patchDetailsWebview.ts index 9c1856cbff5bc..a0f09b2d84cc6 100644 --- a/src/plus/webviews/patchDetails/patchDetailsWebview.ts +++ b/src/plus/webviews/patchDetails/patchDetailsWebview.ts @@ -34,6 +34,7 @@ import type { ShowInCommitGraphCommandArgs } from '../graph/protocol'; import type { ApplyPatchParams, Change, + CreateDraft, CreatePatchParams, DidExplainParams, DraftPatchCheckedParams, @@ -67,7 +68,7 @@ import { UpdateCreatePatchRepositoryCheckedStateCommandType, UpdatePreferencesCommandType, } from './protocol'; -import type { CreateDraft, PatchDetailsWebviewShowingArgs } from './registration'; +import type { PatchDetailsWebviewShowingArgs } from './registration'; import type { RepositoryChangeset } from './repositoryChangeset'; import { RepositoryRefChangeset, RepositoryWipChangeset } from './repositoryChangeset'; @@ -289,7 +290,7 @@ export class PatchDetailsWebviewProvider new RepositoryWipChangeset( this.container, repo, - { baseSha: 'HEAD', sha: uncommitted }, + { to: uncommitted, from: 'HEAD' }, this.onRepositoryWipChanged.bind(this), false, true, @@ -427,7 +428,7 @@ export class PatchDetailsWebviewProvider let { revision, repository } = repoChangeset; if (change.type === 'wip' && change.checked === 'staged') { - revision = { ...revision, sha: uncommittedStaged }; + revision = { ...revision, to: uncommittedStaged }; } createChanges.push({ @@ -676,10 +677,7 @@ export class PatchDetailsWebviewProvider new RepositoryWipChangeset( this.container, r, - { - baseSha: 'HEAD', - sha: uncommitted, - }, + { to: uncommitted, from: 'HEAD' }, this.onRepositoryWipChanged.bind(this), true, true, // TODO revisit @@ -934,17 +932,19 @@ export class PatchDetailsWebviewProvider if (change == null) return [undefined]; if (change.type === 'revision') { - const commit = await this.container.git.getCommit(file.repoPath, change.revision.sha ?? uncommitted); + const commit = await this.container.git.getCommit(file.repoPath, change.revision.to ?? uncommitted); if ( - change.revision.sha === change.revision.baseSha || - change.revision.sha === change.revision.baseSha.substring(0, change.revision.baseSha.length - 1) + change.revision.to === change.revision.from || + (change.revision.from.length === change.revision.to.length + 1 && + change.revision.from.endsWith('^') && + change.revision.from.startsWith(change.revision.to)) ) { return [commit]; } return [commit, change.revision]; } else if (change.type === 'wip') { - return [await this.container.git.getCommit(file.repoPath, change.revision.sha ?? uncommitted)]; + return [await this.container.git.getCommit(file.repoPath, change.revision.to ?? uncommitted)]; } return [undefined]; @@ -1010,7 +1010,7 @@ export class PatchDetailsWebviewProvider void openChanges( file, revision != null - ? { repoPath: commit.repoPath, ref1: revision.sha ?? uncommitted, ref2: revision.baseSha } + ? { repoPath: commit.repoPath, rhs: revision.to ?? uncommitted, lhs: revision.from } : commit, { preserveFocus: true, @@ -1028,15 +1028,11 @@ export class PatchDetailsWebviewProvider const [commit, file, revision] = result; - void openChangesWithWorking( - file, - revision != null ? { repoPath: commit.repoPath, ref: revision.baseSha } : commit, - { - preserveFocus: true, - preview: true, - ...params.showOptions, - lhsTitle: this.mode === 'view' ? `${basename(file.path)} (Patch)` : undefined, - }, - ); + void openChangesWithWorking(file, revision != null ? { repoPath: commit.repoPath, ref: revision.to } : commit, { + preserveFocus: true, + preview: true, + ...params.showOptions, + lhsTitle: this.mode === 'view' ? `${basename(file.path)} (Patch)` : undefined, + }); } } diff --git a/src/plus/webviews/patchDetails/protocol.ts b/src/plus/webviews/patchDetails/protocol.ts index ffc43d46fadaa..8af139561e8ee 100644 --- a/src/plus/webviews/patchDetails/protocol.ts +++ b/src/plus/webviews/patchDetails/protocol.ts @@ -3,7 +3,8 @@ import type { Config } from '../../../config'; import type { WebviewIds, WebviewViewIds } from '../../../constants'; import type { GitFileChangeShape } from '../../../git/models/file'; import type { PatchRevisionRange } from '../../../git/models/patch'; -import type { DraftPatch, DraftPatchFileChange } from '../../../gk/models/drafts'; +import type { Repository } from '../../../git/models/repository'; +import type { Draft, DraftPatch, DraftPatchFileChange, LocalDraft } from '../../../gk/models/drafts'; import type { GkRepositoryId } from '../../../gk/models/repositoryIdentities'; import type { DateTimeFormat } from '../../../system/date'; import type { Serialized } from '../../../system/serialize'; @@ -19,6 +20,23 @@ export type PatchDetails = Serialized< } >; +interface CreateDraftFromChanges { + title?: string; + description?: string; + changes: Change[]; + repositories?: never; +} + +interface CreateDraftFromRepositories { + title?: string; + description?: string; + changes?: never; + repositories: Repository[] | undefined; +} + +export type CreateDraft = CreateDraftFromChanges | CreateDraftFromRepositories; +export type ViewDraft = LocalDraft | Draft; + interface LocalDraftDetails { draftType: 'local'; diff --git a/src/plus/webviews/patchDetails/registration.ts b/src/plus/webviews/patchDetails/registration.ts index a7c0397b89f6a..9e5d466ce7c11 100644 --- a/src/plus/webviews/patchDetails/registration.ts +++ b/src/plus/webviews/patchDetails/registration.ts @@ -1,30 +1,11 @@ import { ViewColumn } from 'vscode'; import { Commands } from '../../../constants'; -import type { DraftSelectedEvent } from '../../../eventBus'; -import type { Repository } from '../../../git/models/repository'; import { executeCommand } from '../../../system/command'; import { configuration } from '../../../system/configuration'; import { setContext } from '../../../system/context'; import type { Serialized } from '../../../system/serialize'; import type { WebviewPanelShowCommandArgs, WebviewsController } from '../../../webviews/webviewsController'; -import type { Change, State } from './protocol'; - -interface CreateDraftFromChanges { - title?: string; - description?: string; - changes: Change[]; - repositories?: never; -} - -interface CreateDraftFromRepositories { - title?: string; - description?: string; - changes?: never; - repositories: Repository[] | undefined; -} - -export type CreateDraft = CreateDraftFromChanges | CreateDraftFromRepositories; -export type ViewDraft = DraftSelectedEvent['data']['draft']; +import type { CreateDraft, State, ViewDraft } from './protocol'; export type ShowCreateDraft = { mode: 'create'; diff --git a/src/views/viewCommands.ts b/src/views/viewCommands.ts index 5cd3818827372..2eaaa9a5f926e 100644 --- a/src/views/viewCommands.ts +++ b/src/views/viewCommands.ts @@ -1067,8 +1067,8 @@ export class ViewCommands { diff, { repoPath: node.repoPath, - ref1: node.ref1, - ref2: node.ref2, + lhs: node.ref1, + rhs: node.ref2, }, options, ); diff --git a/src/webviews/commitDetails/commitDetailsWebview.ts b/src/webviews/commitDetails/commitDetailsWebview.ts index b46de1b7ee2c3..69d31ea602fc3 100644 --- a/src/webviews/commitDetails/commitDetailsWebview.ts +++ b/src/webviews/commitDetails/commitDetailsWebview.ts @@ -504,10 +504,7 @@ export class CommitDetailsWebviewProvider uri: e.changes.repository.uri, }, files: e.changes.files, - revision: { - baseSha: 'HEAD', - sha: uncommitted, - }, + revision: { to: uncommitted, from: 'HEAD' }, checked: e.checked, }; From 74c6db49426d8fa9c11837213e4333c68b44ec49 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 13 Nov 2023 00:47:03 -0500 Subject: [PATCH 0210/1012] Removes dead code --- src/commands/patches.ts | 85 ---------------------- src/plus/webviews/patchDetails/protocol.ts | 56 -------------- 2 files changed, 141 deletions(-) diff --git a/src/commands/patches.ts b/src/commands/patches.ts index e34cddbd24690..bf0fe73028515 100644 --- a/src/commands/patches.ts +++ b/src/commands/patches.ts @@ -118,92 +118,7 @@ export class CreateCloudPatchCommand extends Command { return showPatchesView({ mode: 'create', create: { repositories: [repo] } }); } return showPatchesView({ mode: 'create', create: create }); - - // let changes: Change[] | undefined; - // if (args?.repoPath != null) { - // const repo = this.container.git.getRepository(args.repoPath); - // if (repo == null) return; - - // const diff = await this.container.git.getDiff(repo.uri, args.ref1 ?? 'HEAD', args.ref2); - // if (diff == null) return; - - // const result = await this.container.git.getDiffFiles(args.repoPath, diff.contents); - // if (result?.files == null) return; - - // const branch = await repo.getBranch(); - - // changes = [ - // { - // type: 'commit', - // repository: { - // name: repo.name, - // path: repo.path, - // uri: repo.uri.toString(true), - // }, - // files: result.files, - // range: { - // baseSha: args.ref2 ?? `${args.ref1 ?? 'HEAD'}^`, - // branchName: branch?.name ?? 'HEAD', - // sha: args.ref1 ?? 'HEAD', - // }, - // }, - // ]; - // } - - // let repo; - // if (args?.repoPath == null) { - // repo = await getRepositoryOrShowPicker('Create Cloud Patch'); - // } else { - // repo = this.container.git.getRepository(args.repoPath); - // } - // if (repo == null) return; - - // const diff = await this.container.git.getDiff(repo.uri, args?.ref1 ?? 'HEAD', args?.ref2); - // if (diff == null) return; - - // const d = await workspace.openTextDocument({ content: diff.contents, language: 'diff' }); - // await window.showTextDocument(d); - - // // ask the user for a title - - // const title = await window.showInputBox({ - // title: 'Create Cloud Patch', - // prompt: 'Enter a title for the patch', - // validateInput: value => (value == null || value.length === 0 ? 'A title is required' : undefined), - // }); - // if (title == null) return; - - // // ask the user for an optional description - // const description = await window.showInputBox({ - // title: 'Create Cloud Patch', - // prompt: 'Enter an optional description for the patch', - // }); - - // const patch = await this.container.drafts.createDraft( - // 'patch', - // title, - // { - // contents: diff.contents, - // baseSha: diff.baseSha, - // repository: repo, - // }, - // { description: description }, - // ); - // void this.showPatchNotification(patch); } - - // private async showPatchNotification(patch: Draft | undefined) { - // if (patch == null) return; - - // await env.clipboard.writeText(patch.deepLinkUrl); - - // const copy = { title: 'Copy Link' }; - // const result = await window.showInformationMessage(`Created cloud patch ${patch.id}`, copy); - - // if (result === copy) { - // await env.clipboard.writeText(patch.deepLinkUrl); - // } - // } } @command() diff --git a/src/plus/webviews/patchDetails/protocol.ts b/src/plus/webviews/patchDetails/protocol.ts index 8af139561e8ee..32aeb7cfbd80a 100644 --- a/src/plus/webviews/patchDetails/protocol.ts +++ b/src/plus/webviews/patchDetails/protocol.ts @@ -49,15 +49,6 @@ interface LocalDraftDetails { description?: string; patches?: PatchDetails[]; - - // files?: GitFileChangeShape[]; - // stats?: GitCommitStats; - - // repoPath?: string; - // repoName?: string; - - // baseRef?: string; - // commit?: string; } interface CloudDraftDetails { @@ -77,33 +68,10 @@ interface CloudDraftDetails { description?: string; patches?: PatchDetails[]; - - // commit?: string; - - // files?: GitFileChangeShape[]; - // stats?: GitCommitStats; - - // repoPath: string; - // repoName?: string; - // baseRef?: string; } export type DraftDetails = LocalDraftDetails | CloudDraftDetails; -// export interface RangeRef { -// baseSha: string; -// sha: string | undefined; -// branchName: string; -// // shortSha: string; -// // summary: string; -// // message: string; -// // author: GitCommitIdentityShape & { avatar: string | undefined }; -// // committer: GitCommitIdentityShape & { avatar: string | undefined }; -// // parents: string[]; -// // repoPath: string; -// // stashNumber?: string; -// } - export interface Preferences { avatars: boolean; dateFormat: DateTimeFormat | string; @@ -139,30 +107,6 @@ export interface RevisionChange { export type Change = WipChange | RevisionChange; -// export interface RepoCommitChange { -// type: 'commit'; - -// repoName: string; -// repoUri: string; -// change: Change; - -// checked: boolean; -// expanded: boolean; -// } - -// export interface RepoWipChange { -// type: 'wip'; - -// repoName: string; -// repoUri: string; -// change: Change | undefined; - -// checked: boolean | 'staged'; -// expanded: boolean; -// } - -// export type RepoChangeSet = RepoCommitChange | RepoWipChange; - export interface State { webviewId: WebviewIds | WebviewViewIds; timestamp: number; From 7efde55afe02e093290f112a15d5c77637e6d6fe Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Mon, 13 Nov 2023 11:12:48 -0500 Subject: [PATCH 0211/1012] Fixes menu colors --- .../apps/plus/patchDetails/patchDetails.scss | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/webviews/apps/plus/patchDetails/patchDetails.scss b/src/webviews/apps/plus/patchDetails/patchDetails.scss index 27a07ae0bbf2e..c40778544840a 100644 --- a/src/webviews/apps/plus/patchDetails/patchDetails.scss +++ b/src/webviews/apps/plus/patchDetails/patchDetails.scss @@ -1,5 +1,27 @@ @use '../../shared/styles/details-base'; +body { + --gk-menu-border-color: var(--vscode-menu-border); + --gk-menu-background-color: var(--vscode-menu-background); + --gk-menu-item-background-color-hover: var(--vscode-menu-selectionBackground); + --gk-menu-item-background-color-active: var(--vscode-menu-background); + --gk-focus-border-color: var(--focus-color); + --gk-tooltip-padding: 0.4rem 0.8rem; + --gk-divider-color: var(--color-background--level-05); +} + +gk-menu { + color: var(--vscode-menu-foreground); +} + +gk-menu-item { + color: var(--vscode-menu-foreground); + + &:hover { + color: var(--vscode-menu-selectionForeground); + } +} + .message-block__text strong:not(:only-child) { display: inline-block; margin-bottom: 0.52rem; From e8668ef8679b54d2e2b0e3afe9274afd7ddb80d3 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 13 Nov 2023 11:43:04 -0500 Subject: [PATCH 0212/1012] Adds cloud patches to home & welcome --- src/webviews/apps/home/home.html | 37 +++++++++++----------- src/webviews/apps/home/home.scss | 25 +++++++++++++++ src/webviews/apps/welcome/welcome.html | 44 ++++++++++++-------------- 3 files changed, 65 insertions(+), 41 deletions(-) diff --git a/src/webviews/apps/home/home.html b/src/webviews/apps/home/home.html index 68e9d32eb14a3..90d40f25dff92 100644 --- a/src/webviews/apps/home/home.html +++ b/src/webviews/apps/home/home.html @@ -169,7 +169,7 @@

Popular views

class="nav-list__access" title="Requires a trial or paid plan to use this on privately hosted repos" aria-label="Requires a trial or paid plan to use this on privately hosted repos" - >✨Preview ✨ Popular views >✨ + Cloud PatchesNew!Preview ☁️ Popular views >Search & Compare - Popular views class="nav-list__access" title="Requires a GitKraken account and access is based on your plan, e.g. Free, Pro, etc" aria-label="Requires a GitKraken account and access is based on your plan, e.g. Free, Pro, etc" - >☁️Preview ☁️ Side Bar Views aria-label="Show Branches view" >Branches + Cloud Patches ☁️ Side Bar Views aria-label="Show Search & Compare view" >Search & Compare - Popular views aria-label="Show Visual File History view" >Visual File History ✨ - Stashes - Search & Compare Popular views aria-label="Show GitKraken Workspaces view" >GitKraken Workspaces ☁️ + Stashes + Search & Compare Date: Mon, 13 Nov 2023 12:17:10 -0500 Subject: [PATCH 0213/1012] Adds file icon to files in patches file list --- src/webviews/apps/plus/patchDetails/components/gl-tree-base.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webviews/apps/plus/patchDetails/components/gl-tree-base.ts b/src/webviews/apps/plus/patchDetails/components/gl-tree-base.ts index 92b14c52da9af..9882692b16912 100644 --- a/src/webviews/apps/plus/patchDetails/components/gl-tree-base.ts +++ b/src/webviews/apps/plus/patchDetails/components/gl-tree-base.ts @@ -203,7 +203,7 @@ export class GlTreeBase extends GlElement Date: Mon, 13 Nov 2023 13:12:37 -0500 Subject: [PATCH 0214/1012] Hides patch actions for now --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index ae6f34e7f2eec..9f208a435fd18 100644 --- a/package.json +++ b/package.json @@ -2707,7 +2707,7 @@ "Prefer showing Cloud Patches in the editor area", "Prefer showing Cloud Patches in a view" ], - "markdownDescription": "Specifies the preferred layout of for _Cloud Patches_", + "markdownDescription": "Specifies the preferred layout of for _Cloud Patches_ (experimental)", "scope": "window", "order": 11 } @@ -8623,7 +8623,7 @@ }, { "command": "gitlens.openPatch", - "when": "gitlens:enabled" + "when": "false && gitlens:enabled" }, { "command": "gitlens.timeline.refresh", @@ -10881,7 +10881,7 @@ "editor/title": [ { "command": "gitlens.openPatch", - "when": "editorLangId == diff" + "when": "false && editorLangId == diff" }, { "command": "gitlens.diffWithWorking", From 334865b3f14c3f474232285f8df36fde9469336e Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 13 Nov 2023 14:05:45 -0500 Subject: [PATCH 0215/1012] Adds vscode style border radius on input --- src/webviews/apps/shared/styles/details-base.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/webviews/apps/shared/styles/details-base.scss b/src/webviews/apps/shared/styles/details-base.scss index f3afb8b7a1631..ea6cde7b28584 100644 --- a/src/webviews/apps/shared/styles/details-base.scss +++ b/src/webviews/apps/shared/styles/details-base.scss @@ -279,6 +279,7 @@ ul { border: 1px solid var(--vscode-input-border); background: var(--vscode-input-background); padding: 0.5rem; + border-radius: 2px; &__text { margin: 0; From 4131f384061936a4e7227f8a2b2677e6f87b742f Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 13 Nov 2023 14:07:04 -0500 Subject: [PATCH 0216/1012] Adds feedback to link copying --- .../apps/plus/patchDetails/components/gl-draft-details.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts b/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts index 57c88aebb0d35..b54a711861e28 100644 --- a/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts +++ b/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts @@ -86,6 +86,9 @@ export class GlDraftDetails extends GlTreeBase { @state() validityMessage?: string; + @state() + private _copiedLink: boolean = false; + get canSubmit() { return this.selectedPatches.length > 0; // return this.state.draft?.repoPath != null && this.state.draft?.baseRef != null; @@ -423,7 +426,7 @@ export class GlDraftDetails extends GlTreeBase { this.state?.draft?.draftType === 'cloud', () => html` - + Copy Link `, @@ -625,6 +628,8 @@ export class GlDraftDetails extends GlTreeBase { onCopyCloudLink() { this.fireEvent('gl-patch-details-copy-cloud-link', { draft: this.state.draft! }); + this._copiedLink = true; + setTimeout(() => (this._copiedLink = false), 1000); } onShareLocalPatch() { From 62a21ad0f6432ba02e2748de0ea47acee37ea51b Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 13 Nov 2023 14:21:21 -0500 Subject: [PATCH 0217/1012] Splits title from message --- src/commands/patches.ts | 2 +- .../components/gl-draft-details.ts | 43 ++++--------------- .../apps/plus/patchDetails/patchDetails.scss | 6 +++ 3 files changed, 16 insertions(+), 35 deletions(-) diff --git a/src/commands/patches.ts b/src/commands/patches.ts index bf0fe73028515..a0607d688837f 100644 --- a/src/commands/patches.ts +++ b/src/commands/patches.ts @@ -219,7 +219,7 @@ async function createDraft( create.title = message; } else { create.title = message.substring(0, index); - create.description = message.substring(index + 1); + create.description = message.substring(index + 1).trim(); } if (args.from == null) { diff --git a/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts b/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts index b54a711861e28..c8a8c5101c7f9 100644 --- a/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts +++ b/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts @@ -144,26 +144,18 @@ export class GlDraftDetails extends GlTreeBase { } private renderPatchMessage() { - if (this.state?.draft?.title == null) { - return undefined; - } + if (this.state?.draft?.title == null) return undefined; + let description = this.state.draft.draftType === 'cloud' ? this.state.draft.description : undefined; + if (description == null) return undefined; + + description = description.trim(); - const title = this.state.draft.title; - const description = this.state.draft.draftType === 'cloud' ? this.state.draft.description : undefined; return html`
- ${when( - description == null, - () => - html`

- ${unsafeHTML(title)} -

`, - () => - html`

- ${unsafeHTML(title)}
${unsafeHTML(description)} -

`, - )} +

+ ${unsafeHTML(description)} +

`; @@ -443,24 +435,7 @@ export class GlDraftDetails extends GlTreeBase { )}
- ${when( - this.state.draft?.draftType === 'cloud' && this.state.draft?.author.name != null, - () => html` -
    -
  • - -
    • -
- `, - )} +

${this.state.draft?.title}

${this.renderPatchMessage()} diff --git a/src/webviews/apps/plus/patchDetails/patchDetails.scss b/src/webviews/apps/plus/patchDetails/patchDetails.scss index c40778544840a..2ec33c4f6fbbd 100644 --- a/src/webviews/apps/plus/patchDetails/patchDetails.scss +++ b/src/webviews/apps/plus/patchDetails/patchDetails.scss @@ -22,6 +22,12 @@ gk-menu-item { } } +.title { + font-size: 1.8rem; + font-weight: 600; + margin: 0; +} + .message-block__text strong:not(:only-child) { display: inline-block; margin-bottom: 0.52rem; From 0f6ebcef97fce4d6b25277fb50927971306c5059 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 13 Nov 2023 14:25:41 -0500 Subject: [PATCH 0218/1012] Enables cloud patches by default --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9f208a435fd18..b4c8372f26336 100644 --- a/package.json +++ b/package.json @@ -2691,7 +2691,7 @@ "properties": { "gitlens.cloudPatches.enabled": { "type": "boolean", - "default": false, + "default": true, "markdownDescription": "Specifies whether to enable the preview of _Cloud Patches_, which allow you to easily and securely share code with your teammates or other developers", "scope": "window", "order": 10 From 9e4dbb3f67db7e38aa858d36a284314767773346 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Mon, 13 Nov 2023 15:28:54 -0500 Subject: [PATCH 0219/1012] Fixes patches panes --- .../components/gl-draft-details.ts | 110 +++++++++--------- .../components/gl-patch-create.ts | 11 +- .../apps/plus/patchDetails/patchDetails.scss | 27 ++++- 3 files changed, 78 insertions(+), 70 deletions(-) diff --git a/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts b/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts index c8a8c5101c7f9..dbb9d0748e5d2 100644 --- a/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts +++ b/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts @@ -151,12 +151,10 @@ export class GlDraftDetails extends GlTreeBase { description = description.trim(); return html` -
-
-

- ${unsafeHTML(description)} -

-
+
+

+ ${unsafeHTML(description)} +

`; } @@ -335,29 +333,26 @@ export class GlDraftDetails extends GlTreeBase { //
${getActions()}
//
return html` - - Apply -
-

- - Apply Patch - - - - Apply to a Branch - - - - -

-
- +
+

+ + Apply Patch + + + + Apply to a Branch + + + + +

+
`; } @@ -409,36 +404,39 @@ export class GlDraftDetails extends GlTreeBase { return html`
-
-
-
-
-
- ${when( - this.state?.draft?.draftType === 'cloud', - () => html` - - - Copy Link - `, - () => html` - Share - `, - )} -
+
+
+
+
+ ${when( + this.state?.draft?.draftType === 'cloud', + () => html` + + + Copy Link + `, + () => html` + Share + `, + )}
-

${this.state.draft?.title}

+ ${when( + this.state.draft?.title != null, + () => html` +

${this.state.draft?.title}

+ ${this.renderPatchMessage()} + `, + )}
- ${this.renderPatchMessage()}
${this.renderChangedFiles()}
diff --git a/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts b/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts index 470c7b432dcb0..f094cb1fc2c6e 100644 --- a/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts +++ b/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts @@ -108,7 +108,7 @@ export class GlPatchCreate extends GlTreeBase { renderForm() { return html` -
+
${when( this.state?.create?.creationError != null, () => @@ -150,19 +150,14 @@ export class GlPatchCreate extends GlTreeBase { return html`
${this.renderChangedFiles()}
-
- Create PatchPREVIEW ☁️${this.renderForm()} -
+
${this.renderForm()}
`; } private renderChangedFiles() { return html` - + Changes to Include ${this.renderLayoutAction(this.fileLayout)} diff --git a/src/webviews/apps/plus/patchDetails/patchDetails.scss b/src/webviews/apps/plus/patchDetails/patchDetails.scss index 2ec33c4f6fbbd..625bcc1512733 100644 --- a/src/webviews/apps/plus/patchDetails/patchDetails.scss +++ b/src/webviews/apps/plus/patchDetails/patchDetails.scss @@ -23,9 +23,9 @@ gk-menu-item { } .title { - font-size: 1.8rem; + font-size: 1.6rem; font-weight: 600; - margin: 0; + margin: 0.2rem 0 0.8rem; } .message-block__text strong:not(:only-child) { @@ -76,10 +76,16 @@ gk-menu-item { } } -textarea.message-input__control { - resize: vertical; - min-height: 4rem; - max-height: 40rem; +.section--action { + border-top: 1px solid var(--vscode-sideBarSectionHeader-border); + padding: { + top: 1.5rem; + bottom: 1.5rem; + } + + > :first-child { + padding-top: 0; + } } .message-input { @@ -112,6 +118,12 @@ textarea.message-input__control { } } +textarea.message-input__control { + resize: vertical; + min-height: 4rem; + max-height: 40rem; +} + .h { &-spacing { margin-bottom: 1.5rem; @@ -120,6 +132,9 @@ textarea.message-input__control { margin: 0.8rem 0 0.4rem; opacity: 0.8; } + &-no-border { + --vscode-sideBarSectionHeader-border: transparent; + } } .alert { From 5ca04749b294855763eef7acc1244ec631619209 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 13 Nov 2023 16:37:13 -0500 Subject: [PATCH 0220/1012] Moves patch view into its own sidebar --- package.json | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index b4c8372f26336..fda78d8225baa 100644 --- a/package.json +++ b/package.json @@ -6824,7 +6824,7 @@ }, { "command": "gitlens.views.patchDetails.close", - "title": "Close Patch View", + "title": "Close Patch", "category": "GitLens", "icon": "$(close)" }, @@ -15319,7 +15319,7 @@ }, { "id": "gitlensPatch", - "title": "Patch", + "title": "GitLens Patch", "icon": "$(gitlens-cloud-patch)" } ], @@ -15411,22 +15411,12 @@ { "type": "webview", "id": "gitlens.views.home", - "-when": "!gitlens:views:patchDetails:mode || !config.gitlens.cloudPatches.enabled", "name": "Home", "contextualTitle": "GL", "icon": "$(gitlens-gitlens)", "initialSize": 6, "visibility": "visible" }, - { - "type": "webview", - "id": "gitlens.views.patchDetails", - "name": "Patch", - "when": "!gitlens:untrusted && config.gitlens.cloudPatches.enabled && gitlens:views:patchDetails:mode", - "contextualTitle": "GL", - "icon": "$(gitlens-cloud-patch)", - "initialSize": 24 - }, { "id": "gitlens.views.drafts", "name": "Cloud Patches", @@ -15526,6 +15516,17 @@ "visibility": "visible" } ], + "gitlensPatch": [ + { + "type": "webview", + "id": "gitlens.views.patchDetails", + "name": "Patch", + "when": "!gitlens:untrusted && config.gitlens.cloudPatches.enabled && gitlens:views:patchDetails:mode", + "contextualTitle": "GitLens", + "icon": "$(gitlens-cloud-patch)", + "initialSize": 24 + } + ], "scm": [ { "id": "gitlens.views.repositories", From 422bafda355fa17fe3f3820827ab4abdaaa29eaf Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 13 Nov 2023 16:38:21 -0500 Subject: [PATCH 0221/1012] Updates messaging for Cloud patches security --- src/plus/utils.ts | 48 +++++++++++-------- .../patchDetails/patchDetailsWebview.ts | 14 +++--- .../components/gl-patch-create.ts | 8 +++- .../apps/plus/patchDetails/patchDetails.scss | 2 +- 4 files changed, 42 insertions(+), 30 deletions(-) diff --git a/src/plus/utils.ts b/src/plus/utils.ts index c1e1aa14316af..97fc09f9d815a 100644 --- a/src/plus/utils.ts +++ b/src/plus/utils.ts @@ -112,25 +112,35 @@ export async function ensureAccount(title: string, container: Container): Promis export async function confirmDraftStorage(container: Container): Promise { if (container.storage.get('confirm:draft:storage', false)) return true; - const accept: MessageItem = { title: 'Yes' }; - const decline: MessageItem = { title: 'No', isCloseAffordance: true }; - const moreInfo: MessageItem = { title: 'More Info' }; - const result = await window.showInformationMessage( - `Cloud Patches are securely stored by GitKraken.\n\nDo you want to continue?`, - { modal: true }, - accept, - decline, - moreInfo, - ); - - if (result === accept) { - void container.storage.store('confirm:draft:storage', true); - return true; - } + while (true) { + const accept: MessageItem = { title: 'Continue' }; + const decline: MessageItem = { title: 'Cancel', isCloseAffordance: true }; + const moreInfo: MessageItem = { title: 'Learn More' }; + const security: MessageItem = { title: 'Security' }; + const result = await window.showInformationMessage( + `Cloud Patches are securely stored by GitKraken and can be accessed by anyone with the link and a GitKraken account.`, + { modal: true }, + accept, + moreInfo, + security, + decline, + ); - if (result === moreInfo) { - void env.openExternal(Uri.parse('https://help.gitkraken.com/gitlens/security')); - } + if (result === accept) { + void container.storage.store('confirm:draft:storage', true); + return true; + } - return false; + if (result === security) { + void env.openExternal(Uri.parse('https://help.gitkraken.com/gitlens/security')); + continue; + } + + if (result === moreInfo) { + void env.openExternal(Uri.parse('https://www.gitkraken.com/solutions/cloud-patches')); + continue; + } + + return false; + } } diff --git a/src/plus/webviews/patchDetails/patchDetailsWebview.ts b/src/plus/webviews/patchDetails/patchDetailsWebview.ts index a0f09b2d84cc6..970fb8008def1 100644 --- a/src/plus/webviews/patchDetails/patchDetailsWebview.ts +++ b/src/plus/webviews/patchDetails/patchDetailsWebview.ts @@ -339,13 +339,6 @@ export class PatchDetailsWebviewProvider return; } - if ( - !(await ensureAccount('Cloud Patches require a GitKraken account.', this.container)) || - !(await confirmDraftStorage(this.container)) - ) { - return; - } - const changeset = this._context.draft.changesets?.[0]; if (changeset == null) return; @@ -413,7 +406,12 @@ export class PatchDetailsWebviewProvider } private async createDraft({ title, changesets, description }: CreatePatchParams): Promise { - if (!(await ensureAccount('Cloud patches require a GitKraken account.', this.container))) return; + if ( + !(await ensureAccount('Cloud Patches require a GitKraken account.', this.container)) || + !(await confirmDraftStorage(this.container)) + ) { + return; + } const createChanges: CreateDraftChange[] = []; diff --git a/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts b/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts index f094cb1fc2c6e..65c7a52087fe1 100644 --- a/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts +++ b/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts @@ -132,8 +132,12 @@ export class GlPatchCreate extends GlTreeBase { Create Cloud Patch

- + +

Cloud Patches are securely stored by GitKraken. +

`; } diff --git a/src/webviews/apps/plus/patchDetails/patchDetails.scss b/src/webviews/apps/plus/patchDetails/patchDetails.scss index 625bcc1512733..f1f30c1d99cde 100644 --- a/src/webviews/apps/plus/patchDetails/patchDetails.scss +++ b/src/webviews/apps/plus/patchDetails/patchDetails.scss @@ -130,7 +130,7 @@ textarea.message-input__control { } &-deemphasize { margin: 0.8rem 0 0.4rem; - opacity: 0.8; + opacity: 0.7; } &-no-border { --vscode-sideBarSectionHeader-border: transparent; From 50a31faa052d86f132305c8fd893a48c8c787b1d Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 13 Nov 2023 16:38:40 -0500 Subject: [PATCH 0222/1012] Adds/handles title limit on cloud patches --- src/plus/drafts/draftsService.ts | 5 +++++ .../apps/plus/patchDetails/components/gl-patch-create.ts | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/plus/drafts/draftsService.ts b/src/plus/drafts/draftsService.ts index 87fc9b81fc15a..c7d52de5c7db3 100644 --- a/src/plus/drafts/draftsService.ts +++ b/src/plus/drafts/draftsService.ts @@ -82,6 +82,11 @@ export class DraftService implements Disposable { } satisfies CreateDraftRequest), }); + if (!createDraftRsp.ok) { + const json = (await createDraftRsp.json()) as { error?: { message?: string } } | undefined; + throw new Error(json?.error?.message ?? createDraftRsp.statusText); + } + const createDraft = ((await createDraftRsp.json()) as DraftResult).data; const draftId = createDraft.id; diff --git a/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts b/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts index 65c7a52087fe1..fac85180d82a3 100644 --- a/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts +++ b/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts @@ -118,12 +118,12 @@ export class GlPatchCreate extends GlTreeBase {
`, )}
-
-
From c283474a5f8e188d54ab0f6b856f886dc73439e0 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 13 Nov 2023 16:38:56 -0500 Subject: [PATCH 0223/1012] Updates welcome messaging for cloud patches --- src/webviews/apps/welcome/welcome.html | 89 +++++++++++++------------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/src/webviews/apps/welcome/welcome.html b/src/webviews/apps/welcome/welcome.html index f61daf9140e4b..dbbaeda7a38a1 100644 --- a/src/webviews/apps/welcome/welcome.html +++ b/src/webviews/apps/welcome/welcome.html @@ -249,6 +249,51 @@

Side Bar Views

Features which need a repository are currently unavailable

+

+ Cloud Patches + ☁️ + Preview +

+

+ The + Cloud Patches + preview allows you to easily share changes with other developers by creating a Cloud Patch from your + WIP, commit or stash and sharing the generated link with your teammates. +

+ +

+ Cloud Patches are + securely stored + by GitKraken, and anyone with access to the link and a GitKraken account can view the code for now. + More permissions and controls are coming soon. +

+ +

+ For additional information about Cloud Patches, visit our + help center. +

+

-

- Cloud Patches - ☁️ - Preview -

-

- The - Cloud Patches preview feature - allows you to easily share changes with other developers by creating a Cloud Patch from your WIP, - commit or stash and sharing the generated link with your teammates. -

- -

- Cloud Patches are - securely stored by GitKraken, and anyone with access to the link and a GitKraken account can view the code for now. More - permissions and controls are coming soon. -

- -

- For additional information about Cloud Patches, visit our - help center. -

-

Date: Mon, 13 Nov 2023 16:41:46 -0500 Subject: [PATCH 0224/1012] Updates changelog --- CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e72b56ccc2ba8..4617c498e9c87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,12 +8,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Added -- Adds a preview of [Cloud Patches](https://www.gitkraken.com/solutions/cloud-patches), an all-new ☁️ feature — engage in early collaboration long before the pull request: - +- Adds a preview of [Cloud Patches](https://www.gitkraken.com/solutions/cloud-patches), an all-new ☁️ feature — engage in early collaboration before the pull request: - Share your work with others by creating a Cloud Patch from Working Changes, Commits, Stashes or Comparisons - View Cloud Patches from URLs shared to you and apply them to your working tree or to a new or existing branch - Manage your Cloud Patches from the new _Cloud Patches_ view in the GitLens side bar - - Adds support to open multiple instances of the _Commit Graph_, _Focus_, and _Visual File History_ in the editor area - Adds a _Split Commit Graph_ command to the _Commit Graph_ tab context menu - Adds a `gitlens.graph.allowMultiple` setting to specify whether to allow opening multiple instances of the _Commit Graph_ in the editor area From 5d54debab99ba963eeec6c559b09e0deea68003d Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Mon, 13 Nov 2023 14:47:53 -0700 Subject: [PATCH 0225/1012] Updates CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4617c498e9c87..b8bffcbc7ac4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Share your work with others by creating a Cloud Patch from Working Changes, Commits, Stashes or Comparisons - View Cloud Patches from URLs shared to you and apply them to your working tree or to a new or existing branch - Manage your Cloud Patches from the new _Cloud Patches_ view in the GitLens side bar + - Adds a _Share as Cloud Patch..._ command to the command palette and to the _Share_ submenu in applicable GitLens views + - Adds a `gitlens.cloudPatches.enabled` setting to specificy whether to enable Cloud Patches (defaults to `true`) - Adds support to open multiple instances of the _Commit Graph_, _Focus_, and _Visual File History_ in the editor area - Adds a _Split Commit Graph_ command to the _Commit Graph_ tab context menu - Adds a `gitlens.graph.allowMultiple` setting to specify whether to allow opening multiple instances of the _Commit Graph_ in the editor area From 90fd1e258d24a784dd23e54a2279d31962fa35c0 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Mon, 13 Nov 2023 16:53:59 -0700 Subject: [PATCH 0226/1012] Updates CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8bffcbc7ac4e..0cda75d39b1b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds a stateful authors picker to make it much easier to search for commits by specific authors - Adds a file and folder picker to make it much easier to search for commits containing specific files or in specific folders - Adds ability to sort repositories in the views and quick pick menus — closes [#2836](https://github.com/gitkraken/vscode-gitlens/issues/2836) thanks to [PR #2991](https://github.com/gitkraken/vscode-gitlens/pull/2991) - - Adds a `gitlens.sortRepositoriesBy` setting to specify how repositories are sorted in quick pick menus and viewsby Aidos Kanapyanov ([@aidoskanapyanov](https://github.com/aidoskanapyanov)) + - Adds a `gitlens.sortRepositoriesBy` setting to specify how repositories are sorted in quick pick menus and views by Aidos Kanapyanov ([@aidoskanapyanov](https://github.com/aidoskanapyanov)) - Adds a _[Show|Hide] Merge Commits_ toggle to the Commits\_ view — closes [#1399](https://github.com/gitkraken/vscode-gitlens/issues/1399) thanks to [PR #1540](https://github.com/gitkraken/vscode-gitlens/pull/1540) by Shashank Shastri ([@Shashank-Shastri](https://github.com/Shashank-Shastri)) - Adds a _Filter Commits by Author..._ commands to the _Commits_ view and comparisons context menus to filter commits in the _Commits_ view by specific authors - Adds ability to publish to a remote branch to a specific commit using the _Push to Commit_ command From 5ae55676b8e52de841cfb17b24e7adf3c5d7c7cb Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Mon, 13 Nov 2023 17:22:29 -0700 Subject: [PATCH 0227/1012] Bumps to v14.5.0 --- CHANGELOG.md | 5 ++++- package.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cda75d39b1b0..982aa290b3c16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] +## [14.5.0] - 2023-11-13 + ### Added - Adds a preview of [Cloud Patches](https://www.gitkraken.com/solutions/cloud-patches), an all-new ☁️ feature — engage in early collaboration before the pull request: @@ -5030,7 +5032,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Initial release but still heavily a work in progress. -[unreleased]: https://github.com/gitkraken/vscode-gitlens/compare/v14.4.0...HEAD +[unreleased]: https://github.com/gitkraken/vscode-gitlens/compare/v14.5.0...HEAD +[14.5.0]: https://github.com/gitkraken/vscode-gitlens/compare/v14.4.0...gitkraken:v14.5.0 [14.4.0]: https://github.com/gitkraken/vscode-gitlens/compare/v14.3.0...gitkraken:v14.4.0 [14.3.0]: https://github.com/gitkraken/vscode-gitlens/compare/v14.2.1...gitkraken:v14.3.0 [14.2.1]: https://github.com/gitkraken/vscode-gitlens/compare/v14.2.0...gitkraken:v14.2.1 diff --git a/package.json b/package.json index fda78d8225baa..0f3bcb1f22ede 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "gitlens", "displayName": "GitLens — Git supercharged", "description": "Supercharge Git within VS Code — Visualize code authorship at a glance via Git blame annotations and CodeLens, seamlessly navigate and explore Git repositories, gain valuable insights via rich visualizations and powerful comparison commands, and so much more", - "version": "14.4.0", + "version": "14.5.0", "engines": { "vscode": "^1.81.0" }, From 9c04fc12f851a0be699db75ffbdd17a6b49548ea Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 14 Nov 2023 15:10:44 -0500 Subject: [PATCH 0228/1012] Adds open folder to worktree error notification --- src/commands/git/worktree.ts | 29 +++++++++++++++++--------- src/git/actions/repository.ts | 5 ----- src/git/actions/worktree.ts | 5 ----- src/system/utils.ts | 38 +++++++++++++++++++---------------- src/views/viewCommands.ts | 6 +++--- 5 files changed, 43 insertions(+), 40 deletions(-) diff --git a/src/commands/git/worktree.ts b/src/commands/git/worktree.ts index 24f8f72963ea0..0777352e18fe0 100644 --- a/src/commands/git/worktree.ts +++ b/src/commands/git/worktree.ts @@ -1,9 +1,9 @@ import type { MessageItem } from 'vscode'; -import { QuickInputButtons, Uri, window, workspace } from 'vscode'; +import { env, QuickInputButtons, Uri, window, workspace } from 'vscode'; import type { Config } from '../../config'; import type { Container } from '../../container'; import { PlusFeatures } from '../../features'; -import { convertOpenFlagsToLocation, reveal, revealInFileExplorer } from '../../git/actions/worktree'; +import { convertOpenFlagsToLocation, reveal } from '../../git/actions/worktree'; import { WorktreeCreateError, WorktreeCreateErrorReason, @@ -23,7 +23,7 @@ import { createFlagsQuickPickItem } from '../../quickpicks/items/flags'; import { configuration } from '../../system/configuration'; import { basename, isDescendant } from '../../system/path'; import { pluralize, truncateLeft } from '../../system/string'; -import { openWorkspace } from '../../system/utils'; +import { openWorkspace, revealInFileExplorer } from '../../system/utils'; import type { ViewsWithRepositoryFolders } from '../../views/viewBase'; import type { AsyncStepResultGenerator, @@ -469,12 +469,21 @@ export class WorktreeGitCommand extends QuickCommand { continue; } } else if (WorktreeCreateError.is(ex, WorktreeCreateErrorReason.AlreadyExists)) { - void window.showErrorMessage( - `Unable to create a new worktree in '${GitWorktree.getFriendlyPath( - uri, - )}' because the folder already exists and is not empty.`, - 'OK', - ); + const confirm: MessageItem = { title: 'OK' }; + const openFolder: MessageItem = { title: 'Open Folder' }; + void window + .showErrorMessage( + `Unable to create a new worktree in '${GitWorktree.getFriendlyPath( + uri, + )}' because the folder already exists and is not empty.`, + confirm, + openFolder, + ) + .then(result => { + if (result === openFolder) { + void env.openExternal(uri); + } + }); } else { void showGenericErrorMessage( `Unable to create a new worktree in '${GitWorktree.getFriendlyPath(uri)}.`, @@ -835,7 +844,7 @@ export class WorktreeGitCommand extends QuickCommand { if (worktree == null) break; if (state.flags.includes('--reveal-explorer')) { - void revealInFileExplorer(worktree); + void revealInFileExplorer(worktree.uri); } else { openWorkspace(worktree.uri, { location: convertOpenFlagsToLocation(state.flags) }); } diff --git a/src/git/actions/repository.ts b/src/git/actions/repository.ts index 3eec04ae16650..680b7cbf6659c 100644 --- a/src/git/actions/repository.ts +++ b/src/git/actions/repository.ts @@ -1,6 +1,5 @@ import type { ResetGitCommandArgs } from '../../commands/git/reset'; import { Container } from '../../container'; -import { executeCoreCommand } from '../../system/command'; import type { ViewsWithRepositoryFolders } from '../../views/viewBase'; import { executeGitCommand } from '../actions'; import type { GitBranchReference, GitReference, GitRevisionReference } from '../models/reference'; @@ -83,7 +82,3 @@ export async function reveal( } return node; } - -export async function revealInFileExplorer(repo: Repository) { - void (await executeCoreCommand('revealFileInOS', repo.uri)); -} diff --git a/src/git/actions/worktree.ts b/src/git/actions/worktree.ts index a30ed3ee0f629..febb6caac80c8 100644 --- a/src/git/actions/worktree.ts +++ b/src/git/actions/worktree.ts @@ -2,7 +2,6 @@ import type { Uri } from 'vscode'; import type { WorktreeGitCommandArgs } from '../../commands/git/worktree'; import { Container } from '../../container'; import { ensure } from '../../system/array'; -import { executeCoreCommand } from '../../system/command'; import type { OpenWorkspaceLocation } from '../../system/utils'; import { executeGitCommand } from '../actions'; import type { GitReference } from '../models/reference'; @@ -65,10 +64,6 @@ export async function reveal( return node; } -export async function revealInFileExplorer(worktree: GitWorktree) { - void (await executeCoreCommand('revealFileInOS', worktree.uri)); -} - type OpenFlagsArray = Extract>, { subcommand: 'open' }>['flags']; export function convertLocationToOpenFlags(location: OpenWorkspaceLocation | undefined): OpenFlagsArray | undefined { diff --git a/src/system/utils.ts b/src/system/utils.ts index b24069e286ab3..19ec57a1a2ba3 100644 --- a/src/system/utils.ts +++ b/src/system/utils.ts @@ -58,6 +58,25 @@ export function findOrOpenEditors(uris: Uri[]): void { } } +export function getEditorCommand() { + let editor; + switch (env.appName) { + case 'Visual Studio Code - Insiders': + editor = 'code-insiders --wait --reuse-window'; + break; + case 'Visual Studio Code - Exploration': + editor = 'code-exploration --wait --reuse-window'; + break; + case 'VSCodium': + editor = 'codium --wait --reuse-window'; + break; + default: + editor = 'code --wait --reuse-window'; + break; + } + return editor; +} + export function getEditorIfActive(document: TextDocument): TextEditor | undefined { const editor = window.activeTextEditor; return editor != null && editor.document === document ? editor : undefined; @@ -180,23 +199,8 @@ export function openWorkspace( }); } -export function getEditorCommand() { - let editor; - switch (env.appName) { - case 'Visual Studio Code - Insiders': - editor = 'code-insiders --wait --reuse-window'; - break; - case 'Visual Studio Code - Exploration': - editor = 'code-exploration --wait --reuse-window'; - break; - case 'VSCodium': - editor = 'codium --wait --reuse-window'; - break; - default: - editor = 'code --wait --reuse-window'; - break; - } - return editor; +export async function revealInFileExplorer(uri: Uri) { + void (await executeCoreCommand('revealFileInOS', uri)); } export function supportedInVSCodeVersion(feature: 'input-prompt-links') { diff --git a/src/views/viewCommands.ts b/src/views/viewCommands.ts index 2eaaa9a5f926e..962c5132c5067 100644 --- a/src/views/viewCommands.ts +++ b/src/views/viewCommands.ts @@ -36,7 +36,7 @@ import { setContext } from '../system/context'; import { log } from '../system/decorators/log'; import { sequentialize } from '../system/function'; import type { OpenWorkspaceLocation } from '../system/utils'; -import { openWorkspace } from '../system/utils'; +import { openWorkspace, revealInFileExplorer } from '../system/utils'; import { RepositoryFolderNode } from './nodes/abstract/repositoryFolderNode'; import { canEditNode, @@ -781,14 +781,14 @@ export class ViewCommands { private revealRepositoryInExplorer(node: RepositoryNode) { if (!(node instanceof RepositoryNode)) return undefined; - return RepoActions.revealInFileExplorer(node.repo); + return revealInFileExplorer(node.repo.uri); } @log() private revealWorktreeInExplorer(node: WorktreeNode) { if (!(node instanceof WorktreeNode)) return undefined; - return WorktreeActions.revealInFileExplorer(node.worktree); + return revealInFileExplorer(node.worktree.uri); } @log() From b58d654f89c1f2c409b316937c260bc54c73a577 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 15 Nov 2023 10:11:44 -0500 Subject: [PATCH 0229/1012] Updates dependencies --- package.json | 8 +-- yarn.lock | 200 +++++++++++++++++++++++---------------------------- 2 files changed, 92 insertions(+), 116 deletions(-) diff --git a/package.json b/package.json index 0f3bcb1f22ede..d54b1036b7dd0 100644 --- a/package.json +++ b/package.json @@ -15790,8 +15790,8 @@ "@types/react-dom": "17.0.21", "@types/sortablejs": "1.15.5", "@types/vscode": "1.81.0", - "@typescript-eslint/eslint-plugin": "6.10.0", - "@typescript-eslint/parser": "6.10.0", + "@typescript-eslint/eslint-plugin": "6.11.0", + "@typescript-eslint/parser": "6.11.0", "@vscode/test-electron": "2.3.6", "@vscode/test-web": "0.0.48", "@vscode/vsce": "2.22.0", @@ -15823,7 +15823,7 @@ "lz-string": "1.5.0", "mini-css-extract-plugin": "2.7.6", "mocha": "10.2.0", - "prettier": "3.0.3", + "prettier": "3.1.0", "sass": "1.69.5", "sass-loader": "13.3.2", "schema-utils": "4.2.0", @@ -15834,7 +15834,7 @@ "tsc-alias": "1.8.8", "typescript": "5.3.1-rc", "webpack": "5.89.0", - "webpack-bundle-analyzer": "4.9.1", + "webpack-bundle-analyzer": "4.10.0", "webpack-cli": "5.1.4", "webpack-node-externals": "3.0.0", "webpack-require-from": "1.8.6" diff --git a/yarn.lock b/yarn.lock index 7d5abad2a59d1..a9deb5cfa7fde 100644 --- a/yarn.lock +++ b/yarn.lock @@ -493,9 +493,9 @@ universal-user-agent "^6.0.0" "@octokit/types@^12.0.0": - version "12.2.0" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-12.2.0.tgz#c21044ec70c5e2222043bcbe7fe2c3448a13df31" - integrity sha512-ZkdHqHJdifVndN7Pha10+qrgAjy3AcG//Vmjr/o5UFuTiYCcMhqDj39Yr9VM9zJ/42KO2xAYhV7cvLnLI9Kvwg== + version "12.3.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-12.3.0.tgz#e3f8bc53f65ef551e19cc1a0fea15adadec17d2d" + integrity sha512-nJ8X2HRr234q3w/FcovDlA+ttUU4m1eJAourvfUUtwAWeqL8AsyRqfnLvVnYn3NFbUnsmzQCzLNdFerPwdmcDQ== dependencies: "@octokit/openapi-types" "^19.0.2" @@ -812,16 +812,16 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@6.10.0": - version "6.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.10.0.tgz#cfe2bd34e26d2289212946b96ab19dcad64b661a" - integrity sha512-uoLj4g2OTL8rfUQVx2AFO1hp/zja1wABJq77P6IclQs6I/m9GLrm7jCdgzZkvWdDCQf1uEvoa8s8CupsgWQgVg== +"@typescript-eslint/eslint-plugin@6.11.0": + version "6.11.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.11.0.tgz#52aae65174ff526576351f9ccd41cea01001463f" + integrity sha512-uXnpZDc4VRjY4iuypDBKzW1rz9T5YBBK0snMn8MaTSNd2kMlj50LnLBABELjJiOL5YHk7ZD8hbSpI9ubzqYI0w== dependencies: "@eslint-community/regexpp" "^4.5.1" - "@typescript-eslint/scope-manager" "6.10.0" - "@typescript-eslint/type-utils" "6.10.0" - "@typescript-eslint/utils" "6.10.0" - "@typescript-eslint/visitor-keys" "6.10.0" + "@typescript-eslint/scope-manager" "6.11.0" + "@typescript-eslint/type-utils" "6.11.0" + "@typescript-eslint/utils" "6.11.0" + "@typescript-eslint/visitor-keys" "6.11.0" debug "^4.3.4" graphemer "^1.4.0" ignore "^5.2.4" @@ -829,72 +829,72 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/parser@6.10.0": - version "6.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.10.0.tgz#578af79ae7273193b0b6b61a742a2bc8e02f875a" - integrity sha512-+sZwIj+s+io9ozSxIWbNB5873OSdfeBEH/FR0re14WLI6BaKuSOnnwCJ2foUiu8uXf4dRp1UqHP0vrZ1zXGrog== +"@typescript-eslint/parser@6.11.0": + version "6.11.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.11.0.tgz#9640d9595d905f3be4f278bf515130e6129b202e" + integrity sha512-+whEdjk+d5do5nxfxx73oanLL9ghKO3EwM9kBCkUtWMRwWuPaFv9ScuqlYfQ6pAD6ZiJhky7TZ2ZYhrMsfMxVQ== dependencies: - "@typescript-eslint/scope-manager" "6.10.0" - "@typescript-eslint/types" "6.10.0" - "@typescript-eslint/typescript-estree" "6.10.0" - "@typescript-eslint/visitor-keys" "6.10.0" + "@typescript-eslint/scope-manager" "6.11.0" + "@typescript-eslint/types" "6.11.0" + "@typescript-eslint/typescript-estree" "6.11.0" + "@typescript-eslint/visitor-keys" "6.11.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@6.10.0": - version "6.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.10.0.tgz#b0276118b13d16f72809e3cecc86a72c93708540" - integrity sha512-TN/plV7dzqqC2iPNf1KrxozDgZs53Gfgg5ZHyw8erd6jd5Ta/JIEcdCheXFt9b1NYb93a1wmIIVW/2gLkombDg== +"@typescript-eslint/scope-manager@6.11.0": + version "6.11.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.11.0.tgz#621f603537c89f4d105733d949aa4d55eee5cea8" + integrity sha512-0A8KoVvIURG4uhxAdjSaxy8RdRE//HztaZdG8KiHLP8WOXSk0vlF7Pvogv+vlJA5Rnjj/wDcFENvDaHb+gKd1A== dependencies: - "@typescript-eslint/types" "6.10.0" - "@typescript-eslint/visitor-keys" "6.10.0" + "@typescript-eslint/types" "6.11.0" + "@typescript-eslint/visitor-keys" "6.11.0" -"@typescript-eslint/type-utils@6.10.0": - version "6.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.10.0.tgz#1007faede067c78bdbcef2e8abb31437e163e2e1" - integrity sha512-wYpPs3hgTFblMYwbYWPT3eZtaDOjbLyIYuqpwuLBBqhLiuvJ+9sEp2gNRJEtR5N/c9G1uTtQQL5AhV0fEPJYcg== +"@typescript-eslint/type-utils@6.11.0": + version "6.11.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.11.0.tgz#d0b8b1ab6c26b974dbf91de1ebc5b11fea24e0d1" + integrity sha512-nA4IOXwZtqBjIoYrJcYxLRO+F9ri+leVGoJcMW1uqr4r1Hq7vW5cyWrA43lFbpRvQ9XgNrnfLpIkO3i1emDBIA== dependencies: - "@typescript-eslint/typescript-estree" "6.10.0" - "@typescript-eslint/utils" "6.10.0" + "@typescript-eslint/typescript-estree" "6.11.0" + "@typescript-eslint/utils" "6.11.0" debug "^4.3.4" ts-api-utils "^1.0.1" -"@typescript-eslint/types@6.10.0": - version "6.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.10.0.tgz#f4f0a84aeb2ac546f21a66c6e0da92420e921367" - integrity sha512-36Fq1PWh9dusgo3vH7qmQAj5/AZqARky1Wi6WpINxB6SkQdY5vQoT2/7rW7uBIsPDcvvGCLi4r10p0OJ7ITAeg== +"@typescript-eslint/types@6.11.0": + version "6.11.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.11.0.tgz#8ad3aa000cbf4bdc4dcceed96e9b577f15e0bf53" + integrity sha512-ZbEzuD4DwEJxwPqhv3QULlRj8KYTAnNsXxmfuUXFCxZmO6CF2gM/y+ugBSAQhrqaJL3M+oe4owdWunaHM6beqA== -"@typescript-eslint/typescript-estree@6.10.0": - version "6.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.10.0.tgz#667381eed6f723a1a8ad7590a31f312e31e07697" - integrity sha512-ek0Eyuy6P15LJVeghbWhSrBCj/vJpPXXR+EpaRZqou7achUWL8IdYnMSC5WHAeTWswYQuP2hAZgij/bC9fanBg== +"@typescript-eslint/typescript-estree@6.11.0": + version "6.11.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.11.0.tgz#7b52c12a623bf7f8ec7f8a79901b9f98eb5c7990" + integrity sha512-Aezzv1o2tWJwvZhedzvD5Yv7+Lpu1by/U1LZ5gLc4tCx8jUmuSCMioPFRjliN/6SJIvY6HpTtJIWubKuYYYesQ== dependencies: - "@typescript-eslint/types" "6.10.0" - "@typescript-eslint/visitor-keys" "6.10.0" + "@typescript-eslint/types" "6.11.0" + "@typescript-eslint/visitor-keys" "6.11.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/utils@6.10.0": - version "6.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.10.0.tgz#4d76062d94413c30e402c9b0df8c14aef8d77336" - integrity sha512-v+pJ1/RcVyRc0o4wAGux9x42RHmAjIGzPRo538Z8M1tVx6HOnoQBCX/NoadHQlZeC+QO2yr4nNSFWOoraZCAyg== +"@typescript-eslint/utils@6.11.0": + version "6.11.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.11.0.tgz#11374f59ef4cea50857b1303477c08aafa2ca604" + integrity sha512-p23ibf68fxoZy605dc0dQAEoUsoiNoP3MD9WQGiHLDuTSOuqoTsa4oAy+h3KDkTcxbbfOtUjb9h3Ta0gT4ug2g== dependencies: "@eslint-community/eslint-utils" "^4.4.0" "@types/json-schema" "^7.0.12" "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "6.10.0" - "@typescript-eslint/types" "6.10.0" - "@typescript-eslint/typescript-estree" "6.10.0" + "@typescript-eslint/scope-manager" "6.11.0" + "@typescript-eslint/types" "6.11.0" + "@typescript-eslint/typescript-estree" "6.11.0" semver "^7.5.4" -"@typescript-eslint/visitor-keys@6.10.0": - version "6.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.10.0.tgz#b9eaf855a1ac7e95633ae1073af43d451e8f84e3" - integrity sha512-xMGluxQIEtOM7bqFCo+rCMh5fqI+ZxV5RUUOa29iVPz1OgCZrtc7rFnz5cLUazlkPKYqX+75iuDq7m0HQ48nCg== +"@typescript-eslint/visitor-keys@6.11.0": + version "6.11.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.11.0.tgz#d991538788923f92ec40d44389e7075b359f3458" + integrity sha512-+SUN/W7WjBr05uRxPggJPSzyB8zUpaYo2hByKasWbqr3PM8AXfZt8UHdNpBS1v9SA62qnSSMF3380SwDqqprgQ== dependencies: - "@typescript-eslint/types" "6.10.0" + "@typescript-eslint/types" "6.11.0" eslint-visitor-keys "^3.4.1" "@ungap/structured-clone@^1.2.0": @@ -1652,9 +1652,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001541: - version "1.0.30001561" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz#752f21f56f96f1b1a52e97aae98c57c562d5d9da" - integrity sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw== + version "1.0.30001562" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001562.tgz#9d16c5fd7e9c592c4cd5e304bc0f75b0008b2759" + integrity sha512-kfte3Hym//51EdX4239i+Rmp20EsLIYGdPkERegTgU19hQWCRhsRFGKHTliUlsry53tv17K7n077Kqa0WJU4ng== capital-case@^1.0.4: version "1.0.4" @@ -2339,6 +2339,11 @@ date-fns@^2.30.0: dependencies: "@babel/runtime" "^7.21.0" +debounce@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5" + integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug== + debug@2.6.9, debug@^2.6.8: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -2616,9 +2621,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.4.535: - version "1.4.581" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.581.tgz#23b684c67bf56d4284e95598c05a5d266653b6d8" - integrity sha512-6uhqWBIapTJUxgPTCHH9sqdbxIMPt7oXl0VcAL1kOtlU6aECdcMncCrX5Z7sHQ/invtrC9jUQUef7+HhO8vVFw== + version "1.4.583" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.583.tgz#7b0ac4f36388da4b5485788adb92cd7dd0abffc4" + integrity sha512-93y1gcONABZ7uqYe/JWDVQP/Pj/sQSunF0HVAPdlg/pfBnOyBMLlQUxWvkqcljJg1+W6cjvPuYD+r1Th9Tn8mA== emoji-regex@^8.0.0: version "8.0.0" @@ -2745,9 +2750,9 @@ es-abstract@^1.22.1: which-typed-array "^1.1.13" es-module-lexer@^1.2.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.0.tgz#285182e7f8f536ff5f4c57f2309836ef851474d8" - integrity sha512-lcCr3v3OLezdfFyx9r5NRYHOUTQNnFEQ9E87Mx8Kc+iqyJNkO7MJoB4GQRTlIMw9kLLTwGw0OAkm4BQQud/d9g== + version "1.4.1" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5" + integrity sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w== es-set-tostringtag@^2.0.1: version "2.0.2" @@ -3151,9 +3156,9 @@ find-up@^4.0.0: path-exists "^4.0.0" flat-cache@^3.0.4: - version "3.1.1" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.1.tgz#a02a15fdec25a8f844ff7cc658f03dd99eb4609b" - integrity sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q== + version "3.2.0" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee" + integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw== dependencies: flatted "^3.2.9" keyv "^4.5.3" @@ -3580,6 +3585,11 @@ hosted-git-info@^6.0.0: dependencies: lru-cache "^7.5.1" +html-escaper@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" + integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== + html-loader@4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/html-loader/-/html-loader-4.2.0.tgz#20f69f9ec69244860c250ae6ee0046c8c5c4d348" @@ -4452,26 +4462,6 @@ lodash.clonedeep@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ== -lodash.debounce@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== - -lodash.escape@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98" - integrity sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw== - -lodash.flatten@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" - integrity sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g== - -lodash.invokemap@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.invokemap/-/lodash.invokemap-4.6.0.tgz#1748cda5d8b0ef8369c4eb3ec54c21feba1f2d62" - integrity sha512-CfkycNtMqgUlfjfdh2BhKO/ZXrP8ePOX5lEU/g0R3ItJcnuxWDwokMGKx1hWcfOikmyOVx6X9IwWnDGlgKl61w== - lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" @@ -4482,21 +4472,11 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash.pullall@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.pullall/-/lodash.pullall-4.2.0.tgz#9d98b8518b7c965b0fae4099bd9fb7df8bbf38ba" - integrity sha512-VhqxBKH0ZxPpLhiu68YD1KnHmbhQJQctcipvmFnqIBDYzcIHzf3Zpu0tpeOKtR4x76p9yohc506eGdOjTmyIBg== - lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ== -lodash.uniqby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302" - integrity sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww== - lodash@^4.17.10, lodash@^4.17.20, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" @@ -5696,10 +5676,10 @@ prelude-ls@^1.2.1: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== -prettier@3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643" - integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg== +prettier@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.1.0.tgz#c6d16474a5f764ea1a4a373c593b779697744d5e" + integrity sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw== pretty-error@^4.0.0: version "4.0.0" @@ -6557,9 +6537,9 @@ stream-shift@^1.0.0: integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== streamx@^2.15.0: - version "2.15.4" - resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.4.tgz#497b8102d076ae12b43c456e0bb16940d1ba0999" - integrity sha512-uSXKl88bibiUCQ1eMpItRljCzDENcDx18rsfDmV79r0e/ThfrAwxG4Y2FarQZ2G4/21xcOKmFFd1Hue+ZIDwHw== + version "2.15.5" + resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.5.tgz#87bcef4dc7f0b883f9359671203344a4e004c7f1" + integrity sha512-9thPGMkKC2GctCzyCUjME3yR03x2xNo0GPKGkRw2UMYN+gqWa9uqpyNWhmsNCutU5zHmkUum0LsCRQTXUgUCAg== dependencies: fast-fifo "^1.1.0" queue-tick "^1.0.1" @@ -7209,24 +7189,20 @@ webidl-conversions@^3.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== -webpack-bundle-analyzer@4.9.1: - version "4.9.1" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.9.1.tgz#d00bbf3f17500c10985084f22f1a2bf45cb2f09d" - integrity sha512-jnd6EoYrf9yMxCyYDPj8eutJvtjQNp8PHmni/e/ulydHBWhT5J3menXt3HEkScsu9YqMAcG4CfFjs3rj5pVU1w== +webpack-bundle-analyzer@4.10.0: + version "4.10.0" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.0.tgz#eecb0ade9bd1944d3d2e38262ec9793da6f13e69" + integrity sha512-j+apH0Cs+FY8IOIwxLbkgEJnbQgEPEG8uqLVnRb9tAoGbyKNxQA1u9wNDrTQHK3PinO4Pckew7AE7pnX/RS3wA== dependencies: "@discoveryjs/json-ext" "0.5.7" acorn "^8.0.4" acorn-walk "^8.0.0" commander "^7.2.0" + debounce "^1.2.1" escape-string-regexp "^4.0.0" gzip-size "^6.0.0" + html-escaper "^2.0.2" is-plain-object "^5.0.0" - lodash.debounce "^4.0.8" - lodash.escape "^4.0.1" - lodash.flatten "^4.4.0" - lodash.invokemap "^4.6.0" - lodash.pullall "^4.2.0" - lodash.uniqby "^4.7.0" opener "^1.5.2" picocolors "^1.0.0" sirv "^2.0.3" From fd23c90ed6140442db7fe3a5b58ac014c279c369 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 15 Nov 2023 12:08:18 -0500 Subject: [PATCH 0230/1012] Closes #3005 adds GPT-4 Turbo & latest Anthropic models --- CHANGELOG.md | 8 +++ package.json | 36 ++++++------- src/ai/anthropicProvider.ts | 86 ++++++++++++++++++++---------- src/ai/openaiProvider.ts | 92 ++++++++++++++++++++++----------- src/quickpicks/aiModelPicker.ts | 22 +++----- 5 files changed, 152 insertions(+), 92 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 982aa290b3c16..cc148d942ba81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] +### Added + +- Adds support for OpenAI's GPT-4 Turbo and latest Anthropic models for GitLens' experimental AI features — closes [#3005](https://github.com/gitkraken/vscode-gitlens/issues/3005) + +### Changed + +- Refines AI prompts to provide better commit message generation and explanation results + ## [14.5.0] - 2023-11-13 ### Added diff --git a/package.json b/package.json index d54b1036b7dd0..308bc0aaeaf80 100644 --- a/package.json +++ b/package.json @@ -3175,7 +3175,7 @@ }, "gitlens.experimental.generateCommitMessagePrompt": { "type": "string", - "default": "Commit messages must have a short description that is less than 50 chars followed by a newline and a more detailed description.\n- Write concisely using an informal tone and avoid specific names from the code", + "default": "Now, please generate a commit message. Ensure that it includes a precise and informative subject line that succinctly summarizes the crux of the changes in under 50 characters. If necessary, follow with an explanatory body providing insight into the nature of the changes, the reasoning behind them, and any significant consequences or considerations arising from them. Conclude with any relevant issue references at the end of the message.", "markdownDescription": "Specifies the prompt to use to tell OpenAI how to structure or format the generated commit message", "scope": "window", "order": 2 @@ -3202,19 +3202,23 @@ "gpt-3.5-turbo", "gpt-3.5-turbo-16k", "gpt-3.5-turbo-0613", + "gpt-3.5-turbo-1106", "gpt-4", "gpt-4-0613", "gpt-4-32k", - "gpt-4-32k-0613" + "gpt-4-32k-0613", + "gpt-4-1106-preview" ], "enumDescriptions": [ - "GPT 3.5 Turbo", - "GPT 3.5 Turbo 16k", - "GPT 3.5 Turbo (June 13)", - "GPT 4", - "GPT 4 (June 13)", - "GPT 4 32k", - "GPT 4 32k (June 13)" + "GPT-3.5 Turbo", + "GPT-3.5 Turbo 16k", + "GPT-3.5 Turbo (June 13)", + "GPT-3.5 Turbo (Nov 6)", + "GPT-4", + "GPT-4 (June 13)", + "GPT-4 32k", + "GPT-4 32k (June 13)", + "GPT-4 Turbo (Nov 6)" ], "markdownDescription": "Specifies the OpenAI model to use for GitLens' experimental AI features", "scope": "window", @@ -3232,20 +3236,14 @@ }, "gitlens.ai.experimental.anthropic.model": { "type": "string", - "default": "claude-v1", + "default": "claude-instant-1", "enum": [ - "claude-v1", - "claude-v1-100k", - "claude-instant-v1", - "claude-instant-v1-100k", + "claude-instant-1", "claude-2" ], "enumDescriptions": [ - "Claude v1", - "Claude v1 100k", - "Claude Instant v1", - "Claude Instant v1 100k", - "Claude 2" + "Claude Instant", + "Claude" ], "markdownDescription": "Specifies the Anthropic model to use for GitLens' experimental AI features", "scope": "window", diff --git a/src/ai/anthropicProvider.ts b/src/ai/anthropicProvider.ts index f5eeac82c73e3..da9970c239549 100644 --- a/src/ai/anthropicProvider.ts +++ b/src/ai/anthropicProvider.ts @@ -12,7 +12,7 @@ export class AnthropicProvider implements AIProvider { readonly name = 'Anthropic'; private get model(): AnthropicModels { - return configuration.get('ai.experimental.anthropic.model') || 'claude-v1'; + return configuration.get('ai.experimental.anthropic.model') || 'claude-instant-1'; } constructor(private readonly container: Container) {} @@ -24,7 +24,7 @@ export class AnthropicProvider implements AIProvider { if (apiKey == null) return undefined; const model = this.model; - const maxCodeCharacters = getMaxCharacters(model); + const maxCodeCharacters = getMaxCharacters(model, 1600); const code = diff.substring(0, maxCodeCharacters); if (diff.length > maxCodeCharacters) { @@ -38,15 +38,29 @@ export class AnthropicProvider implements AIProvider { customPrompt += '.'; } - let prompt = - "\n\nHuman: You are an AI programming assistant tasked with writing a meaningful commit message by summarizing code changes.\n- Follow the user's instructions carefully & to the letter!\n- Don't repeat yourself or make anything up!\n- Minimize any other prose."; - prompt += `\n${customPrompt}\n- Avoid phrases like "this commit", "this change", etc.`; - prompt += '\n\nAssistant: OK'; - if (options?.context) { - prompt += `\n\nHuman: Use "${options.context}" to help craft the commit message.\n\nAssistant: OK`; - } - prompt += `\n\nHuman: Write a meaningful commit message for the following code changes:\n\n${code}`; - prompt += '\n\nAssistant:'; + const prompt = `\n\nHuman: You are an advanced AI programming assistant tasked with summarizing code changes into a concise and meaningful commit message. Compose a commit message that: +- Strictly synthesizes meaningful information from the provided code diff +- Utilizes any additional user-provided context to comprehend the rationale behind the code changes +- Is clear and brief, with an informal yet professional tone, and without superfluous descriptions +- Avoids unnecessary phrases such as "this commit", "this change", and the like +- Avoids direct mention of specific code identifiers, names, or file names, unless they are crucial for understanding the purpose of the changes +- Most importantly emphasizes the 'why' of the change, its benefits, or the problem it addresses rather than only the 'what' that changed + +Follow the user's instructions carefully, don't repeat yourself, don't include the code in the output, or make anything up! + +Human: Here is the code diff to use to generate the commit message: + +${code} + +${ + options?.context + ? `Human: Here is additional context which should be taken into account when generating the commit message:\n\n${options.context}` + : '' +} + +Human: ${customPrompt} + +Assistant:`; const request: AnthropicCompletionRequest = { model: model, @@ -80,7 +94,7 @@ export class AnthropicProvider implements AIProvider { if (apiKey == null) return undefined; const model = this.model; - const maxCodeCharacters = getMaxCharacters(model); + const maxCodeCharacters = getMaxCharacters(model, 2400); const code = diff.substring(0, maxCodeCharacters); if (diff.length > maxCodeCharacters) { @@ -89,12 +103,24 @@ export class AnthropicProvider implements AIProvider { ); } - let prompt = - "\n\nHuman: You are an AI programming assistant tasked with providing an easy to understand but detailed explanation of a commit by summarizing the code changes while also using the commit message as additional context and framing.\nDon't make anything up!"; - prompt += `\nUse the following user-provided commit message, which should provide some explanation to why these changes where made, when attempting to generate the rich explanation:\n\n${message}`; - prompt += '\n\nAssistant: OK'; - prompt += `\n\nHuman: Explain the following code changes:\n\n${code}`; - prompt += '\n\nAssistant:'; + const prompt = `\n\nHuman: You are an advanced AI programming assistant tasked with summarizing code changes into an explanation that is both easy to understand and meaningful. Construct an explanation that: + - Concisely synthesizes meaningful information from the provided code diff + - Incorporates any additional context provided by the user to understand the rationale behind the code changes + - Places the emphasis on the 'why' of the change, clarifying its benefits or addressing the problem that necessitated the change, beyond just detailing the 'what' has changed + + Do not make any assumptions or invent details that are not supported by the code diff or the user-provided context. + +Human: Here is additional context provided by the author of the changes, which should provide some explanation to why these changes where made. Please strongly consider this information when generating your explanation: + +${message} + +Human: Now, kindly explain the following code diff in a way that would be clear to someone reviewing or trying to understand these changes: + +${code} + +Human: Remember to frame your explanation in a way that is suitable for a reviewer to quickly grasp the essence of the changes, the issues they resolve, and their implications on the codebase. + +Assistant:`; const request: AnthropicCompletionRequest = { model: model, @@ -200,18 +226,22 @@ async function getApiKey(storage: Storage): Promise { return apiKey; } -function getMaxCharacters(model: AnthropicModels): number { - if (model === 'claude-2' || model === 'claude-v1-100k' || model === 'claude-instant-v1-100k') { - return 135000; +function getMaxCharacters(model: AnthropicModels, outputLength: number): number { + let tokens; + switch (model) { + case 'claude-2': // 100,000 tokens + case 'claude-instant-1': + tokens = 100000; + break; + default: // 4,096 tokens + tokens = 4096; + break; } - return 12000; + + return tokens * 4 - outputLength / 4; } -export type AnthropicModels = - | 'claude-v1' - | 'claude-v1-100k' - | 'claude-instant-v1' - | 'claude-instant-v1-100k' - | 'claude-2'; + +export type AnthropicModels = 'claude-instant-1' | 'claude-2'; interface AnthropicCompletionRequest { model: string; diff --git a/src/ai/openaiProvider.ts b/src/ai/openaiProvider.ts index ed57215ad6651..aa652a777bdfe 100644 --- a/src/ai/openaiProvider.ts +++ b/src/ai/openaiProvider.ts @@ -28,7 +28,7 @@ export class OpenAIProvider implements AIProvider { if (apiKey == null) return undefined; const model = this.model; - const maxCodeCharacters = getMaxCharacters(model); + const maxCodeCharacters = getMaxCharacters(model, 1600); const code = diff.substring(0, maxCodeCharacters); if (diff.length > maxCodeCharacters) { @@ -47,27 +47,35 @@ export class OpenAIProvider implements AIProvider { messages: [ { role: 'system', - content: - "You are an AI programming assistant tasked with writing a meaningful commit message by summarizing code changes.\n\n- Follow the user's instructions carefully & to the letter!\n- Don't repeat yourself or make anything up!\n- Minimize any other prose.", + content: `You are an advanced AI programming assistant tasked with summarizing code changes into a concise and meaningful commit message. Compose a commit message that: +- Strictly synthesizes meaningful information from the provided code diff +- Utilizes any additional user-provided context to comprehend the rationale behind the code changes +- Is clear and brief, with an informal yet professional tone, and without superfluous descriptions +- Avoids unnecessary phrases such as "this commit", "this change", and the like +- Avoids direct mention of specific code identifiers, names, or file names, unless they are crucial for understanding the purpose of the changes +- Most importantly emphasizes the 'why' of the change, its benefits, or the problem it addresses rather than only the 'what' that changed + +Follow the user's instructions carefully, don't repeat yourself, don't include the code in the output, or make anything up!`, + }, + { + role: 'user', + content: `Here is the code diff to use to generate the commit message:\n\n${code}`, }, + ...(options?.context + ? [ + { + role: 'user' as const, + content: `Here is additional context which should be taken into account when generating the commit message:\n\n${options.context}`, + }, + ] + : []), { role: 'user', - content: `${customPrompt}\n- Avoid phrases like "this commit", "this change", etc.`, + content: customPrompt, }, ], }; - if (options?.context) { - request.messages.push({ - role: 'user', - content: `Use "${options.context}" to help craft the commit message.`, - }); - } - request.messages.push({ - role: 'user', - content: `Write a meaningful commit message for the following code changes:\n\n${code}`, - }); - const rsp = await this.fetch(apiKey, request); if (!rsp.ok) { debugger; @@ -89,7 +97,7 @@ export class OpenAIProvider implements AIProvider { if (apiKey == null) return undefined; const model = this.model; - const maxCodeCharacters = getMaxCharacters(model); + const maxCodeCharacters = getMaxCharacters(model, 2400); const code = diff.substring(0, maxCodeCharacters); if (diff.length > maxCodeCharacters) { @@ -103,20 +111,25 @@ export class OpenAIProvider implements AIProvider { messages: [ { role: 'system', - content: - "You are an AI programming assistant tasked with providing an easy to understand but detailed explanation of a commit by summarizing the code changes while also using the commit message as additional context and framing.\n\n- Don't make anything up!", + content: `You are an advanced AI programming assistant tasked with summarizing code changes into an explanation that is both easy to understand and meaningful. Construct an explanation that: +- Concisely synthesizes meaningful information from the provided code diff +- Incorporates any additional context provided by the user to understand the rationale behind the code changes +- Places the emphasis on the 'why' of the change, clarifying its benefits or addressing the problem that necessitated the change, beyond just detailing the 'what' has changed + +Do not make any assumptions or invent details that are not supported by the code diff or the user-provided context.`, }, { role: 'user', - content: `Use the following user-provided commit message, which should provide some explanation to why these changes where made, when attempting to generate the rich explanation:\n\n${message}`, + content: `Here is additional context provided by the author of the changes, which should provide some explanation to why these changes where made. Please strongly consider this information when generating your explanation:\n\n${message}`, }, { - role: 'assistant', - content: 'OK', + role: 'user', + content: `Now, kindly explain the following code diff in a way that would be clear to someone reviewing or trying to understand these changes:\n\n${code}`, }, { role: 'user', - content: `Explain the following code changes:\n\n${code}`, + content: + 'Remember to frame your explanation in a way that is suitable for a reviewer to quickly grasp the essence of the changes, the issues they resolve, and their implications on the codebase.', }, ], }; @@ -220,26 +233,45 @@ async function getApiKey(storage: Storage): Promise { return openaiApiKey; } -function getMaxCharacters(model: OpenAIModels): number { +function getMaxCharacters(model: OpenAIModels, outputLength: number): number { + let tokens; switch (model) { - case 'gpt-4-32k': + case 'gpt-4-1106-preview': // 128,000 tokens (4,096 max output tokens) + tokens = 128000; + break; + case 'gpt-4-32k': // 32,768 tokens case 'gpt-4-32k-0613': - return 43000; - case 'gpt-3.5-turbo-16k': - return 21000; - default: - return 12000; + tokens = 32768; + break; + case 'gpt-4': // 8,192 tokens + case 'gpt-4-0613': + tokens = 8192; + break; + case 'gpt-3.5-turbo-1106': // 16,385 tokens (4,096 max output tokens) + tokens = 16385; + break; + case 'gpt-3.5-turbo-16k': // 16,385 tokens; Will point to gpt-3.5-turbo-1106 starting Dec 11, 2023 + tokens = 16385; + break; + case 'gpt-3.5-turbo': // Will point to gpt-3.5-turbo-1106 starting Dec 11, 2023 + default: // 4,096 tokens + tokens = 4096; + break; } + + return tokens * 4 - outputLength / 4; } export type OpenAIModels = + | 'gpt-3.5-turbo-1106' | 'gpt-3.5-turbo' | 'gpt-3.5-turbo-16k' | 'gpt-3.5-turbo-0613' | 'gpt-4' | 'gpt-4-0613' | 'gpt-4-32k' - | 'gpt-4-32k-0613'; + | 'gpt-4-32k-0613' + | 'gpt-4-1106-preview'; interface OpenAIChatCompletionRequest { model: OpenAIModels; diff --git a/src/quickpicks/aiModelPicker.ts b/src/quickpicks/aiModelPicker.ts index 0109e61a87f14..260268381286e 100644 --- a/src/quickpicks/aiModelPicker.ts +++ b/src/quickpicks/aiModelPicker.ts @@ -14,28 +14,20 @@ export async function showAIModelPicker(): Promise Date: Wed, 15 Nov 2023 12:08:52 -0500 Subject: [PATCH 0231/1012] Adds border radius to AI explain box --- src/webviews/apps/shared/styles/details-base.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/webviews/apps/shared/styles/details-base.scss b/src/webviews/apps/shared/styles/details-base.scss index ea6cde7b28584..e08611e099996 100644 --- a/src/webviews/apps/shared/styles/details-base.scss +++ b/src/webviews/apps/shared/styles/details-base.scss @@ -381,6 +381,7 @@ ul { background: var(--vscode-input-background); margin-top: 1rem; padding: 0.5rem; + border-radius: 2px; &.has-error { border-left-color: var(--color-alert-errorBorder); From 0ca7b41aa8152269763c4bc8557a564af355446d Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 15 Nov 2023 12:09:31 -0500 Subject: [PATCH 0232/1012] Updates for latest vscode settings changes --- .vscode/settings.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 5a748806bc17f..4367562dcbdc1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,8 +1,7 @@ { "editor.codeActionsOnSave": { - "source.fixAll.eslint": true + "source.fixAll.eslint": "explicit" }, - "eslint.packageManager": "yarn", "files.associations": { ".eslintrc*.json": "jsonc" }, From fbccf2428fd671378202de43ff99deff66168a13 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 15 Nov 2023 12:13:41 -0500 Subject: [PATCH 0233/1012] =?UTF-8?q?=F0=9F=92=84prettiers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .prettierrc | 4 -- src/annotations/blameAnnotationProvider.ts | 8 +-- .../gutterChangesAnnotationProvider.ts | 4 +- src/commands/git/push.ts | 16 ++--- src/commands/quickCommand.ts | 16 ++--- src/errors.ts | 4 +- src/extension.ts | 4 +- src/plus/github/github.ts | 32 ++++----- src/plus/github/githubGitProvider.ts | 8 +-- src/plus/gk/checkin.ts | 4 +- src/quickpicks/referencePicker.ts | 8 +-- src/system/configuration.ts | 4 +- src/system/serialize.ts | 20 +++--- src/views/nodes/abstract/viewNode.ts | 68 +++++++++---------- src/views/nodes/autolinkedItemNode.ts | 12 ++-- src/views/nodes/branchNode.ts | 14 ++-- src/views/nodes/commitNode.ts | 8 +-- src/views/nodes/fileHistoryNode.ts | 12 ++-- src/views/nodes/fileRevisionAsCommitNode.ts | 4 +- src/views/nodes/remoteNode.ts | 14 ++-- src/views/nodes/resultsCommitsNode.ts | 4 +- src/views/nodes/resultsFilesNode.ts | 4 +- src/views/nodes/worktreeNode.ts | 12 ++-- src/views/viewCommands.ts | 8 +-- .../focus/components/gk-pull-request-row.ts | 8 +-- src/webviews/apps/plus/timeline/chart.ts | 4 +- .../components/list/file-change-list-item.ts | 68 +++++++++---------- src/webviews/webviewController.ts | 4 +- 28 files changed, 190 insertions(+), 186 deletions(-) diff --git a/.prettierrc b/.prettierrc index 5a24bc35e38c2..df7b60158484f 100644 --- a/.prettierrc +++ b/.prettierrc @@ -14,10 +14,6 @@ { "files": "*.md", "options": { "tabWidth": 2 } - }, - { - "files": "*.svg", - "options": { "parser": "html" } } ] } diff --git a/src/annotations/blameAnnotationProvider.ts b/src/annotations/blameAnnotationProvider.ts index 3c8b47de9dd83..de6bf5f368b63 100644 --- a/src/annotations/blameAnnotationProvider.ts +++ b/src/annotations/blameAnnotationProvider.ts @@ -107,10 +107,10 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase Array.isArray(lookupTable) ? lookupTable : unified - ? lookupTable.hot.concat(lookupTable.cold) - : date.getTime() < coldThresholdTimestamp - ? lookupTable.cold - : lookupTable.hot; + ? lookupTable.hot.concat(lookupTable.cold) + : date.getTime() < coldThresholdTimestamp + ? lookupTable.cold + : lookupTable.hot; const computeRelativeAge = (date: Date, lookup: number[]) => { const time = date.getTime(); diff --git a/src/annotations/gutterChangesAnnotationProvider.ts b/src/annotations/gutterChangesAnnotationProvider.ts index 742315766e46b..5ce792727cbf6 100644 --- a/src/annotations/gutterChangesAnnotationProvider.ts +++ b/src/annotations/gutterChangesAnnotationProvider.ts @@ -211,8 +211,8 @@ export class GutterChangesAnnotationProvider extends AnnotationProviderBase { useForceIfIncludes ? ' (with lease and if includes)' : useForceWithLease - ? ' (with lease)' - : '' + ? ' (with lease)' + : '' }`, description: `--force${ useForceWithLease @@ -254,8 +254,8 @@ export class PushGitCommand extends QuickCommand { useForceIfIncludes ? ' (with lease and if includes)' : useForceWithLease - ? ' (with lease)' - : '' + ? ' (with lease)' + : '' } ${branch?.state.ahead ? ` ${pluralize('commit', branch.state.ahead)}` : ''}${ branch.getRemoteName() ? ` to ${branch.getRemoteName()}` : '' }${ @@ -406,8 +406,8 @@ export class PushGitCommand extends QuickCommand { useForceIfIncludes ? ' (with lease and if includes)' : useForceWithLease - ? ' (with lease)' - : '' + ? ' (with lease)' + : '' }`, description: `--force${ useForceWithLease @@ -418,8 +418,8 @@ export class PushGitCommand extends QuickCommand { useForceIfIncludes ? ' (with lease and if includes)' : useForceWithLease - ? ' (with lease)' - : '' + ? ' (with lease)' + : '' } ${pushDetails}${ status != null && status.state.behind > 0 ? `, overwriting ${pluralize('commit', status.state.behind)}${ diff --git a/src/commands/quickCommand.ts b/src/commands/quickCommand.ts index d4c6bd3d072e3..91a3714aead5d 100644 --- a/src/commands/quickCommand.ts +++ b/src/commands/quickCommand.ts @@ -88,10 +88,10 @@ export type StepGenerator = export type StepItemType = T extends CustomStep ? U : T extends QuickPickStep - ? U[] - : T extends QuickInputStep - ? string - : never; + ? U[] + : T extends QuickInputStep + ? string + : never; export type StepNavigationKeys = Exclude; export const StepResultBreak = Symbol('BreakStep'); export type StepResult = typeof StepResultBreak | T; @@ -112,10 +112,10 @@ export type AsyncStepResultGenerator = AsyncGenerator< export type StepSelection = T extends CustomStep ? U | Directive : T extends QuickPickStep - ? U[] | Directive - : T extends QuickInputStep - ? string | Directive - : never; + ? U[] | Directive + : T extends QuickInputStep + ? string | Directive + : never; export type PartialStepState = Partial & { counter: number; confirm?: boolean; startingStep?: number }; export type StepState> = T & { counter: number; confirm?: boolean; startingStep?: number }; diff --git a/src/errors.ts b/src/errors.ts index 173b4cf8a0d87..143ec67ddee8b 100644 --- a/src/errors.ts +++ b/src/errors.ts @@ -192,8 +192,8 @@ export class ProviderNotFoundError extends Error { pathOrUri == null ? String(pathOrUri) : typeof pathOrUri === 'string' - ? pathOrUri - : pathOrUri.toString(true) + ? pathOrUri + : pathOrUri.toString(true) }'`, ); diff --git a/src/extension.ts b/src/extension.ts index c6553c663facc..d40e64cc91cd3 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -273,8 +273,8 @@ function registerBuiltInActionRunners(container: Container): void { compare: ctx.branch.isRemote ? getBranchNameWithoutRemote(ctx.branch.name) : ctx.branch.upstream - ? getBranchNameWithoutRemote(ctx.branch.upstream) - : ctx.branch.name, + ? getBranchNameWithoutRemote(ctx.branch.upstream) + : ctx.branch.name, remote: ctx.remote?.name ?? '', repoPath: ctx.repoPath, })); diff --git a/src/plus/github/github.ts b/src/plus/github/github.ts index e2aaae4f93601..38f70a2f3b162 100644 --- a/src/plus/github/github.ts +++ b/src/plus/github/github.ts @@ -298,14 +298,14 @@ export class GitHubApi implements Disposable { !author.avatarUrl || isGitHubDotCom(options) ? author.avatarUrl ?? undefined : author.email && options?.baseUrl != null - ? await this.createEnterpriseAvatarUrl( - provider, - token, - options.baseUrl, - author.email, - options.avatarSize, - ) - : undefined, + ? await this.createEnterpriseAvatarUrl( + provider, + token, + options.baseUrl, + author.email, + options.avatarSize, + ) + : undefined, }; } catch (ex) { if (ex instanceof ProviderRequestNotFoundError) return undefined; @@ -385,14 +385,14 @@ export class GitHubApi implements Disposable { !author.avatarUrl || isGitHubDotCom(options) ? author.avatarUrl ?? undefined : author.email && options?.baseUrl != null - ? await this.createEnterpriseAvatarUrl( - provider, - token, - options.baseUrl, - author.email, - options.avatarSize, - ) - : undefined, + ? await this.createEnterpriseAvatarUrl( + provider, + token, + options.baseUrl, + author.email, + options.avatarSize, + ) + : undefined, }; } catch (ex) { if (ex instanceof ProviderRequestNotFoundError) return undefined; diff --git a/src/plus/github/githubGitProvider.ts b/src/plus/github/githubGitProvider.ts index 5ee14666b6460..3cc75f3d82c26 100644 --- a/src/plus/github/githubGitProvider.ts +++ b/src/plus/github/githubGitProvider.ts @@ -2924,8 +2924,8 @@ export class GitHubGitProvider implements GitProvider, Disposable { options?.ordering === 'date' ? 'committer-date' : options?.ordering === 'author-date' - ? 'author-date' - : undefined, + ? 'author-date' + : undefined, }); if (result == null) return undefined; @@ -3116,8 +3116,8 @@ export class GitHubGitProvider implements GitProvider, Disposable { options?.ordering === 'date' ? 'committer-date' : options?.ordering === 'author-date' - ? 'author-date' - : undefined, + ? 'author-date' + : undefined, }); if (result == null || options?.cancellation?.isCancellationRequested) { diff --git a/src/plus/gk/checkin.ts b/src/plus/gk/checkin.ts index 9a5b4d60ec3b5..73d281416ce6e 100644 --- a/src/plus/gk/checkin.ts +++ b/src/plus/gk/checkin.ts @@ -90,8 +90,8 @@ export function getSubscriptionFromCheckIn(data: GKCheckInResponse): Partial> = P extends `${infer Key}.${infer Re : never : never : P extends keyof T - ? T[P] - : never; + ? T[P] + : never; export type ConfigPath = Path; export type ConfigPathValue

= PathValue; diff --git a/src/system/serialize.ts b/src/system/serialize.ts index 151cbf1c70523..7cec955a496c5 100644 --- a/src/system/serialize.ts +++ b/src/system/serialize.ts @@ -3,16 +3,16 @@ import type { Branded } from './brand'; export type Serialized = T extends Function ? never : T extends Date - ? number - : T extends Branded - ? U - : T extends any[] - ? Serialized[] - : T extends object - ? { - [K in keyof T]: T[K] extends Date ? number : Serialized; - } - : T; + ? number + : T extends Branded + ? U + : T extends any[] + ? Serialized[] + : T extends object + ? { + [K in keyof T]: T[K] extends Date ? number : Serialized; + } + : T; export function serialize(obj: T): Serialized; export function serialize(obj: T | undefined): Serialized | undefined; diff --git a/src/views/nodes/abstract/viewNode.ts b/src/views/nodes/abstract/viewNode.ts index 3a4d74e880708..7d366d217044e 100644 --- a/src/views/nodes/abstract/viewNode.ts +++ b/src/views/nodes/abstract/viewNode.ts @@ -370,40 +370,40 @@ type TreeViewNodesByType = { [T in TreeViewNodeTypes]: T extends 'branch' ? BranchNode : T extends 'commit' - ? CommitNode - : T extends 'commit-file' - ? CommitFileNode - : T extends 'compare-branch' - ? CompareBranchNode - : T extends 'compare-results' - ? CompareResultsNode - : T extends 'conflict-file' - ? MergeConflictFileNode - : T extends 'file-commit' - ? FileRevisionAsCommitNode - : T extends 'folder' - ? FolderNode - : T extends 'line-history-tracker' - ? LineHistoryTrackerNode - : T extends 'repository' - ? RepositoryNode - : T extends 'repo-folder' - ? RepositoryFolderNode - : T extends 'results-commits' - ? ResultsCommitsNode - : T extends 'results-file' - ? ResultsFileNode - : T extends 'stash' - ? StashNode - : T extends 'stash-file' - ? StashFileNode - : T extends 'status-file' - ? StatusFileNode - : T extends 'tag' - ? TagNode - : T extends 'uncommitted-file' - ? UncommittedFileNode - : ViewNode; + ? CommitNode + : T extends 'commit-file' + ? CommitFileNode + : T extends 'compare-branch' + ? CompareBranchNode + : T extends 'compare-results' + ? CompareResultsNode + : T extends 'conflict-file' + ? MergeConflictFileNode + : T extends 'file-commit' + ? FileRevisionAsCommitNode + : T extends 'folder' + ? FolderNode + : T extends 'line-history-tracker' + ? LineHistoryTrackerNode + : T extends 'repository' + ? RepositoryNode + : T extends 'repo-folder' + ? RepositoryFolderNode + : T extends 'results-commits' + ? ResultsCommitsNode + : T extends 'results-file' + ? ResultsFileNode + : T extends 'stash' + ? StashNode + : T extends 'stash-file' + ? StashFileNode + : T extends 'status-file' + ? StatusFileNode + : T extends 'tag' + ? TagNode + : T extends 'uncommitted-file' + ? UncommittedFileNode + : ViewNode; }; export function isViewNode(node: unknown): node is ViewNode; diff --git a/src/views/nodes/autolinkedItemNode.ts b/src/views/nodes/autolinkedItemNode.ts index 6a8be012e0a8a..4783556433440 100644 --- a/src/views/nodes/autolinkedItemNode.ts +++ b/src/views/nodes/autolinkedItemNode.ts @@ -56,10 +56,10 @@ export class AutolinkedItemNode extends ViewNode<'autolink', ViewsWithCommits> { pending ? 'loading~spin' : autolink.type == null - ? 'link' - : autolink.type === 'pullrequest' - ? 'git-pull-request' - : 'issues', + ? 'link' + : autolink.type === 'pullrequest' + ? 'git-pull-request' + : 'issues', ); item.contextValue = ContextValues.AutolinkedItem; item.tooltip = new MarkdownString( @@ -70,8 +70,8 @@ export class AutolinkedItemNode extends ViewNode<'autolink', ViewsWithCommits> { autolink.type == null ? 'Autolinked' : autolink.type === 'pullrequest' - ? 'Autolinked Pull Request' - : 'Autolinked Issue' + ? 'Autolinked Pull Request' + : 'Autolinked Issue' } ${autolink.prefix}${autolink.id}` } \\\n[${autolink.url}](${autolink.url}${autolink.title != null ? ` "${autolink.title}"` : ''})`, ); diff --git a/src/views/nodes/branchNode.ts b/src/views/nodes/branchNode.ts index f32a1b9641c9c..56b690e8f547b 100644 --- a/src/views/nodes/branchNode.ts +++ b/src/views/nodes/branchNode.ts @@ -500,11 +500,15 @@ export class BranchNode pendingPullRequest != null ? new ThemeIcon('loading~spin') : this.options.showAsCommits - ? new ThemeIcon('git-commit', color) - : { - dark: this.view.container.context.asAbsolutePath(`images/dark/icon-branch${iconSuffix}.svg`), - light: this.view.container.context.asAbsolutePath(`images/light/icon-branch${iconSuffix}.svg`), - }; + ? new ThemeIcon('git-commit', color) + : { + dark: this.view.container.context.asAbsolutePath( + `images/dark/icon-branch${iconSuffix}.svg`, + ), + light: this.view.container.context.asAbsolutePath( + `images/light/icon-branch${iconSuffix}.svg`, + ), + }; item.tooltip = tooltip; item.resourceUri = Uri.parse( `gitlens-view://branch/status/${await this.branch.getStatus()}${ diff --git a/src/views/nodes/commitNode.ts b/src/views/nodes/commitNode.ts index 95d27f909486f..70b35b55b70ef 100644 --- a/src/views/nodes/commitNode.ts +++ b/src/views/nodes/commitNode.ts @@ -188,10 +188,10 @@ export class CommitNode extends ViewRefNode<'commit', ViewsWithCommits | FileHis pendingPullRequest != null ? new ThemeIcon('loading~spin') : this.unpublished - ? new ThemeIcon('arrow-up', new ThemeColor('gitlens.unpublishedCommitIconColor' satisfies Colors)) - : this.view.config.avatars - ? await this.commit.getAvatarUri({ defaultStyle: configuration.get('defaultGravatarsStyle') }) - : undefined; + ? new ThemeIcon('arrow-up', new ThemeColor('gitlens.unpublishedCommitIconColor' satisfies Colors)) + : this.view.config.avatars + ? await this.commit.getAvatarUri({ defaultStyle: configuration.get('defaultGravatarsStyle') }) + : undefined; // item.tooltip = this.tooltip; return item; diff --git a/src/views/nodes/fileHistoryNode.ts b/src/views/nodes/fileHistoryNode.ts index a0b2147b18445..3df1d11931e35 100644 --- a/src/views/nodes/fileHistoryNode.ts +++ b/src/views/nodes/fileHistoryNode.ts @@ -129,12 +129,12 @@ export class FileHistoryNode }, ) : c.file != null - ? new FileRevisionAsCommitNode(this.view, this, c.file, c, { - branch: this.branch, - getBranchAndTagTips: getBranchAndTagTips, - unpublished: unpublishedCommits?.has(c.ref), - }) - : undefined, + ? new FileRevisionAsCommitNode(this.view, this, c.file, c, { + branch: this.branch, + getBranchAndTagTips: getBranchAndTagTips, + unpublished: unpublishedCommits?.has(c.ref), + }) + : undefined, ), this, ), diff --git a/src/views/nodes/fileRevisionAsCommitNode.ts b/src/views/nodes/fileRevisionAsCommitNode.ts index 96afcdd9db922..c5bcecb86bb55 100644 --- a/src/views/nodes/fileRevisionAsCommitNode.ts +++ b/src/views/nodes/fileRevisionAsCommitNode.ts @@ -139,8 +139,8 @@ export class FileRevisionAsCommitNode extends ViewRefFileNode< return this.commit.file?.hasConflicts ? `${ContextValues.File}+conflicted` : this.commit.isUncommittedStaged - ? `${ContextValues.File}+staged` - : `${ContextValues.File}+unstaged`; + ? `${ContextValues.File}+staged` + : `${ContextValues.File}+unstaged`; } override getCommand(): Command | undefined { diff --git a/src/views/nodes/remoteNode.ts b/src/views/nodes/remoteNode.ts index f3c4aadf71665..4eeec86a91831 100644 --- a/src/views/nodes/remoteNode.ts +++ b/src/views/nodes/remoteNode.ts @@ -92,11 +92,15 @@ export class RemoteNode extends ViewNode<'remote', ViewsWithRemotes> { provider.avatarUri != null && this.view.config.avatars ? provider.avatarUri : provider.icon === 'remote' - ? new ThemeIcon('cloud') - : { - dark: this.view.container.context.asAbsolutePath(`images/dark/icon-${provider.icon}.svg`), - light: this.view.container.context.asAbsolutePath(`images/light/icon-${provider.icon}.svg`), - }; + ? new ThemeIcon('cloud') + : { + dark: this.view.container.context.asAbsolutePath( + `images/dark/icon-${provider.icon}.svg`, + ), + light: this.view.container.context.asAbsolutePath( + `images/light/icon-${provider.icon}.svg`, + ), + }; if (provider.hasRichIntegration()) { const connected = provider.maybeConnected ?? (await provider.isConnected()); diff --git a/src/views/nodes/resultsCommitsNode.ts b/src/views/nodes/resultsCommitsNode.ts index ba866a46729df..3b349013076c2 100644 --- a/src/views/nodes/resultsCommitsNode.ts +++ b/src/views/nodes/resultsCommitsNode.ts @@ -156,8 +156,8 @@ export class ResultsCommitsNode { diff --git a/src/views/nodes/resultsFilesNode.ts b/src/views/nodes/resultsFilesNode.ts index 309e34f88d416..627516faf2e7e 100644 --- a/src/views/nodes/resultsFilesNode.ts +++ b/src/views/nodes/resultsFilesNode.ts @@ -156,8 +156,8 @@ export class ResultsFilesNode extends ViewNode<'results-files', ViewsWithCommits files == null || files.length === 0 ? TreeItemCollapsibleState.None : this._options.expand - ? TreeItemCollapsibleState.Expanded - : TreeItemCollapsibleState.Collapsed; + ? TreeItemCollapsibleState.Expanded + : TreeItemCollapsibleState.Collapsed; } } catch (ex) { if (ex instanceof PromiseCancelledError) { diff --git a/src/views/nodes/worktreeNode.ts b/src/views/nodes/worktreeNode.ts index 99459f9ffbc43..85a15fcd70bb5 100644 --- a/src/views/nodes/worktreeNode.ts +++ b/src/views/nodes/worktreeNode.ts @@ -202,8 +202,8 @@ export class WorktreeNode extends CacheableChildrenViewNode<'worktree', ViewsWit this.worktree.main ? `_Main${this.worktree.opened ? ', Active_' : '_'}` : this.worktree.opened - ? '_Active_' - : '' + ? '_Active_' + : '' } ` : ''; @@ -367,14 +367,14 @@ export class WorktreeNode extends CacheableChildrenViewNode<'worktree', ViewsWit pendingPullRequest != null ? new ThemeIcon('loading~spin') : this.worktree.opened - ? new ThemeIcon('check') - : icon; + ? new ThemeIcon('check') + : icon; item.tooltip = tooltip; item.resourceUri = missing ? Uri.parse('gitlens-view://worktree/missing') : hasChanges - ? Uri.parse('gitlens-view://worktree/changes') - : undefined; + ? Uri.parse('gitlens-view://worktree/changes') + : undefined; return item; } diff --git a/src/views/viewCommands.ts b/src/views/viewCommands.ts index 962c5132c5067..91ec0067446b0 100644 --- a/src/views/viewCommands.ts +++ b/src/views/viewCommands.ts @@ -417,8 +417,8 @@ export class ViewCommands { node instanceof ViewRefNode || node instanceof ViewRefFileNode ? node?.ref : node instanceof BranchTrackingStatusNode - ? node.branch - : undefined; + ? node.branch + : undefined; if (from == null) { const branch = await this.container.git.getBranch( node?.repoPath ?? this.container.git.getBestRepository()?.uri, @@ -467,8 +467,8 @@ export class ViewCommands { node instanceof ViewRefNode || node instanceof ViewRefFileNode ? node?.ref : node instanceof BranchTrackingStatusNode - ? node.branch - : undefined; + ? node.branch + : undefined; if (from == null) { const branch = await this.container.git.getBranch( node?.repoPath ?? this.container.git.getBestRepository()?.uri, diff --git a/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts b/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts index 39c6ac57590b9..61a39f23d49d4 100644 --- a/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts +++ b/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts @@ -264,8 +264,8 @@ export class GkPullRequestRow extends LitElement { aria-label="${this.isCurrentBranch ? 'Already on this branch' : this.hasWorktree - ? 'This branch has a worktree' - : 'Switch to Branch...'}" + ? 'This branch has a worktree' + : 'Switch to Branch...'}" @click="${this.onSwitchBranchClick}" > @@ -273,8 +273,8 @@ export class GkPullRequestRow extends LitElement { >${this.isCurrentBranch ? 'Already on this branch' : this.hasWorktree - ? 'This branch has a worktree' - : 'Switch to Branch...'} diff --git a/src/webviews/apps/plus/timeline/chart.ts b/src/webviews/apps/plus/timeline/chart.ts index 3f5195ed60f7d..2589b736134b0 100644 --- a/src/webviews/apps/plus/timeline/chart.ts +++ b/src/webviews/apps/plus/timeline/chart.ts @@ -339,8 +339,8 @@ export class TimelineChart implements Disposable { this.compact ? '' : typeof x === 'number' - ? x - : formatDate(x, this._shortDateFormat ?? 'short'), + ? x + : formatDate(x, this._shortDateFormat ?? 'short'), multiline: false, show: false, outer: !this.compact, diff --git a/src/webviews/apps/shared/components/list/file-change-list-item.ts b/src/webviews/apps/shared/components/list/file-change-list-item.ts index faa390ebe5e38..a246d1983acb7 100644 --- a/src/webviews/apps/shared/components/list/file-change-list-item.ts +++ b/src/webviews/apps/shared/components/list/file-change-list-item.ts @@ -169,40 +169,40 @@ export class FileChangeListItem extends LitElement { ` : !this.uncommitted - ? html` - - - - ${this.stash - ? nothing - : html` - - - - - - - `} - ` - : nothing} + ? html` + + + + ${this.stash + ? nothing + : html` + + + + + + + `} + ` + : nothing} `; diff --git a/src/webviews/webviewController.ts b/src/webviews/webviewController.ts index 93789f974b6a3..d4c6702318c91 100644 --- a/src/webviews/webviewController.ts +++ b/src/webviews/webviewController.ts @@ -40,8 +40,8 @@ function nextIpcId() { type GetParentType = T extends WebviewPanelDescriptor ? WebviewPanel : T extends WebviewViewDescriptor - ? WebviewView - : never; + ? WebviewView + : never; export type WebviewShowingArgs = T | [{ state: Partial }] | []; From 216e6f62e8054ed16e04017e31a2e6449d19b2f5 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 15 Nov 2023 12:14:58 -0500 Subject: [PATCH 0234/1012] Excludes fbccf24 from blames --- .git-blame-ignore-revs | 1 + 1 file changed, 1 insertion(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 58466c32b141a..28f97a2c07331 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -8,3 +8,4 @@ d790e9db047769de079f6838c3578f3a47bf5930 9c2df377d3e1842ed09eea5bb99be00edee9ca9c 444bf829156b3170c8b4b5156dcf10b06db83779 4dba4612670c0a942e3daa3e6a34a57aebe257ae +fbccf2428fd671378202de43ff99deff66168a13 From 05ad596a99e3552d87b3d8eef47182dec2532472 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 15 Nov 2023 12:21:17 -0500 Subject: [PATCH 0235/1012] Adds missing webpanel activations --- package.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 308bc0aaeaf80..35b3547a8318f 100644 --- a/package.json +++ b/package.json @@ -50,10 +50,12 @@ "activationEvents": [ "onAuthenticationRequest:gitlens-gitkraken", "onFileSystem:gitlens", - "onWebviewPanel:gitlens.welcome", - "onWebviewPanel:gitlens.settings", - "onWebviewPanel:gitlens.graph", "onWebviewPanel:gitlens.focus", + "onWebviewPanel:gitlens.graph", + "onWebviewPanel:gitlens.patchDetails", + "onWebviewPanel:gitlens.settings", + "onWebviewPanel:gitlens.timeline", + "onWebviewPanel:gitlens.welcome", "onStartupFinished" ], "capabilities": { From a0a68919fee9905418f63c6c7409c68e22b8ebcd Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Wed, 15 Nov 2023 11:56:25 -0700 Subject: [PATCH 0236/1012] Fixes cloud patch deep links requiring paid plan --- src/uris/deepLinks/deepLink.ts | 4 ++-- src/uris/deepLinks/deepLinkService.ts | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/uris/deepLinks/deepLink.ts b/src/uris/deepLinks/deepLink.ts index 5e8e7e9cbc4b8..47b08c4a7658a 100644 --- a/src/uris/deepLinks/deepLink.ts +++ b/src/uris/deepLinks/deepLink.ts @@ -15,8 +15,8 @@ export enum DeepLinkType { Workspace = 'workspace', } -export const AccountDeepLinkTypes = [DeepLinkType.Draft, DeepLinkType.Workspace]; -export const PaidDeepLinkTypes = []; +export const AccountDeepLinkTypes: DeepLinkType[] = [DeepLinkType.Draft, DeepLinkType.Workspace]; +export const PaidDeepLinkTypes: DeepLinkType[] = []; export function deepLinkTypeToString(type: DeepLinkType): string { switch (type) { diff --git a/src/uris/deepLinks/deepLinkService.ts b/src/uris/deepLinks/deepLinkService.ts index 6133961c9422b..1fff8870f9909 100644 --- a/src/uris/deepLinks/deepLinkService.ts +++ b/src/uris/deepLinks/deepLinkService.ts @@ -26,6 +26,7 @@ import { deepLinkStateTransitionTable, DeepLinkType, deepLinkTypeToString, + PaidDeepLinkTypes, parseDeepLinkUri, } from './deepLink'; @@ -458,7 +459,7 @@ export class DeepLinkService implements Disposable { message = 'No link type provided.'; break; } - if (!AccountDeepLinkTypes.includes(targetType)) { + if (!PaidDeepLinkTypes.includes(targetType)) { action = DeepLinkServiceAction.PlanCheckPassed; break; } From e6aa7c2d6ad93cccc4ddd91e4d9602568ab5ea50 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 15 Nov 2023 15:11:08 -0500 Subject: [PATCH 0237/1012] Adds protection --- src/trackers/documentTracker.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/trackers/documentTracker.ts b/src/trackers/documentTracker.ts index 7d1f3310a6be3..ebba25002023a 100644 --- a/src/trackers/documentTracker.ts +++ b/src/trackers/documentTracker.ts @@ -394,7 +394,9 @@ export class DocumentTracker implements Disposable { if (this._documentMap.size === 0) return; for await (const doc of this._documentMap.values()) { - const repoPath = doc.uri.repoPath!.toLocaleLowerCase(); + const repoPath = doc.uri.repoPath?.toLocaleLowerCase(); + if (repoPath == null) continue; + if (changed?.removedRepoPaths?.has(repoPath)) { void this.remove(doc.document, doc); } else if (changed == null || changed?.addedOrChangedRepoPaths?.has(repoPath)) { From a56f87c57f524095d36335dd8e5843d1bc6ddf48 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 15 Nov 2023 18:26:42 -0500 Subject: [PATCH 0238/1012] Fixes wrong char --- src/commands/switchMode.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/switchMode.ts b/src/commands/switchMode.ts index e19ba1f84bb26..b1dc705f1ca09 100644 --- a/src/commands/switchMode.ts +++ b/src/commands/switchMode.ts @@ -21,7 +21,7 @@ export class SwitchModeCommand extends Command { const pick = await showModePicker(); if (pick === undefined) return; - setLogScopeExit(scope, ` \u2014 mode=${pick.key ?? ''}`); + setLogScopeExit(scope, ` \u2022 mode=${pick.key ?? ''}`); const active = configuration.get('mode.active'); if (active === pick.key) return; From c9a9929fef1264961b64c07b4009917e301486f8 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 15 Nov 2023 18:27:02 -0500 Subject: [PATCH 0239/1012] Increases timeout since some requests can be slow --- src/webviews/webviewController.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webviews/webviewController.ts b/src/webviews/webviewController.ts index d4c6702318c91..040c7d177324c 100644 --- a/src/webviews/webviewController.ts +++ b/src/webviews/webviewController.ts @@ -580,7 +580,7 @@ export class WebviewController< debugger; setLogScopeExit(scope, undefined, 'TIMEDOUT'); resolve(false); - }, 5000); + }, 30000); }), ]); From be50f2b3ed41fe0c834147fdf86d8b3d5a9852d1 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 15 Nov 2023 18:26:24 -0500 Subject: [PATCH 0240/1012] Adds optional binary serialization to ipc messages - Improves performance on sending lots of data to the Graph --- src/plus/webviews/graph/protocol.ts | 8 +++- src/system/logger.scope.ts | 4 +- .../apps/commitDetails/commitDetails.ts | 7 +-- src/webviews/apps/home/home.ts | 8 +--- src/webviews/apps/plus/account/account.ts | 8 +--- src/webviews/apps/plus/focus/focus.ts | 7 ++- src/webviews/apps/plus/graph/graph.tsx | 40 ++++++++--------- .../apps/plus/patchDetails/patchDetails.ts | 7 +-- src/webviews/apps/plus/timeline/timeline.ts | 8 +--- src/webviews/apps/rebase/rebase.ts | 9 ++-- src/webviews/apps/settings/settings.ts | 8 +--- src/webviews/apps/shared/appBase.ts | 45 +++++++++++++++---- src/webviews/apps/welcome/welcome.ts | 8 +--- src/webviews/protocol.ts | 2 + src/webviews/webviewController.ts | 21 +++++++-- 15 files changed, 106 insertions(+), 84 deletions(-) diff --git a/src/plus/webviews/graph/protocol.ts b/src/plus/webviews/graph/protocol.ts index a5f6cd0263f2e..e3f07b98062da 100644 --- a/src/plus/webviews/graph/protocol.ts +++ b/src/plus/webviews/graph/protocol.ts @@ -309,7 +309,7 @@ export const UpdateSelectionCommandType = new IpcCommandType('graph/didChange', true); +export const DidChangeNotificationType = new IpcNotificationType('graph/didChange', true, true); export interface DidChangeGraphConfigurationParams { config: GraphComponentConfig; @@ -387,7 +387,11 @@ export interface DidChangeRowsParams { rowsStatsLoading: boolean; selectedRows?: GraphSelectedRows; } -export const DidChangeRowsNotificationType = new IpcNotificationType('graph/rows/didChange'); +export const DidChangeRowsNotificationType = new IpcNotificationType( + 'graph/rows/didChange', + undefined, + true, +); export interface DidChangeRowsStatsParams { rowsStats: Record; diff --git a/src/system/logger.scope.ts b/src/system/logger.scope.ts index 95d746af094a9..48e55b0243e2d 100644 --- a/src/system/logger.scope.ts +++ b/src/system/logger.scope.ts @@ -18,7 +18,9 @@ export function getLogScope(): LogScope | undefined { return scopes.get(scopeCounter); } -export function getNewLogScope(prefix: string): LogScope { +export function getNewLogScope(prefix: string, scope?: LogScope | undefined): LogScope { + if (scope != null) return { scopeId: scope.scopeId, prefix: `${scope.prefix}${prefix}` }; + const scopeId = getNextLogScopeId(); return { scopeId: scopeId, diff --git a/src/webviews/apps/commitDetails/commitDetails.ts b/src/webviews/apps/commitDetails/commitDetails.ts index 40526fc1a4ea2..f8be93a08c9b7 100644 --- a/src/webviews/apps/commitDetails/commitDetails.ts +++ b/src/webviews/apps/commitDetails/commitDetails.ts @@ -105,10 +105,7 @@ export class CommitDetailsApp extends App> { return disposables; } - protected override onMessageReceived(e: MessageEvent) { - const msg = e.data as IpcMessage; - this.log(`onMessageReceived(${msg.id}): name=${msg.method}`); - + protected override onMessageReceived(msg: IpcMessage) { switch (msg.method) { // case DidChangeRichStateNotificationType.method: // onIpc(DidChangeRichStateNotificationType, msg, params => { @@ -152,7 +149,7 @@ export class CommitDetailsApp extends App> { break; default: - super.onMessageReceived?.(e); + super.onMessageReceived?.(msg); } } diff --git a/src/webviews/apps/home/home.ts b/src/webviews/apps/home/home.ts index 349b65fbf2868..e3145bc55cb65 100644 --- a/src/webviews/apps/home/home.ts +++ b/src/webviews/apps/home/home.ts @@ -38,13 +38,9 @@ export class HomeApp extends App { return disposables; } - protected override onMessageReceived(e: MessageEvent) { - const msg = e.data as IpcMessage; - + protected override onMessageReceived(msg: IpcMessage) { switch (msg.method) { case DidChangeRepositoriesType.method: - this.log(`onMessageReceived(${msg.id}): name=${msg.method}`); - onIpc(DidChangeRepositoriesType, msg, params => { this.state.repositories = params; this.state.timestamp = Date.now(); @@ -53,7 +49,7 @@ export class HomeApp extends App { }); break; default: - super.onMessageReceived?.(e); + super.onMessageReceived?.(msg); break; } } diff --git a/src/webviews/apps/plus/account/account.ts b/src/webviews/apps/plus/account/account.ts index 74fc3d99493ae..cecc557358586 100644 --- a/src/webviews/apps/plus/account/account.ts +++ b/src/webviews/apps/plus/account/account.ts @@ -31,13 +31,9 @@ export class AccountApp extends App { return disposables; } - protected override onMessageReceived(e: MessageEvent) { - const msg = e.data as IpcMessage; - + protected override onMessageReceived(msg: IpcMessage) { switch (msg.method) { case DidChangeSubscriptionNotificationType.method: - this.log(`onMessageReceived(${msg.id}): name=${msg.method}`); - onIpc(DidChangeSubscriptionNotificationType, msg, params => { this.state.subscription = params.subscription; this.state.avatar = params.avatar; @@ -48,7 +44,7 @@ export class AccountApp extends App { break; default: - super.onMessageReceived?.(e); + super.onMessageReceived?.(msg); break; } } diff --git a/src/webviews/apps/plus/focus/focus.ts b/src/webviews/apps/plus/focus/focus.ts index dbe34377a7038..6a9b2bde89589 100644 --- a/src/webviews/apps/plus/focus/focus.ts +++ b/src/webviews/apps/plus/focus/focus.ts @@ -118,10 +118,7 @@ export class FocusApp extends App { } } - protected override onMessageReceived(e: MessageEvent) { - const msg = e.data as IpcMessage; - this.log(`onMessageReceived(${msg.id}): name=${msg.method}`); - + protected override onMessageReceived(msg: IpcMessage) { switch (msg.method) { case DidChangeNotificationType.method: onIpc(DidChangeNotificationType, msg, params => { @@ -130,6 +127,8 @@ export class FocusApp extends App { this.attachState(); }); break; + default: + super.onMessageReceived?.(msg); } } } diff --git a/src/webviews/apps/plus/graph/graph.tsx b/src/webviews/apps/plus/graph/graph.tsx index 5286b96494fb6..fdee004469991 100644 --- a/src/webviews/apps/plus/graph/graph.tsx +++ b/src/webviews/apps/plus/graph/graph.tsx @@ -51,7 +51,9 @@ import { UpdateSelectionCommandType, } from '../../../../plus/webviews/graph/protocol'; import { Color, darken, getCssVariable, lighten, mix, opacity } from '../../../../system/color'; +import { debug } from '../../../../system/decorators/log'; import { debounce } from '../../../../system/function'; +import { getLogScope, setLogScopeExit } from '../../../../system/logger.scope'; import type { IpcMessage, IpcNotificationType } from '../../../protocol'; import { onIpc } from '../../../protocol'; import { App } from '../../shared/appBase'; @@ -73,7 +75,7 @@ const graphLaneThemeColors = new Map([ ]); export class GraphApp extends App { - private callback?: UpdateStateCallback; + private updateStateCallback?: UpdateStateCallback; constructor() { super('GraphApp'); @@ -93,7 +95,7 @@ export class GraphApp extends App { this.registerEvents(callback)} + subscriber={(updateState: UpdateStateCallback) => this.registerUpdateStateCallback(updateState)} onColumnsChange={debounce( settings => this.onColumnsChanged(settings), 250, @@ -139,14 +141,13 @@ export class GraphApp extends App { // } // } - protected override onMessageReceived(e: MessageEvent) { - const msg = e.data as IpcMessage; - this.log(`onMessageReceived(${msg.id}): name=${msg.method}`); + protected override onMessageReceived(msg: IpcMessage) { + const scope = getLogScope(); switch (msg.method) { case DidChangeNotificationType.method: onIpc(DidChangeNotificationType, msg, (params, type) => { - this.setState({ ...this.state, ...params.state }, type); + this.setState({ ...this.state, ...params }, type); }); break; @@ -215,7 +216,8 @@ export class GraphApp extends App { const newRowsLength = params.rows.length; this.log( - `onMessageReceived(${msg.id}:${msg.method}): paging in ${newRowsLength} rows into existing ${previousRowsLength} rows at ${params.paging.startingCursor} (last existing row: ${lastId})`, + scope, + `paging in ${newRowsLength} rows into existing ${previousRowsLength} rows at ${params.paging.startingCursor} (last existing row: ${lastId})`, ); rows = []; @@ -223,18 +225,14 @@ export class GraphApp extends App { rows.length = previousRowsLength + newRowsLength; if (params.paging.startingCursor !== lastId) { - this.log( - `onMessageReceived(${msg.id}:${msg.method}): searching for ${params.paging.startingCursor} in existing rows`, - ); + this.log(scope, `searching for ${params.paging.startingCursor} in existing rows`); let i = 0; let row; for (row of previousRows) { rows[i++] = row; if (row.sha === params.paging.startingCursor) { - this.log( - `onMessageReceived(${msg.id}:${msg.method}): found ${params.paging.startingCursor} in existing rows`, - ); + this.log(scope, `found ${params.paging.startingCursor} in existing rows`); previousRowsLength = i; @@ -256,7 +254,7 @@ export class GraphApp extends App { rows[previousRowsLength + i] = params.rows[i]; } } else { - this.log(`onMessageReceived(${msg.id}:${msg.method}): setting to ${params.rows.length} rows`); + this.log(scope, `setting to ${params.rows.length} rows`); if (params.rows.length === 0) { rows = this.state.rows; @@ -281,6 +279,8 @@ export class GraphApp extends App { } this.state.loading = false; this.setState(this.state, type); + + setLogScopeExit(scope, ` \u2022 rows=${this.state.rows?.length ?? 0}`); }); break; @@ -339,7 +339,7 @@ export class GraphApp extends App { break; default: - super.onMessageReceived?.(e); + super.onMessageReceived?.(msg); } } @@ -474,14 +474,14 @@ export class GraphApp extends App { this.setState(this.state, 'didChangeTheme'); } + @debug({ args: false, singleLine: true }) protected override setState(state: State, type?: IpcNotificationType | InternalNotificationType) { - this.log(`setState()`); const themingChanged = this.ensureTheming(state); this.state = state; super.setState({ timestamp: state.timestamp, selectedRepository: state.selectedRepository }); - this.callback?.(this.state, type, themingChanged); + this.updateStateCallback?.(this.state, type, themingChanged); } private ensureTheming(state: State): boolean { @@ -691,11 +691,11 @@ export class GraphApp extends App { }); } - private registerEvents(callback: UpdateStateCallback): () => void { - this.callback = callback; + private registerUpdateStateCallback(updateState: UpdateStateCallback): () => void { + this.updateStateCallback = updateState; return () => { - this.callback = undefined; + this.updateStateCallback = undefined; }; } } diff --git a/src/webviews/apps/plus/patchDetails/patchDetails.ts b/src/webviews/apps/plus/patchDetails/patchDetails.ts index f3a9a682199f8..09da58735b1dc 100644 --- a/src/webviews/apps/plus/patchDetails/patchDetails.ts +++ b/src/webviews/apps/plus/patchDetails/patchDetails.ts @@ -135,10 +135,7 @@ export class PatchDetailsApp extends App> { return disposables; } - protected override onMessageReceived(e: MessageEvent) { - const msg = e.data as IpcMessage; - this.log(`onMessageReceived(${msg.id}): name=${msg.method}`); - + protected override onMessageReceived(msg: IpcMessage) { switch (msg.method) { // case DidChangeRichStateNotificationType.method: // onIpc(DidChangeRichStateNotificationType, msg, params => { @@ -222,7 +219,7 @@ export class PatchDetailsApp extends App> { break; default: - super.onMessageReceived?.(e); + super.onMessageReceived?.(msg); } } diff --git a/src/webviews/apps/plus/timeline/timeline.ts b/src/webviews/apps/plus/timeline/timeline.ts index a0978119ffd41..9c656aefddf95 100644 --- a/src/webviews/apps/plus/timeline/timeline.ts +++ b/src/webviews/apps/plus/timeline/timeline.ts @@ -48,13 +48,9 @@ export class TimelineApp extends App { return disposables; } - protected override onMessageReceived(e: MessageEvent) { - const msg = e.data as IpcMessage; - + protected override onMessageReceived(msg: IpcMessage) { switch (msg.method) { case DidChangeNotificationType.method: - this.log(`onMessageReceived(${msg.id}): name=${msg.method}`); - onIpc(DidChangeNotificationType, msg, params => { this.state = params.state; this.setState(this.state); @@ -63,7 +59,7 @@ export class TimelineApp extends App { break; default: - super.onMessageReceived?.(e); + super.onMessageReceived?.(msg); } } diff --git a/src/webviews/apps/rebase/rebase.ts b/src/webviews/apps/rebase/rebase.ts index 4ed4df5adde09..193d4281dccde 100644 --- a/src/webviews/apps/rebase/rebase.ts +++ b/src/webviews/apps/rebase/rebase.ts @@ -1,6 +1,7 @@ /*global document window*/ import './rebase.scss'; import Sortable from 'sortablejs'; +import type { IpcMessage } from '../../protocol'; import { onIpc } from '../../protocol'; import type { RebaseEntry, RebaseEntryAction, State } from '../../rebase/protocol'; import { @@ -318,13 +319,9 @@ class RebaseEditor extends App { }); } - protected override onMessageReceived(e: MessageEvent) { - const msg = e.data; - + protected override onMessageReceived(msg: IpcMessage) { switch (msg.method) { case DidChangeNotificationType.method: - this.log(`onMessageReceived(${msg.id}): name=${msg.method}`); - onIpc(DidChangeNotificationType, msg, params => { this.state = params.state; this.setState(this.state); @@ -333,7 +330,7 @@ class RebaseEditor extends App { break; default: - super.onMessageReceived?.(e); + super.onMessageReceived?.(msg); } } diff --git a/src/webviews/apps/settings/settings.ts b/src/webviews/apps/settings/settings.ts index f70f186b686bb..2fae79ca789ee 100644 --- a/src/webviews/apps/settings/settings.ts +++ b/src/webviews/apps/settings/settings.ts @@ -133,11 +133,7 @@ export class SettingsApp extends App { return disposables; } - protected override onMessageReceived(e: MessageEvent) { - const msg = e.data as IpcMessage; - - this.log(`onMessageReceived(${msg.id}): name=${msg.method}`); - + protected override onMessageReceived(msg: IpcMessage) { switch (msg.method) { case DidOpenAnchorNotificationType.method: { onIpc(DidOpenAnchorNotificationType, msg, params => { @@ -157,7 +153,7 @@ export class SettingsApp extends App { break; default: - super.onMessageReceived?.(e); + super.onMessageReceived?.(msg); } } diff --git a/src/webviews/apps/shared/appBase.ts b/src/webviews/apps/shared/appBase.ts index 3ee4b29f9eca5..90e8a7c5271fc 100644 --- a/src/webviews/apps/shared/appBase.ts +++ b/src/webviews/apps/shared/appBase.ts @@ -1,7 +1,11 @@ /*global window document*/ import type { CustomEditorIds, WebviewIds, WebviewViewIds } from '../../../constants'; +import { debug } from '../../../system/decorators/log'; import { debounce } from '../../../system/function'; import { Logger } from '../../../system/logger'; +import type { LogScope } from '../../../system/logger.scope'; +import { getLogScope, getNewLogScope } from '../../../system/logger.scope'; +import { maybeStopWatch } from '../../../system/stopwatch'; import type { IpcCommandType, IpcMessage, @@ -38,6 +42,8 @@ function nextIpcId() { return `webview:${ipcSequence}`; } +const textDecoder = new TextDecoder(); + export abstract class App< State extends { webviewId: CustomEditorIds | WebviewIds | WebviewViewIds; timestamp: number } = { webviewId: CustomEditorIds | WebviewIds | WebviewViewIds; @@ -77,7 +83,7 @@ export abstract class App< DEBUG ? 'debug' : 'off', ); - this.log(`ctor()`); + this.log(`${appName}()`); // this.log(`ctor(${this.state ? JSON.stringify(this.state) : ''})`); this._api = acquireVsCodeApi(); @@ -93,14 +99,14 @@ export abstract class App< disposables.push(watchThemeColors()); requestAnimationFrame(() => { - this.log(`ctor(): initializing...`); + this.log(`${appName}(): initializing...`); try { this.onInitialize?.(); this.bind(); if (this.onMessageReceived != null) { - disposables.push(DOM.on(window, 'message', this.onMessageReceived.bind(this))); + disposables.push(DOM.on(window, 'message', e => this.onMessageReceivedCore(e))); } this.sendCommand(WebviewReadyCommandType, undefined); @@ -127,9 +133,26 @@ export abstract class App< protected onInitialize?(): void; protected onBind?(): Disposable[]; protected onInitialized?(): void; - protected onMessageReceived?(e: MessageEvent): void; + protected onMessageReceived?(msg: IpcMessage): void; protected onThemeUpdated?(e: ThemeChangeEvent): void; + @debug({ args: { 0: e => `${e.data.id}, method=${e.data.method}` } }) + private onMessageReceivedCore(e: MessageEvent) { + const scope = getLogScope(); + + const msg = e.data as IpcMessage; + if (msg.packed && msg.params instanceof Uint8Array) { + const sw = maybeStopWatch(getNewLogScope(` deserializing msg=${e.data.method}`, scope), { + log: false, + logLevel: 'debug', + }); + msg.params = JSON.parse(textDecoder.decode(msg.params)); + sw?.stop(); + } + + this.onMessageReceived!(msg); + } + private _focused?: boolean; private _inputFocused?: boolean; @@ -166,8 +189,14 @@ export abstract class App< ); } - protected log(message: string, ...optionalParams: any[]) { - Logger.log(message, ...optionalParams); + protected log(message: string, ...optionalParams: any[]): void; + protected log(scope: LogScope | undefined, message: string, ...optionalParams: any[]): void; + protected log(scopeOrMessage: LogScope | string | undefined, ...optionalParams: any[]): void { + if (typeof scopeOrMessage === 'string') { + Logger.log(scopeOrMessage, ...optionalParams); + } else { + Logger.log(scopeOrMessage, optionalParams.shift(), ...optionalParams); + } } protected getState(): State | undefined { @@ -179,7 +208,7 @@ export abstract class App< params: IpcMessageParams, ): void { const id = nextIpcId(); - this.log(`sendCommand(${id}): name=${command.method}`); + this.log(`${this.appName}.sendCommand(${id}): name=${command.method}`); this.postMessage({ id: id, method: command.method, params: params }); } @@ -193,7 +222,7 @@ export abstract class App< completion: TCompletion, ): Promise> { const id = nextIpcId(); - this.log(`sendCommandWithCompletion(${id}): name=${command.method}`); + this.log(`${this.appName}.sendCommandWithCompletion(${id}): name=${command.method}`); const promise = new Promise>((resolve, reject) => { let timeout: ReturnType | undefined; diff --git a/src/webviews/apps/welcome/welcome.ts b/src/webviews/apps/welcome/welcome.ts index da127c4053c74..523bbc78e97b7 100644 --- a/src/webviews/apps/welcome/welcome.ts +++ b/src/webviews/apps/welcome/welcome.ts @@ -41,13 +41,9 @@ export class WelcomeApp extends App { return disposables; } - protected override onMessageReceived(e: MessageEvent) { - const msg = e.data as IpcMessage; - + protected override onMessageReceived(msg: IpcMessage) { switch (msg.method) { case DidChangeNotificationType.method: - this.log(`onMessageReceived(${msg.id}): name=${msg.method}`); - onIpc(DidChangeNotificationType, msg, params => { this.state = params.state; this.setState(this.state); @@ -55,7 +51,7 @@ export class WelcomeApp extends App { }); break; default: - super.onMessageReceived?.(e); + super.onMessageReceived?.(msg); break; } } diff --git a/src/webviews/protocol.ts b/src/webviews/protocol.ts index c91235e320675..178dc11f0055f 100644 --- a/src/webviews/protocol.ts +++ b/src/webviews/protocol.ts @@ -5,6 +5,7 @@ import type { ConfigPath, ConfigPathValue, Path, PathValue } from '../system/con export interface IpcMessage { id: string; method: string; + packed?: boolean; params?: unknown; completionId?: string; } @@ -14,6 +15,7 @@ abstract class IpcMessageType { constructor( public readonly method: string, public readonly reset: boolean = false, + public readonly pack: boolean = false, ) {} } export type IpcMessageParams = T extends IpcMessageType ? P : never; diff --git a/src/webviews/webviewController.ts b/src/webviews/webviewController.ts index 040c7d177324c..1b89a40cf494a 100644 --- a/src/webviews/webviewController.ts +++ b/src/webviews/webviewController.ts @@ -9,8 +9,9 @@ import { setContext } from '../system/context'; import { debug, logName } from '../system/decorators/log'; import { serialize } from '../system/decorators/serialize'; import { Logger } from '../system/logger'; -import { getLogScope, setLogScopeExit } from '../system/logger.scope'; +import { getLogScope, getNewLogScope, setLogScopeExit } from '../system/logger.scope'; import { isPromise } from '../system/promise'; +import { maybeStopWatch } from '../system/stopwatch'; import type { WebviewContext } from '../system/webview'; import type { IpcMessage, @@ -25,6 +26,7 @@ import type { WebviewPanelDescriptor, WebviewShowOptions, WebviewViewDescriptor const maxSmallIntegerV8 = 2 ** 30; // Max number that can be stored in V8's smis (small integers) const utf8TextDecoder = new TextDecoder('utf8'); +const utf8TextEncoder = new TextEncoder(); let ipcSequence = 0; function nextIpcId() { @@ -385,7 +387,7 @@ export class WebviewController< } @debug['onMessageReceivedCore']>({ - args: { 0: e => (e != null ? `${e.id}: method=${e.method}` : '') }, + args: { 0: e => (e != null ? `${e.id}, method=${e.method}` : '') }, }) private onMessageReceivedCore(e: IpcMessage) { if (e == null) return; @@ -534,10 +536,23 @@ export class WebviewController< params: IpcMessageParams, completionId?: string, ): Promise { + let packed; + if (type.pack && params != null) { + const scope = getLogScope(); + + const sw = maybeStopWatch(getNewLogScope(` serializing msg=${type.method}`, scope), { + log: false, + logLevel: 'debug', + }); + packed = utf8TextEncoder.encode(JSON.stringify(params)); + sw?.stop(); + } + const msg: IpcMessage = { id: this.nextIpcId(), method: type.method, - params: params, + params: packed ?? params, + packed: packed != null, completionId: completionId, }; From 1eb9f49904c81b9915c6e7502ea999362771ef0e Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 15 Nov 2023 23:14:32 -0500 Subject: [PATCH 0241/1012] Fixes #3018 escapes () in markdown command links --- CHANGELOG.md | 4 ++++ src/commands/base.ts | 3 ++- src/git/formatters/commitFormatter.ts | 3 ++- src/git/models/reference.ts | 6 +++--- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc148d942ba81..32092bc2aee14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Refines AI prompts to provide better commit message generation and explanation results +### Fixed + +- Fixes [#3018](https://github.com/gitkraken/vscode-gitlens/issues/3018) - Line blame overlay is broken when commit message contains a `)` + ## [14.5.0] - 2023-11-13 ### Added diff --git a/src/commands/base.ts b/src/commands/base.ts index f695b2d0021ae..b60d1aede3952 100644 --- a/src/commands/base.ts +++ b/src/commands/base.ts @@ -285,7 +285,8 @@ export abstract class Command implements Disposable { command: Commands | `${Commands.ActionPrefix}${ActionContext['type']}`, args: T, ): string { - return `command:${command}?${encodeURIComponent(JSON.stringify(args))}`; + // Since we are using the command in a markdown link, we need to escape ()'s so they don't get interpreted as markdown + return `command:${command}?${encodeURIComponent(JSON.stringify(args)).replace(/([()])/g, '\\$1')}`; } protected readonly contextParsingOptions: CommandContextParsingOptions = { expectsEditor: false }; diff --git a/src/git/formatters/commitFormatter.ts b/src/git/formatters/commitFormatter.ts index 370e228c9561d..27608fb126b32 100644 --- a/src/git/formatters/commitFormatter.ts +++ b/src/git/formatters/commitFormatter.ts @@ -438,7 +438,8 @@ export class CommitFormatter extends Formatter { if (arePlusFeaturesEnabled()) { commands += `  [$(gitlens-graph)](${Command.getMarkdownCommandArgsCore( Commands.ShowInCommitGraph, - { ref: getReferenceFromRevision(this._item) }, + // Avoid including the message here, it just bloats the command url + { ref: getReferenceFromRevision(this._item, { excludeMessage: true }) }, )} "Open in Commit Graph")`; } diff --git a/src/git/models/reference.ts b/src/git/models/reference.ts index b6cab92dd6a5b..43fa67a57a4ad 100644 --- a/src/git/models/reference.ts +++ b/src/git/models/reference.ts @@ -233,20 +233,20 @@ export function getReferenceFromBranch(branch: GitBranchReference) { }); } -export function getReferenceFromRevision(revision: GitRevisionReference) { +export function getReferenceFromRevision(revision: GitRevisionReference, options?: { excludeMessage?: boolean }) { if (revision.refType === 'stash') { return createReference(revision.ref, revision.repoPath, { refType: revision.refType, name: revision.name, number: revision.number, - message: revision.message, + message: options?.excludeMessage ? undefined : revision.message, }); } return createReference(revision.ref, revision.repoPath, { refType: revision.refType, name: revision.name, - message: revision.message, + message: options?.excludeMessage ? undefined : revision.message, }); } From 7a534db6dcb53a0131b551957a8f2c2137063c35 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 15 Nov 2023 23:15:19 -0500 Subject: [PATCH 0242/1012] Updates CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32092bc2aee14..67d10b9b68a73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Changed +- Improves the performance of the _Commit Graph_ when loading a large number of commits - Refines AI prompts to provide better commit message generation and explanation results ### Fixed From 7346bde3f1e84eab0645543d0ecb37b0c22e48f7 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Thu, 16 Nov 2023 00:08:53 -0500 Subject: [PATCH 0243/1012] Slims lint rules & switches to bundler module res --- .eslintrc.base.json | 42 ++++++++++++++++++------------ package.json | 1 + src/test/suite/system/trie.test.ts | 1 - src/webviews/apps/.eslintrc.json | 9 ------- tsconfig.base.json | 2 +- 5 files changed, 27 insertions(+), 28 deletions(-) diff --git a/.eslintrc.base.json b/.eslintrc.base.json index 5427199841601..83577746fc704 100644 --- a/.eslintrc.base.json +++ b/.eslintrc.base.json @@ -5,7 +5,6 @@ "extends": [ "eslint:recommended", "plugin:@typescript-eslint/strict-type-checked", - "plugin:@typescript-eslint/stylistic-type-checked", "plugin:import/recommended", "plugin:import/typescript", "prettier" @@ -24,25 +23,17 @@ "root": true, "rules": { "anti-trojan-source/no-bidi": "error", - "arrow-parens": ["off"], - "brace-style": ["off", "stroustrup"], - "consistent-return": "off", - "curly": ["error", "multi-line", "consistent"], - "eol-last": "error", - "linebreak-style": ["error", "unix"], - "new-parens": "error", - "no-console": "off", "no-constant-condition": ["warn", { "checkLoops": false }], "no-constant-binary-expression": "error", "no-caller": "error", "no-debugger": "off", - "no-dupe-class-members": "off", "no-else-return": "warn", "no-empty": ["warn", { "allowEmptyCatch": true }], "no-eval": "error", "no-ex-assign": "warn", "no-extend-native": "error", "no-extra-bind": "error", + "no-extra-semi": "off", "no-floating-decimal": "error", "no-implicit-coercion": "error", "no-implied-eval": "error", @@ -50,7 +41,7 @@ "no-lone-blocks": "error", "no-lonely-if": "error", "no-loop-func": "error", - "no-multi-spaces": "error", + "no-mixed-spaces-and-tabs": "off", "no-restricted-globals": ["error", "process"], "no-restricted-imports": [ "error", @@ -98,8 +89,13 @@ "message": "Use @env/ instead" }, { - "group": ["src/**/*"], + "group": ["src/*"], "message": "Use relative paths instead" + }, + { + "group": ["react-dom"], + "importNames": ["Container"], + "message": "Use our Container instead" } ] } @@ -138,10 +134,7 @@ "prefer-rest-params": "error", "prefer-spread": "error", "prefer-template": "error", - "quotes": ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": true }], "require-atomic-updates": "off", - "semi": ["error", "always"], - "semi-style": ["error", "last"], "sort-imports": [ "error", { @@ -153,7 +146,7 @@ ], "yoda": "error", "import/consistent-type-specifier-style": ["error", "prefer-top-level"], - "import/extensions": ["error", "never"], + "import/extensions": "off", "import/newline-after-import": "warn", "import/no-absolute-path": "error", "import/no-cycle": "off", @@ -326,7 +319,22 @@ { "files": ["src/env/node/**/*"], "rules": { - "no-restricted-imports": "off" + "no-restricted-imports": [ + "error", + { + "patterns": [ + { + "group": ["src/*"], + "message": "Use relative paths instead" + }, + { + "group": ["react-dom"], + "importNames": ["Container"], + "message": "Use our Container instead" + } + ] + } + ] } } ] diff --git a/package.json b/package.json index 35b3547a8318f..3b90398bbad12 100644 --- a/package.json +++ b/package.json @@ -15739,6 +15739,7 @@ "patch-pre": "node ./scripts/applyPreReleasePatch.js", "prep-release": "node ./scripts/prep-release.js", "pretty": "prettier --config .prettierrc --log-level warn --write .", + "pretty:check": "prettier --config .prettierrc --check .", "pub": "vsce publish --yarn", "pub-pre": "vsce publish --yarn --pre-release", "rebuild": "yarn run reset && yarn run build", diff --git a/src/test/suite/system/trie.test.ts b/src/test/suite/system/trie.test.ts index 70867e0f662da..73e95b903419f 100644 --- a/src/test/suite/system/trie.test.ts +++ b/src/test/suite/system/trie.test.ts @@ -5,7 +5,6 @@ import { isLinux } from '../../../env/node/platform'; import { normalizeRepoUri } from '../../../repositories'; import type { UriEntry } from '../../../system/trie'; import { PathEntryTrie, UriEntryTrie, UriTrie } from '../../../system/trie'; -// eslint-disable-next-line import/extensions import paths from './paths.json'; describe('PathEntryTrie Test Suite', () => { diff --git a/src/webviews/apps/.eslintrc.json b/src/webviews/apps/.eslintrc.json index b2ea94ebb0f79..db4dddde1ba60 100644 --- a/src/webviews/apps/.eslintrc.json +++ b/src/webviews/apps/.eslintrc.json @@ -3,15 +3,6 @@ "env": { "browser": true }, - "rules": { - "import/extensions": [ - "error", - "never", - { - "js": "always" - } - ] - }, "parserOptions": { "project": "src/webviews/apps/tsconfig.json" }, diff --git a/tsconfig.base.json b/tsconfig.base.json index 4c5295e11e13b..31cd77e086c98 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -8,7 +8,7 @@ "isolatedModules": true, "lib": ["es2022", "esnext.disposable"], "module": "esnext", - "moduleResolution": "node", + "moduleResolution": "Bundler", "noFallthroughCasesInSwitch": true, "noImplicitOverride": true, "noImplicitReturns": true, From 021dbdc719d432023a9c0ac339c2f5f702843317 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Thu, 16 Nov 2023 10:13:34 -0700 Subject: [PATCH 0244/1012] Fixes provider typing in cloud workspace model --- src/plus/workspaces/models.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plus/workspaces/models.ts b/src/plus/workspaces/models.ts index 74b4391238bf4..564ec8dcc46ac 100644 --- a/src/plus/workspaces/models.ts +++ b/src/plus/workspaces/models.ts @@ -1,7 +1,6 @@ import type { Disposable } from '../../api/gitlens'; import type { Container } from '../../container'; import type { Repository } from '../../git/models/repository'; -import type { GkProviderId } from '../../gk/models/repositoryIdentities'; export type WorkspaceType = 'cloud' | 'local'; export type WorkspaceAutoAddSetting = 'disabled' | 'enabled' | 'prompt'; @@ -150,7 +149,7 @@ export interface CloudWorkspaceRepositoryDescriptor { name: string; description: string; repository_id: string; - provider: GkProviderId | null; + provider: CloudWorkspaceProviderType | null; provider_project_name: string | null; provider_organization_id: string; provider_organization_name: string | null; @@ -318,7 +317,7 @@ export interface CloudWorkspaceRepositoryData { name: string; description: string; repository_id: string; - provider: GkProviderId | null; + provider: CloudWorkspaceProviderType | null; provider_project_name: string | null; provider_organization_id: string; provider_organization_name: string | null; From 81c0a12e3a39c791278fa86a410ce0530c6d8a6d Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Thu, 16 Nov 2023 12:35:40 -0500 Subject: [PATCH 0245/1012] Fixes #2625 unescapes markdown for url --- CHANGELOG.md | 1 + src/git/remotes/github.ts | 6 ++++-- src/git/remotes/gitlab.ts | 6 ++++-- src/system/string.ts | 14 ++++++++++++++ 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67d10b9b68a73..993438dc7b920 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Fixed - Fixes [#3018](https://github.com/gitkraken/vscode-gitlens/issues/3018) - Line blame overlay is broken when commit message contains a `)` +- Fixes [#2625](https://github.com/gitkraken/vscode-gitlens/issues/2625) - full issue ref has escape characters that break hover links ## [14.5.0] - 2023-11-13 diff --git a/src/git/remotes/github.ts b/src/git/remotes/github.ts index cab81987087bf..1edc7b78cbf29 100644 --- a/src/git/remotes/github.ts +++ b/src/git/remotes/github.ts @@ -14,7 +14,7 @@ import { fromNow } from '../../system/date'; import { log } from '../../system/decorators/log'; import { memoize } from '../../system/decorators/memoize'; import { encodeUrl } from '../../system/encoding'; -import { equalsIgnoreCase, escapeMarkdown } from '../../system/string'; +import { equalsIgnoreCase, escapeMarkdown, unescapeMarkdown } from '../../system/string'; import { supportedInVSCodeVersion } from '../../system/utils'; import type { Account } from '../models/author'; import type { DefaultBranch } from '../models/defaultBranch'; @@ -97,7 +97,9 @@ export class GitHubRemote extends RichRemoteProvider return outputFormat === 'plaintext' ? text : text.replace(autolinkFullIssuesRegex, (linkText: string, repo: string, num: string) => { - const url = encodeUrl(`${this.protocol}://${this.domain}/${repo}/issues/${num}`); + const url = encodeUrl( + `${this.protocol}://${this.domain}/${unescapeMarkdown(repo)}/issues/${num}`, + ); const title = ` "Open Issue or Pull Request #${num} from ${repo} on ${this.name}"`; const token = `\x00${tokenMapping.size}\x00`; diff --git a/src/git/remotes/gitlab.ts b/src/git/remotes/gitlab.ts index 55ef6ab86e680..2550889e831ff 100644 --- a/src/git/remotes/gitlab.ts +++ b/src/git/remotes/gitlab.ts @@ -13,7 +13,7 @@ import type { Brand, Unbrand } from '../../system/brand'; import { fromNow } from '../../system/date'; import { log } from '../../system/decorators/log'; import { encodeUrl } from '../../system/encoding'; -import { equalsIgnoreCase, escapeMarkdown } from '../../system/string'; +import { equalsIgnoreCase, escapeMarkdown, unescapeMarkdown } from '../../system/string'; import { supportedInVSCodeVersion } from '../../system/utils'; import type { Account } from '../models/author'; import type { DefaultBranch } from '../models/defaultBranch'; @@ -96,7 +96,9 @@ export class GitLabRemote extends RichRemoteProvider return outputFormat === 'plaintext' ? text : text.replace(autolinkFullIssuesRegex, (linkText: string, repo: string, num: string) => { - const url = encodeUrl(`${this.protocol}://${this.domain}/${repo}/-/issues/${num}`); + const url = encodeUrl( + `${this.protocol}://${this.domain}/${unescapeMarkdown(repo)}/-/issues/${num}`, + ); const title = ` "Open Issue #${num} from ${repo} on ${this.name}"`; const token = `\x00${tokenMapping.size}\x00`; diff --git a/src/system/string.ts b/src/system/string.ts index 6129fa19a3280..f92bfb1575d8a 100644 --- a/src/system/string.ts +++ b/src/system/string.ts @@ -126,7 +126,11 @@ export function encodeHtmlWeak(s: string | undefined): string | undefined { } const escapeMarkdownRegex = /[\\`*_{}[\]()#+\-.!]/g; +const unescapeMarkdownRegex = /\\([\\`*_{}[\]()#+\-.!])/g; + const escapeMarkdownHeaderRegex = /^===/gm; +const unescapeMarkdownHeaderRegex = /^\u200b===/gm; + // const sampleMarkdown = '## message `not code` *not important* _no underline_ \n> don\'t quote me \n- don\'t list me \n+ don\'t list me \n1. don\'t list me \nnot h1 \n=== \nnot h2 \n---\n***\n---\n___'; const markdownQuotedRegex = /\r?\n/g; @@ -143,6 +147,16 @@ export function escapeMarkdown(s: string, options: { quoted?: boolean } = {}): s return s.trim().replace(markdownQuotedRegex, '\t\\\n> '); } +export function unescapeMarkdown(s: string): string { + return ( + s + // Unescape markdown + .replace(unescapeMarkdownRegex, '$1') + // Unescape markdown header + .replace(unescapeMarkdownHeaderRegex, '===') + ); +} + export function escapeRegex(s: string) { return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&'); } From 466a5aa30c1ec3987d94bc24576a46fd5267732c Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 17 Nov 2023 17:11:09 -0500 Subject: [PATCH 0246/1012] Refines AI limits & retries --- src/ai/aiProviderService.ts | 40 ++++++ src/ai/anthropicProvider.ts | 180 ++++++++++++++------------ src/ai/openaiProvider.ts | 251 +++++++++++++++++++----------------- 3 files changed, 270 insertions(+), 201 deletions(-) diff --git a/src/ai/aiProviderService.ts b/src/ai/aiProviderService.ts index d48b42c2ddeb8..1e44ef9168cd2 100644 --- a/src/ai/aiProviderService.ts +++ b/src/ai/aiProviderService.ts @@ -10,7 +10,9 @@ import type { Repository } from '../git/models/repository'; import { isRepository } from '../git/models/repository'; import { configuration } from '../system/configuration'; import type { Storage } from '../system/storage'; +import type { AnthropicModels } from './anthropicProvider'; import { AnthropicProvider } from './anthropicProvider'; +import type { OpenAIModels } from './openaiProvider'; import { OpenAIProvider } from './openaiProvider'; export interface AIProvider extends Disposable { @@ -192,3 +194,41 @@ async function confirmAIProviderToS(provider: AIProvider, storage: Storage): Pro return false; } + +export function getMaxCharacters(model: OpenAIModels | AnthropicModels, outputLength: number): number { + const tokensPerCharacter = 3.1; + + let tokens; + switch (model) { + case 'gpt-4-1106-preview': // 128,000 tokens (4,096 max output tokens) + tokens = 128000; + break; + case 'gpt-4-32k': // 32,768 tokens + case 'gpt-4-32k-0613': + tokens = 32768; + break; + case 'gpt-4': // 8,192 tokens + case 'gpt-4-0613': + tokens = 8192; + break; + case 'gpt-3.5-turbo-1106': // 16,385 tokens (4,096 max output tokens) + tokens = 16385; + break; + case 'gpt-3.5-turbo-16k': // 16,385 tokens; Will point to gpt-3.5-turbo-1106 starting Dec 11, 2023 + tokens = 16385; + break; + case 'gpt-3.5-turbo': // Will point to gpt-3.5-turbo-1106 starting Dec 11, 2023 + tokens = 4096; + break; + case 'claude-2': // 100,000 tokens + case 'claude-instant-1': + tokens = 100000; + break; + default: // 4,096 tokens + tokens = 4096; + break; + } + + const max = tokens * tokensPerCharacter - outputLength / tokensPerCharacter; + return Math.floor(max - max * 0.1); +} diff --git a/src/ai/anthropicProvider.ts b/src/ai/anthropicProvider.ts index da9970c239549..1823c1f0172a6 100644 --- a/src/ai/anthropicProvider.ts +++ b/src/ai/anthropicProvider.ts @@ -5,7 +5,8 @@ import type { Container } from '../container'; import { configuration } from '../system/configuration'; import type { Storage } from '../system/storage'; import { supportedInVSCodeVersion } from '../system/utils'; -import type { AIProvider } from './aiProviderService'; +import type {AIProvider} from './aiProviderService'; +import { getMaxCharacters } from './aiProviderService'; export class AnthropicProvider implements AIProvider { readonly id = 'anthropic'; @@ -24,21 +25,18 @@ export class AnthropicProvider implements AIProvider { if (apiKey == null) return undefined; const model = this.model; - const maxCodeCharacters = getMaxCharacters(model, 1600); - const code = diff.substring(0, maxCodeCharacters); - if (diff.length > maxCodeCharacters) { - void window.showWarningMessage( - `The diff of the staged changes had to be truncated to ${maxCodeCharacters} characters to fit within the Anthropic's limits.`, - ); - } + let retries = 0; + let maxCodeCharacters = getMaxCharacters(model, 2600); + while (true) { + const code = diff.substring(0, maxCodeCharacters); - let customPrompt = configuration.get('experimental.generateCommitMessagePrompt'); - if (!customPrompt.endsWith('.')) { - customPrompt += '.'; - } + let customPrompt = configuration.get('experimental.generateCommitMessagePrompt'); + if (!customPrompt.endsWith('.')) { + customPrompt += '.'; + } - const prompt = `\n\nHuman: You are an advanced AI programming assistant tasked with summarizing code changes into a concise and meaningful commit message. Compose a commit message that: + const prompt = `\n\nHuman: You are an advanced AI programming assistant tasked with summarizing code changes into a concise and meaningful commit message. Compose a commit message that: - Strictly synthesizes meaningful information from the provided code diff - Utilizes any additional user-provided context to comprehend the rationale behind the code changes - Is clear and brief, with an informal yet professional tone, and without superfluous descriptions @@ -62,31 +60,48 @@ Human: ${customPrompt} Assistant:`; - const request: AnthropicCompletionRequest = { - model: model, - prompt: prompt, - stream: false, - max_tokens_to_sample: 5000, - stop_sequences: ['\n\nHuman:'], - }; - const rsp = await this.fetch(apiKey, request); - if (!rsp.ok) { - let json; - try { - json = (await rsp.json()) as { error: { type: string; message: string } } | undefined; - } catch {} - - debugger; - throw new Error( - `Unable to generate commit message: (${this.name}:${rsp.status}) ${ - json?.error.message || rsp.statusText - })`, - ); - } + const request: AnthropicCompletionRequest = { + model: model, + prompt: prompt, + stream: false, + max_tokens_to_sample: 5000, + stop_sequences: ['\n\nHuman:'], + }; + const rsp = await this.fetch(apiKey, request); + if (!rsp.ok) { + let json; + try { + json = (await rsp.json()) as { error?: { type: string; message: string } } | undefined; + } catch {} + + debugger; + + if ( + retries++ < 2 && + json?.error?.type === 'invalid_request_error' && + json?.error?.message?.includes('prompt is too long') + ) { + maxCodeCharacters -= 500 * retries; + continue; + } + + throw new Error( + `Unable to generate commit message: (${this.name}:${rsp.status}) ${ + json?.error?.message || rsp.statusText + })`, + ); + } - const data: AnthropicCompletionResponse = await rsp.json(); - const message = data.completion.trim(); - return message; + if (diff.length > maxCodeCharacters) { + void window.showWarningMessage( + `The diff of the staged changes had to be truncated to ${maxCodeCharacters} characters to fit within the Anthropic's limits.`, + ); + } + + const data: AnthropicCompletionResponse = await rsp.json(); + const message = data.completion.trim(); + return message; + } } async explainChanges(message: string, diff: string): Promise { @@ -94,16 +109,13 @@ Assistant:`; if (apiKey == null) return undefined; const model = this.model; - const maxCodeCharacters = getMaxCharacters(model, 2400); - const code = diff.substring(0, maxCodeCharacters); - if (diff.length > maxCodeCharacters) { - void window.showWarningMessage( - `The diff of the commit changes had to be truncated to ${maxCodeCharacters} characters to fit within the OpenAI's limits.`, - ); - } + let retries = 0; + let maxCodeCharacters = getMaxCharacters(model, 3000); + while (true) { + const code = diff.substring(0, maxCodeCharacters); - const prompt = `\n\nHuman: You are an advanced AI programming assistant tasked with summarizing code changes into an explanation that is both easy to understand and meaningful. Construct an explanation that: + const prompt = `\n\nHuman: You are an advanced AI programming assistant tasked with summarizing code changes into an explanation that is both easy to understand and meaningful. Construct an explanation that: - Concisely synthesizes meaningful information from the provided code diff - Incorporates any additional context provided by the user to understand the rationale behind the code changes - Places the emphasis on the 'why' of the change, clarifying its benefits or addressing the problem that necessitated the change, beyond just detailing the 'what' has changed @@ -122,30 +134,47 @@ Human: Remember to frame your explanation in a way that is suitable for a review Assistant:`; - const request: AnthropicCompletionRequest = { - model: model, - prompt: prompt, - stream: false, - max_tokens_to_sample: 5000, - stop_sequences: ['\n\nHuman:'], - }; - - const rsp = await this.fetch(apiKey, request); - if (!rsp.ok) { - let json; - try { - json = (await rsp.json()) as { error: { type: string; message: string } } | undefined; - } catch {} - - debugger; - throw new Error( - `Unable to explain commit: (${this.name}:${rsp.status}) ${json?.error.message || rsp.statusText})`, - ); - } + const request: AnthropicCompletionRequest = { + model: model, + prompt: prompt, + stream: false, + max_tokens_to_sample: 5000, + stop_sequences: ['\n\nHuman:'], + }; + + const rsp = await this.fetch(apiKey, request); + if (!rsp.ok) { + let json; + try { + json = (await rsp.json()) as { error?: { type: string; message: string } } | undefined; + } catch {} + + debugger; + + if ( + retries++ < 2 && + json?.error?.type === 'invalid_request_error' && + json?.error?.message?.includes('prompt is too long') + ) { + maxCodeCharacters -= 500 * retries; + continue; + } + + throw new Error( + `Unable to explain commit: (${this.name}:${rsp.status}) ${json?.error?.message || rsp.statusText})`, + ); + } + + if (diff.length > maxCodeCharacters) { + void window.showWarningMessage( + `The diff of the commit changes had to be truncated to ${maxCodeCharacters} characters to fit within the OpenAI's limits.`, + ); + } - const data: AnthropicCompletionResponse = await rsp.json(); - const summary = data.completion.trim(); - return summary; + const data: AnthropicCompletionResponse = await rsp.json(); + const summary = data.completion.trim(); + return summary; + } } private fetch(apiKey: string, request: AnthropicCompletionRequest) { @@ -226,21 +255,6 @@ async function getApiKey(storage: Storage): Promise { return apiKey; } -function getMaxCharacters(model: AnthropicModels, outputLength: number): number { - let tokens; - switch (model) { - case 'claude-2': // 100,000 tokens - case 'claude-instant-1': - tokens = 100000; - break; - default: // 4,096 tokens - tokens = 4096; - break; - } - - return tokens * 4 - outputLength / 4; -} - export type AnthropicModels = 'claude-instant-1' | 'claude-2'; interface AnthropicCompletionRequest { diff --git a/src/ai/openaiProvider.ts b/src/ai/openaiProvider.ts index aa652a777bdfe..79c62d66c9a14 100644 --- a/src/ai/openaiProvider.ts +++ b/src/ai/openaiProvider.ts @@ -6,6 +6,7 @@ import { configuration } from '../system/configuration'; import type { Storage } from '../system/storage'; import { supportedInVSCodeVersion } from '../system/utils'; import type { AIProvider } from './aiProviderService'; +import { getMaxCharacters } from './aiProviderService'; export class OpenAIProvider implements AIProvider { readonly id = 'openai'; @@ -28,26 +29,23 @@ export class OpenAIProvider implements AIProvider { if (apiKey == null) return undefined; const model = this.model; - const maxCodeCharacters = getMaxCharacters(model, 1600); - const code = diff.substring(0, maxCodeCharacters); - if (diff.length > maxCodeCharacters) { - void window.showWarningMessage( - `The diff of the staged changes had to be truncated to ${maxCodeCharacters} characters to fit within the OpenAI's limits.`, - ); - } + let retries = 0; + let maxCodeCharacters = getMaxCharacters(model, 2600); + while (true) { + const code = diff.substring(0, maxCodeCharacters); - let customPrompt = configuration.get('experimental.generateCommitMessagePrompt'); - if (!customPrompt.endsWith('.')) { - customPrompt += '.'; - } + let customPrompt = configuration.get('experimental.generateCommitMessagePrompt'); + if (!customPrompt.endsWith('.')) { + customPrompt += '.'; + } - const request: OpenAIChatCompletionRequest = { - model: model, - messages: [ - { - role: 'system', - content: `You are an advanced AI programming assistant tasked with summarizing code changes into a concise and meaningful commit message. Compose a commit message that: + const request: OpenAIChatCompletionRequest = { + model: model, + messages: [ + { + role: 'system', + content: `You are an advanced AI programming assistant tasked with summarizing code changes into a concise and meaningful commit message. Compose a commit message that: - Strictly synthesizes meaningful information from the provided code diff - Utilizes any additional user-provided context to comprehend the rationale behind the code changes - Is clear and brief, with an informal yet professional tone, and without superfluous descriptions @@ -56,40 +54,68 @@ export class OpenAIProvider implements AIProvider { - Most importantly emphasizes the 'why' of the change, its benefits, or the problem it addresses rather than only the 'what' that changed Follow the user's instructions carefully, don't repeat yourself, don't include the code in the output, or make anything up!`, - }, - { - role: 'user', - content: `Here is the code diff to use to generate the commit message:\n\n${code}`, - }, - ...(options?.context - ? [ - { - role: 'user' as const, - content: `Here is additional context which should be taken into account when generating the commit message:\n\n${options.context}`, - }, - ] - : []), - { - role: 'user', - content: customPrompt, - }, - ], - }; + }, + { + role: 'user', + content: `Here is the code diff to use to generate the commit message:\n\n${code}`, + }, + ...(options?.context + ? [ + { + role: 'user' as const, + content: `Here is additional context which should be taken into account when generating the commit message:\n\n${options.context}`, + }, + ] + : []), + { + role: 'user', + content: customPrompt, + }, + ], + }; + + const rsp = await this.fetch(apiKey, request); + if (!rsp.ok) { + if (rsp.status === 404) { + throw new Error( + `Unable to generate commit message: Your API key doesn't seem to have access to the selected '${model}' model`, + ); + } + if (rsp.status === 429) { + throw new Error( + `Unable to generate commit message: (${this.name}:${rsp.status}) Too many requests (rate limit exceeded) or your API key is associated with an expired trial`, + ); + } + + let json; + try { + json = (await rsp.json()) as { error?: { code: string; message: string } } | undefined; + } catch {} + + debugger; + + if (retries++ < 2 && json?.error?.code === 'context_length_exceeded') { + maxCodeCharacters -= 500 * retries; + continue; + } - const rsp = await this.fetch(apiKey, request); - if (!rsp.ok) { - debugger; - if (rsp.status === 429) { throw new Error( - `Unable to generate commit message: (${this.name}:${rsp.status}) Too many requests (rate limit exceeded) or your API key is associated with an expired trial`, + `Unable to generate commit message: (${this.name}:${rsp.status}) ${ + json?.error?.message || rsp.statusText + }`, + ); + } + + if (diff.length > maxCodeCharacters) { + void window.showWarningMessage( + `The diff of the staged changes had to be truncated to ${maxCodeCharacters} characters to fit within the OpenAI's limits.`, ); } - throw new Error(`Unable to generate commit message: (${this.name}:${rsp.status}) ${rsp.statusText}`); - } - const data: OpenAIChatCompletionResponse = await rsp.json(); - const message = data.choices[0].message.content.trim(); - return message; + const data: OpenAIChatCompletionResponse = await rsp.json(); + const message = data.choices[0].message.content.trim(); + return message; + } } async explainChanges(message: string, diff: string): Promise { @@ -97,62 +123,80 @@ Follow the user's instructions carefully, don't repeat yourself, don't include t if (apiKey == null) return undefined; const model = this.model; - const maxCodeCharacters = getMaxCharacters(model, 2400); - - const code = diff.substring(0, maxCodeCharacters); - if (diff.length > maxCodeCharacters) { - void window.showWarningMessage( - `The diff of the commit changes had to be truncated to ${maxCodeCharacters} characters to fit within the OpenAI's limits.`, - ); - } - const request: OpenAIChatCompletionRequest = { - model: model, - messages: [ - { - role: 'system', - content: `You are an advanced AI programming assistant tasked with summarizing code changes into an explanation that is both easy to understand and meaningful. Construct an explanation that: + let retries = 0; + let maxCodeCharacters = getMaxCharacters(model, 3000); + while (true) { + const code = diff.substring(0, maxCodeCharacters); + + const request: OpenAIChatCompletionRequest = { + model: model, + messages: [ + { + role: 'system', + content: `You are an advanced AI programming assistant tasked with summarizing code changes into an explanation that is both easy to understand and meaningful. Construct an explanation that: - Concisely synthesizes meaningful information from the provided code diff - Incorporates any additional context provided by the user to understand the rationale behind the code changes - Places the emphasis on the 'why' of the change, clarifying its benefits or addressing the problem that necessitated the change, beyond just detailing the 'what' has changed Do not make any assumptions or invent details that are not supported by the code diff or the user-provided context.`, - }, - { - role: 'user', - content: `Here is additional context provided by the author of the changes, which should provide some explanation to why these changes where made. Please strongly consider this information when generating your explanation:\n\n${message}`, - }, - { - role: 'user', - content: `Now, kindly explain the following code diff in a way that would be clear to someone reviewing or trying to understand these changes:\n\n${code}`, - }, - { - role: 'user', - content: - 'Remember to frame your explanation in a way that is suitable for a reviewer to quickly grasp the essence of the changes, the issues they resolve, and their implications on the codebase.', - }, - ], - }; + }, + { + role: 'user', + content: `Here is additional context provided by the author of the changes, which should provide some explanation to why these changes where made. Please strongly consider this information when generating your explanation:\n\n${message}`, + }, + { + role: 'user', + content: `Now, kindly explain the following code diff in a way that would be clear to someone reviewing or trying to understand these changes:\n\n${code}`, + }, + { + role: 'user', + content: + 'Remember to frame your explanation in a way that is suitable for a reviewer to quickly grasp the essence of the changes, the issues they resolve, and their implications on the codebase.', + }, + ], + }; + + const rsp = await this.fetch(apiKey, request); + if (!rsp.ok) { + if (rsp.status === 404) { + throw new Error( + `Unable to explain commit: Your API key doesn't seem to have access to the selected '${model}' model`, + ); + } + if (rsp.status === 429) { + throw new Error( + `Unable to explain commit: (${this.name}:${rsp.status}) Too many requests (rate limit exceeded) or your API key is associated with an expired trial`, + ); + } + + let json; + try { + json = (await rsp.json()) as { error?: { code: string; message: string } } | undefined; + } catch {} + + debugger; + + if (retries++ < 2 && json?.error?.code === 'context_length_exceeded') { + maxCodeCharacters -= 500 * retries; + continue; + } - const rsp = await this.fetch(apiKey, request); - if (!rsp.ok) { - debugger; - if (rsp.status === 404) { throw new Error( - `Unable to explain commit: Your API key doesn't seem to have access to the selected '${model}' model`, + `Unable to explain commit: (${this.name}:${rsp.status}) ${json?.error?.message || rsp.statusText}`, ); } - if (rsp.status === 429) { - throw new Error( - `Unable to explain commit: (${this.name}:${rsp.status}) Too many requests (rate limit exceeded) or your API key is associated with an expired trial`, + + if (diff.length > maxCodeCharacters) { + void window.showWarningMessage( + `The diff of the commit changes had to be truncated to ${maxCodeCharacters} characters to fit within the OpenAI's limits.`, ); } - throw new Error(`Unable to explain commit: (${this.name}:${rsp.status}) ${rsp.statusText}`); - } - const data: OpenAIChatCompletionResponse = await rsp.json(); - const summary = data.choices[0].message.content.trim(); - return summary; + const data: OpenAIChatCompletionResponse = await rsp.json(); + const summary = data.choices[0].message.content.trim(); + return summary; + } } private fetch(apiKey: string, request: OpenAIChatCompletionRequest) { @@ -233,35 +277,6 @@ async function getApiKey(storage: Storage): Promise { return openaiApiKey; } -function getMaxCharacters(model: OpenAIModels, outputLength: number): number { - let tokens; - switch (model) { - case 'gpt-4-1106-preview': // 128,000 tokens (4,096 max output tokens) - tokens = 128000; - break; - case 'gpt-4-32k': // 32,768 tokens - case 'gpt-4-32k-0613': - tokens = 32768; - break; - case 'gpt-4': // 8,192 tokens - case 'gpt-4-0613': - tokens = 8192; - break; - case 'gpt-3.5-turbo-1106': // 16,385 tokens (4,096 max output tokens) - tokens = 16385; - break; - case 'gpt-3.5-turbo-16k': // 16,385 tokens; Will point to gpt-3.5-turbo-1106 starting Dec 11, 2023 - tokens = 16385; - break; - case 'gpt-3.5-turbo': // Will point to gpt-3.5-turbo-1106 starting Dec 11, 2023 - default: // 4,096 tokens - tokens = 4096; - break; - } - - return tokens * 4 - outputLength / 4; -} - export type OpenAIModels = | 'gpt-3.5-turbo-1106' | 'gpt-3.5-turbo' From ded8f8ab7f96cefd819f5478276957978595d766 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 17 Nov 2023 18:00:04 -0500 Subject: [PATCH 0247/1012] Slims logging --- src/webviews/webviewsController.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/webviews/webviewsController.ts b/src/webviews/webviewsController.ts index 53431834c5165..331c6885e30e6 100644 --- a/src/webviews/webviewsController.ts +++ b/src/webviews/webviewsController.ts @@ -241,6 +241,7 @@ export class WebviewsController implements Disposable { 2: false, 3: false, }, + singleLine: true, }) registerWebviewPanel( command: { From 66d3beb91f3e0953e354be10102f1dde02721918 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 17 Nov 2023 18:00:47 -0500 Subject: [PATCH 0248/1012] Updates subscription logging --- src/plus/gk/account/subscriptionService.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/plus/gk/account/subscriptionService.ts b/src/plus/gk/account/subscriptionService.ts index 1da6710e85451..6af6b0b98f520 100644 --- a/src/plus/gk/account/subscriptionService.ts +++ b/src/plus/gk/account/subscriptionService.ts @@ -34,7 +34,7 @@ import { debug, log } from '../../../system/decorators/log'; import type { Deferrable } from '../../../system/function'; import { debounce, once } from '../../../system/function'; import { Logger } from '../../../system/logger'; -import { getLogScope } from '../../../system/logger.scope'; +import { getLogScope, setLogScopeExit } from '../../../system/logger.scope'; import { flatten } from '../../../system/object'; import { pluralize } from '../../../system/string'; import { openWalkthrough } from '../../../system/utils'; @@ -667,7 +667,7 @@ export class SubscriptionService implements Disposable { session = null; if (ex instanceof Error && ex.message.includes('User did not consent')) { - Logger.debug(scope, 'User declined authentication'); + setLogScopeExit(scope, ' \u2022 User declined authentication'); await this.logoutCore(); return null; } @@ -676,7 +676,7 @@ export class SubscriptionService implements Disposable { } if (session == null) { - Logger.debug(scope, 'No valid session was found'); + setLogScopeExit(scope, ' \u2022 No valid session was found'); await this.logoutCore(); return session ?? null; } @@ -694,7 +694,11 @@ export class SubscriptionService implements Disposable { statusCode: ex.statusCode, }); - Logger.debug(scope, `Account validation failed (${ex.statusCode ?? ex.original?.code})`); + setLogScopeExit( + scope, + ` \u2022 Account validation failed (${ex.statusCode ?? ex.original?.code})`, + 'FAILED', + ); if (ex instanceof AccountValidationError) { const name = session.account.label; From 7d08d60589efe7c78fb5216d61ecbc9c9008bf4e Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 17 Nov 2023 18:02:23 -0500 Subject: [PATCH 0249/1012] Slims logging --- src/env/node/git/localGitProvider.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts index 29a69127f5f09..0c5c6184d2477 100644 --- a/src/env/node/git/localGitProvider.ts +++ b/src/env/node/git/localGitProvider.ts @@ -560,7 +560,7 @@ export class LocalGitProvider implements GitProvider, Disposable { return opened; } - @debug() + @debug({ singleLine: true }) openRepositoryInitWatcher(): RepositoryInitWatcher { const watcher = workspace.createFileSystemWatcher('**/.git', false, true, true); return { From 0b4bab9eed52f63bf8b6f25e8c27c526ea283878 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 17 Nov 2023 18:38:14 -0500 Subject: [PATCH 0250/1012] Refines logging --- src/extension.ts | 2 +- src/trackers/lineTracker.ts | 11 ++++++----- src/webviews/webviewsController.ts | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index d40e64cc91cd3..9f8841f7c8635 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -220,7 +220,7 @@ export async function activate(context: ExtensionContext): Promise implements Disposable { protected onStart?(): Disposable | undefined; - @debug({ args: false }) + @debug({ args: false, singleLine: true }) subscribe(subscriber: unknown, subscription: Disposable): Disposable { const scope = getLogScope(); @@ -138,7 +137,7 @@ export class LineTracker implements Disposable { } if (first) { - Logger.debug(scope, 'Starting line tracker...'); + setLogScopeExit(scope, ' \u2022 starting line tracker...'); this._disposable = Disposable.from( window.onDidChangeActiveTextEditor(debounce(this.onActiveTextEditorChanged, 0), this), @@ -147,12 +146,14 @@ export class LineTracker implements Disposable { ); queueMicrotask(() => this.onActiveTextEditorChanged(window.activeTextEditor)); + } else { + setLogScopeExit(scope, ' \u2022 already started...'); } return disposable; } - @debug({ args: false }) + @debug({ args: false, singleLine: true }) unsubscribe(subscriber: unknown) { const subs = this._subscriptions.get(subscriber); if (subs == null) return; diff --git a/src/webviews/webviewsController.ts b/src/webviews/webviewsController.ts index 331c6885e30e6..09bb4f9e7ae14 100644 --- a/src/webviews/webviewsController.ts +++ b/src/webviews/webviewsController.ts @@ -121,6 +121,7 @@ export class WebviewsController implements Disposable { 1: false, 2: false, }, + singleLine: true, }) registerWebviewView( descriptor: WebviewViewDescriptor, From 62b23e2bf0473af21149990ab3f9117f5a6469a0 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 17 Nov 2023 18:38:41 -0500 Subject: [PATCH 0251/1012] Adds more logging & fixes gating on checkin --- src/plus/gk/account/subscriptionService.ts | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/plus/gk/account/subscriptionService.ts b/src/plus/gk/account/subscriptionService.ts index 6af6b0b98f520..54e4e3e4e538f 100644 --- a/src/plus/gk/account/subscriptionService.ts +++ b/src/plus/gk/account/subscriptionService.ts @@ -25,10 +25,11 @@ import { Commands } from '../../../constants'; import type { Container } from '../../../container'; import { AccountValidationError } from '../../../errors'; import type { RepositoriesChangeEvent } from '../../../git/gitProviderService'; +import { pauseOnCancelOrTimeout } from '../../../system/cancellation'; import { executeCommand, registerCommand } from '../../../system/command'; import { configuration } from '../../../system/configuration'; import { setContext } from '../../../system/context'; -import { createFromDateDelta } from '../../../system/date'; +import { createFromDateDelta, fromNow } from '../../../system/date'; import { gate } from '../../../system/decorators/gate'; import { debug, log } from '../../../system/decorators/log'; import type { Deferrable } from '../../../system/function'; @@ -491,7 +492,7 @@ export class SubscriptionService implements Disposable { } } - @gate() + @gate(o => `${o?.force ?? false}`) @log() async validate(options?: { force?: boolean }): Promise { const scope = getLogScope(); @@ -511,11 +512,14 @@ export class SubscriptionService implements Disposable { } private _lastValidatedDate: Date | undefined; - @gate(s => s.account.id) + + @debug({ args: { 0: s => s?.account?.label } }) private async checkInAndValidate( session: AuthenticationSession, options?: { force?: boolean; showSlowProgress?: boolean }, ): Promise { + const scope = getLogScope(); + // Only check in if we haven't in the last 12 hours if ( !options?.force && @@ -523,29 +527,25 @@ export class SubscriptionService implements Disposable { Date.now() - this._lastValidatedDate.getTime() < 12 * 60 * 60 * 1000 && !isSubscriptionExpired(this._subscription) ) { + setLogScopeExit(scope, ` (${fromNow(this._lastValidatedDate.getTime(), true)})...`, 'skipped'); return; } - if (!options?.showSlowProgress) return this.checkInAndValidateCore(session); - const validating = this.checkInAndValidateCore(session); - const result = await Promise.race([ - validating, - new Promise(resolve => setTimeout(resolve, 3000, true)), - ]); + if (!options?.showSlowProgress) return validating; - if (result) { + // Show progress if we are waiting too long + const result = await pauseOnCancelOrTimeout(validating, undefined, 3000); + if (result.paused) { await window.withProgress( - { - location: ProgressLocation.Notification, - title: 'Validating your GitKraken account...', - }, - () => validating, + { location: ProgressLocation.Notification, title: 'Validating your GitKraken account...' }, + () => result.value, ); } } - @debug({ args: { 0: s => s?.account.label } }) + @gate(s => s.account.id) + @debug({ args: { 0: s => s?.account?.label } }) private async checkInAndValidateCore(session: AuthenticationSession): Promise { const scope = getLogScope(); this._lastValidatedDate = undefined; From 4a2fd4ce4da3f36599a5753ae4e968fe13dd5abf Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sun, 19 Nov 2023 16:48:10 -0500 Subject: [PATCH 0252/1012] =?UTF-8?q?=F0=9F=92=84&=20updates=20lint=20rule?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc.base.json | 7 +------ package.json | 3 ++- src/ai/anthropicProvider.ts | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.eslintrc.base.json b/.eslintrc.base.json index 83577746fc704..a5c13d877c3f3 100644 --- a/.eslintrc.base.json +++ b/.eslintrc.base.json @@ -205,7 +205,6 @@ } } ], - "@typescript-eslint/class-literal-property-style": "off", "@typescript-eslint/consistent-type-assertions": [ "error", { @@ -213,9 +212,7 @@ "objectLiteralTypeAssertions": "allow-as-parameter" } ], - "@typescript-eslint/consistent-type-definitions": "off", "@typescript-eslint/consistent-type-imports": ["error", { "disallowTypeAnnotations": false }], - "@typescript-eslint/dot-notation": "off", "@typescript-eslint/naming-convention": [ "error", { @@ -266,7 +263,6 @@ "error", { "ignoreArrowShorthand": true, "ignoreVoidOperator": true } ], - "@typescript-eslint/no-empty-function": "off", "@typescript-eslint/no-explicit-any": "off", "@typescript-eslint/no-inferrable-types": ["warn", { "ignoreParameters": true, "ignoreProperties": true }], "@typescript-eslint/no-invalid-void-type": "off", // Seems to error on `void` return types @@ -278,6 +274,7 @@ "@typescript-eslint/no-unsafe-argument": "off", "@typescript-eslint/no-unsafe-assignment": "off", "@typescript-eslint/no-unsafe-call": "off", + "@typescript-eslint/no-unsafe-enum-comparison": "off", "@typescript-eslint/no-unsafe-member-access": "off", "@typescript-eslint/no-unused-expressions": ["warn", { "allowShortCircuit": true }], "@typescript-eslint/no-unused-vars": [ @@ -289,12 +286,10 @@ "varsIgnorePattern": "^_$" } ], - "@typescript-eslint/no-unsafe-enum-comparison": "off", "@typescript-eslint/no-use-before-define": ["error", { "functions": false, "classes": false }], "@typescript-eslint/prefer-for-of": "warn", "@typescript-eslint/prefer-includes": "warn", "@typescript-eslint/prefer-literal-enum-member": ["warn", { "allowBitwiseExpressions": true }], - "@typescript-eslint/prefer-nullish-coalescing": "off", // warn "@typescript-eslint/prefer-optional-chain": "warn", "@typescript-eslint/prefer-reduce-type-parameter": "warn", "@typescript-eslint/restrict-template-expressions": [ diff --git a/package.json b/package.json index 3b90398bbad12..d4285565bf2b1 100644 --- a/package.json +++ b/package.json @@ -15728,8 +15728,9 @@ "clean": "npx rimraf dist out .vscode-test .vscode-test-web .eslintcache* tsconfig*.tsbuildinfo", "copy:images": "webpack --config webpack.config.images.js", "graph:link": "yarn link @gitkraken/gitkraken-components", - "graph:link:main": "pushd \"../GitKrakenComponents\" && yarn link && popd && yarn link @gitkraken/gitkraken-components", + "graph:link:main": "pushd \"../GitKrakenComponents\" && yarn link && popd && yarn graph:link", "graph:unlink": "yarn unlink @gitkraken/gitkraken-components && yarn install --force", + "graph:unlink:main": "yarn graph:unlink && pushd \"../GitKrakenComponents\" && yarn unlink && popd", "icons:apply": "node ./scripts/applyIconsContribution.js", "icons:svgo": "svgo -q -f ./images/icons/ --config svgo.config.js", "lint": "eslint \"src/**/*.ts?(x)\"", diff --git a/src/ai/anthropicProvider.ts b/src/ai/anthropicProvider.ts index 1823c1f0172a6..299092bf263eb 100644 --- a/src/ai/anthropicProvider.ts +++ b/src/ai/anthropicProvider.ts @@ -5,8 +5,8 @@ import type { Container } from '../container'; import { configuration } from '../system/configuration'; import type { Storage } from '../system/storage'; import { supportedInVSCodeVersion } from '../system/utils'; -import type {AIProvider} from './aiProviderService'; -import { getMaxCharacters } from './aiProviderService'; +import type { AIProvider } from './aiProviderService'; +import { getMaxCharacters } from './aiProviderService'; export class AnthropicProvider implements AIProvider { readonly id = 'anthropic'; From f39cf7840fd565da849c65aee8bf169078ce5070 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sat, 18 Nov 2023 14:04:50 -0500 Subject: [PATCH 0253/1012] Updates dependencies --- ThirdPartyNotices.txt | 4 +- package.json | 14 +- yarn.lock | 409 +++++++++++++++++++++--------------------- 3 files changed, 213 insertions(+), 214 deletions(-) diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index b9d77c83a9f39..f93dcab18d3ef 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -3,7 +3,7 @@ GitLens THIRD-PARTY SOFTWARE NOTICES AND INFORMATION This project incorporates components from the projects listed below. -1. @lit/react version 1.0.1 (https://github.com/lit/lit) +1. @lit/react version 1.0.2 (https://github.com/lit/lit) 2. @microsoft/fast-element version 1.12.0 (https://github.com/Microsoft/fast) 3. @octokit/graphql version 7.0.2 (https://github.com/octokit/graphql.js) 4. @octokit/request version 8.1.5 (https://github.com/octokit/request.js) @@ -16,7 +16,7 @@ This project incorporates components from the projects listed below. 11. billboard.js version 3.10.3 (https://github.com/naver/billboard.js) 12. https-proxy-agent version 5.0.1 (https://github.com/TooTallNate/node-https-proxy-agent) 13. iconv-lite version 0.6.3 (https://github.com/ashtuchkin/iconv-lite) -14. lit version 3.0.2 (https://github.com/lit/lit) +14. lit version 3.1.0 (https://github.com/lit/lit) 15. microsoft/vscode (https://github.com/microsoft/vscode) 16. node-fetch version 2.7.0 (https://github.com/bitinn/node-fetch) 17. os-browserify version 0.3.0 (https://github.com/CoderPuppy/os-browserify) diff --git a/package.json b/package.json index d4285565bf2b1..39adc985bc91d 100644 --- a/package.json +++ b/package.json @@ -15763,7 +15763,7 @@ "dependencies": { "@gitkraken/gitkraken-components": "10.2.5", "@gitkraken/shared-web-components": "0.1.1-rc.15", - "@lit/react": "1.0.1", + "@lit/react": "1.0.2", "@microsoft/fast-element": "1.12.0", "@octokit/graphql": "7.0.2", "@octokit/request": "8.1.5", @@ -15776,7 +15776,7 @@ "billboard.js": "3.10.3", "https-proxy-agent": "5.0.1", "iconv-lite": "0.6.3", - "lit": "3.0.2", + "lit": "3.1.0", "node-fetch": "2.7.0", "os-browserify": "0.3.0", "path-browserify": "1.0.1", @@ -15805,10 +15805,10 @@ "css-loader": "6.8.1", "css-minimizer-webpack-plugin": "5.0.1", "cssnano-preset-advanced": "6.0.1", - "esbuild": "0.19.5", + "esbuild": "0.19.6", "esbuild-loader": "4.0.2", "esbuild-sass-plugin": "2.16.0", - "eslint": "8.53.0", + "eslint": "8.54.0", "eslint-cli": "1.1.1", "eslint-config-prettier": "9.0.0", "eslint-import-resolver-typescript": "3.6.1", @@ -15830,13 +15830,13 @@ "sass-loader": "13.3.2", "schema-utils": "4.2.0", "sharp": "0.32.6", - "svgo": "3.0.3", + "svgo": "3.0.4", "terser-webpack-plugin": "5.3.9", - "ts-loader": "9.5.0", + "ts-loader": "9.5.1", "tsc-alias": "1.8.8", "typescript": "5.3.1-rc", "webpack": "5.89.0", - "webpack-bundle-analyzer": "4.10.0", + "webpack-bundle-analyzer": "4.10.1", "webpack-cli": "5.1.4", "webpack-node-externals": "3.0.0", "webpack-require-from": "1.8.6" diff --git a/yarn.lock b/yarn.lock index a9deb5cfa7fde..f3a0fe1be9e1b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -61,115 +61,115 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== -"@esbuild/android-arm64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.5.tgz#276c5f99604054d3dbb733577e09adae944baa90" - integrity sha512-5d1OkoJxnYQfmC+Zd8NBFjkhyCNYwM4n9ODrycTFY6Jk1IGiZ+tjVJDDSwDt77nK+tfpGP4T50iMtVi4dEGzhQ== - -"@esbuild/android-arm@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.5.tgz#4a3cbf14758166abaae8ba9c01a80e68342a4eec" - integrity sha512-bhvbzWFF3CwMs5tbjf3ObfGqbl/17ict2/uwOSfr3wmxDE6VdS2GqY/FuzIPe0q0bdhj65zQsvqfArI9MY6+AA== - -"@esbuild/android-x64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.5.tgz#21a3d11cd4613d2d3c5ccb9e746c254eb9265b0a" - integrity sha512-9t+28jHGL7uBdkBjL90QFxe7DVA+KGqWlHCF8ChTKyaKO//VLuoBricQCgwhOjA1/qOczsw843Fy4cbs4H3DVA== - -"@esbuild/darwin-arm64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.5.tgz#714cb839f467d6a67b151ee8255886498e2b9bf6" - integrity sha512-mvXGcKqqIqyKoxq26qEDPHJuBYUA5KizJncKOAf9eJQez+L9O+KfvNFu6nl7SCZ/gFb2QPaRqqmG0doSWlgkqw== - -"@esbuild/darwin-x64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.5.tgz#2c553e97a6d2b4ae76a884e35e6cbab85a990bbf" - integrity sha512-Ly8cn6fGLNet19s0X4unjcniX24I0RqjPv+kurpXabZYSXGM4Pwpmf85WHJN3lAgB8GSth7s5A0r856S+4DyiA== - -"@esbuild/freebsd-arm64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.5.tgz#d554f556718adb31917a0da24277bf84b6ee87f3" - integrity sha512-GGDNnPWTmWE+DMchq1W8Sd0mUkL+APvJg3b11klSGUDvRXh70JqLAO56tubmq1s2cgpVCSKYywEiKBfju8JztQ== - -"@esbuild/freebsd-x64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.5.tgz#288f7358a3bb15d99e73c65c9adaa3dabb497432" - integrity sha512-1CCwDHnSSoA0HNwdfoNY0jLfJpd7ygaLAp5EHFos3VWJCRX9DMwWODf96s9TSse39Br7oOTLryRVmBoFwXbuuQ== - -"@esbuild/linux-arm64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.5.tgz#95933ae86325c93cb6b5e8333d22120ecfdc901b" - integrity sha512-o3vYippBmSrjjQUCEEiTZ2l+4yC0pVJD/Dl57WfPwwlvFkrxoSO7rmBZFii6kQB3Wrn/6GwJUPLU5t52eq2meA== - -"@esbuild/linux-arm@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.5.tgz#0acef93aa3e0579e46d33b666627bddb06636664" - integrity sha512-lrWXLY/vJBzCPC51QN0HM71uWgIEpGSjSZZADQhq7DKhPcI6NH1IdzjfHkDQws2oNpJKpR13kv7/pFHBbDQDwQ== - -"@esbuild/linux-ia32@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.5.tgz#b6e5c9e80b42131cbd6b1ddaa48c92835f1ed67f" - integrity sha512-MkjHXS03AXAkNp1KKkhSKPOCYztRtK+KXDNkBa6P78F8Bw0ynknCSClO/ztGszILZtyO/lVKpa7MolbBZ6oJtQ== - -"@esbuild/linux-loong64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.5.tgz#e5f0cf95a180158b01ff5f417da796a1c09dfbea" - integrity sha512-42GwZMm5oYOD/JHqHska3Jg0r+XFb/fdZRX+WjADm3nLWLcIsN27YKtqxzQmGNJgu0AyXg4HtcSK9HuOk3v1Dw== - -"@esbuild/linux-mips64el@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.5.tgz#ae36fb86c7d5f641f3a0c8472e83dcb6ea36a408" - integrity sha512-kcjndCSMitUuPJobWCnwQ9lLjiLZUR3QLQmlgaBfMX23UEa7ZOrtufnRds+6WZtIS9HdTXqND4yH8NLoVVIkcg== - -"@esbuild/linux-ppc64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.5.tgz#7960cb1666f0340ddd9eef7b26dcea3835d472d0" - integrity sha512-yJAxJfHVm0ZbsiljbtFFP1BQKLc8kUF6+17tjQ78QjqjAQDnhULWiTA6u0FCDmYT1oOKS9PzZ2z0aBI+Mcyj7Q== - -"@esbuild/linux-riscv64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.5.tgz#32207df26af60a3a9feea1783fc21b9817bade19" - integrity sha512-5u8cIR/t3gaD6ad3wNt1MNRstAZO+aNyBxu2We8X31bA8XUNyamTVQwLDA1SLoPCUehNCymhBhK3Qim1433Zag== - -"@esbuild/linux-s390x@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.5.tgz#b38d5681db89a3723862dfa792812397b1510a7d" - integrity sha512-Z6JrMyEw/EmZBD/OFEFpb+gao9xJ59ATsoTNlj39jVBbXqoZm4Xntu6wVmGPB/OATi1uk/DB+yeDPv2E8PqZGw== - -"@esbuild/linux-x64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.5.tgz#46feba2ad041a241379d150f415b472fe3885075" - integrity sha512-psagl+2RlK1z8zWZOmVdImisMtrUxvwereIdyJTmtmHahJTKb64pAcqoPlx6CewPdvGvUKe2Jw+0Z/0qhSbG1A== - -"@esbuild/netbsd-x64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.5.tgz#3b5c1fb068f26bfc681d31f682adf1bea4ef0702" - integrity sha512-kL2l+xScnAy/E/3119OggX8SrWyBEcqAh8aOY1gr4gPvw76la2GlD4Ymf832UCVbmuWeTf2adkZDK+h0Z/fB4g== - -"@esbuild/openbsd-x64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.5.tgz#ca6830316ca68056c5c88a875f103ad3235e00db" - integrity sha512-sPOfhtzFufQfTBgRnE1DIJjzsXukKSvZxloZbkJDG383q0awVAq600pc1nfqBcl0ice/WN9p4qLc39WhBShRTA== - -"@esbuild/sunos-x64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.5.tgz#9efc4eb9539a7be7d5a05ada52ee43cda0d8e2dd" - integrity sha512-dGZkBXaafuKLpDSjKcB0ax0FL36YXCvJNnztjKV+6CO82tTYVDSH2lifitJ29jxRMoUhgkg9a+VA/B03WK5lcg== - -"@esbuild/win32-arm64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.5.tgz#29f8184afa7a02a956ebda4ed638099f4b8ff198" - integrity sha512-dWVjD9y03ilhdRQ6Xig1NWNgfLtf2o/STKTS+eZuF90fI2BhbwD6WlaiCGKptlqXlURVB5AUOxUj09LuwKGDTg== - -"@esbuild/win32-ia32@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.5.tgz#f3de07afb292ecad651ae4bb8727789de2d95b05" - integrity sha512-4liggWIA4oDgUxqpZwrDhmEfAH4d0iljanDOK7AnVU89T6CzHon/ony8C5LeOdfgx60x5cnQJFZwEydVlYx4iw== - -"@esbuild/win32-x64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.5.tgz#faad84c41ba12e3a0acb52571df9bff37bee75f6" - integrity sha512-czTrygUsB/jlM8qEW5MD8bgYU2Xg14lo6kBDXW6HdxKjh8M5PzETGiSHaz9MtbXBYDloHNUAUW2tMiKW4KM9Mw== +"@esbuild/android-arm64@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.6.tgz#13d98a34bbbde4237867cc232307a20ded139b6f" + integrity sha512-KQ/hbe9SJvIJ4sR+2PcZ41IBV+LPJyYp6V1K1P1xcMRup9iYsBoQn4MzE3mhMLOld27Au2eDcLlIREeKGUXpHQ== + +"@esbuild/android-arm@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.6.tgz#68898d949672c56f10451f540fd92301dc713fb3" + integrity sha512-muPzBqXJKCbMYoNbb1JpZh/ynl0xS6/+pLjrofcR3Nad82SbsCogYzUE6Aq9QT3cLP0jR/IVK/NHC9b90mSHtg== + +"@esbuild/android-x64@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.6.tgz#51a0ab83680dedc6dd1ae26133def26b178ed3a1" + integrity sha512-VVJVZQ7p5BBOKoNxd0Ly3xUM78Y4DyOoFKdkdAe2m11jbh0LEU4bPles4e/72EMl4tapko8o915UalN/5zhspg== + +"@esbuild/darwin-arm64@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.6.tgz#2883f14197111febb118c0463c080930a30883e5" + integrity sha512-91LoRp/uZAKx6ESNspL3I46ypwzdqyDLXZH7x2QYCLgtnaU08+AXEbabY2yExIz03/am0DivsTtbdxzGejfXpA== + +"@esbuild/darwin-x64@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.6.tgz#400bf20f9a35a7d68a17f5898c0f9ecb099f062b" + integrity sha512-QCGHw770ubjBU1J3ZkFJh671MFajGTYMZumPs9E/rqU52md6lIil97BR0CbPq6U+vTh3xnTNDHKRdR8ggHnmxQ== + +"@esbuild/freebsd-arm64@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.6.tgz#8af07bd848afa2470b8a2339b203ce29a721152b" + integrity sha512-J53d0jGsDcLzWk9d9SPmlyF+wzVxjXpOH7jVW5ae7PvrDst4kiAz6sX+E8btz0GB6oH12zC+aHRD945jdjF2Vg== + +"@esbuild/freebsd-x64@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.6.tgz#ae0230860e27df204a616671e028ff8fdffa009a" + integrity sha512-hn9qvkjHSIB5Z9JgCCjED6YYVGCNpqB7dEGavBdG6EjBD8S/UcNUIlGcB35NCkMETkdYwfZSvD9VoDJX6VeUVA== + +"@esbuild/linux-arm64@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.6.tgz#3042bc423a978deab44a72244b863f743fd9fda1" + integrity sha512-HQCOrk9XlH3KngASLaBfHpcoYEGUt829A9MyxaI8RMkfRA8SakG6YQEITAuwmtzFdEu5GU4eyhKcpv27dFaOBg== + +"@esbuild/linux-arm@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.6.tgz#50a537de609315979509120b0181882978294db1" + integrity sha512-G8IR5zFgpXad/Zp7gr7ZyTKyqZuThU6z1JjmRyN1vSF8j0bOlGzUwFSMTbctLAdd7QHpeyu0cRiuKrqK1ZTwvQ== + +"@esbuild/linux-ia32@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.6.tgz#f99c48b597facf9cbf8e1a2522ce379b2ad7b0c4" + integrity sha512-22eOR08zL/OXkmEhxOfshfOGo8P69k8oKHkwkDrUlcB12S/sw/+COM4PhAPT0cAYW/gpqY2uXp3TpjQVJitz7w== + +"@esbuild/linux-loong64@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.6.tgz#9fe79be31ce305564aa62da190f38e199d6d26b7" + integrity sha512-82RvaYAh/SUJyjWA8jDpyZCHQjmEggL//sC7F3VKYcBMumQjUL3C5WDl/tJpEiKtt7XrWmgjaLkrk205zfvwTA== + +"@esbuild/linux-mips64el@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.6.tgz#5a922dad90fc8a83fd0631c136b46128153ffb6f" + integrity sha512-8tvnwyYJpR618vboIv2l8tK2SuK/RqUIGMfMENkeDGo3hsEIrpGldMGYFcWxWeEILe5Fi72zoXLmhZ7PR23oQA== + +"@esbuild/linux-ppc64@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.6.tgz#a7fccf924824999b301546843adb4f51051965e8" + integrity sha512-Qt+D7xiPajxVNk5tQiEJwhmarNnLPdjXAoA5uWMpbfStZB0+YU6a3CtbWYSy+sgAsnyx4IGZjWsTzBzrvg/fMA== + +"@esbuild/linux-riscv64@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.6.tgz#41d2db11550662d6c03902d9d8d26b0ed5bb8d55" + integrity sha512-lxRdk0iJ9CWYDH1Wpnnnc640ajF4RmQ+w6oHFZmAIYu577meE9Ka/DCtpOrwr9McMY11ocbp4jirgGgCi7Ls/g== + +"@esbuild/linux-s390x@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.6.tgz#d7a843a2620e73c5c9d65c482e2fbddc7e0f7753" + integrity sha512-MopyYV39vnfuykHanRWHGRcRC3AwU7b0QY4TI8ISLfAGfK+tMkXyFuyT1epw/lM0pflQlS53JoD22yN83DHZgA== + +"@esbuild/linux-x64@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.6.tgz#d3f20f0c2bdaa1b9ed1c0df7db034771e7aa5234" + integrity sha512-UWcieaBzsN8WYbzFF5Jq7QULETPcQvlX7KL4xWGIB54OknXJjBO37sPqk7N82WU13JGWvmDzFBi1weVBajPovg== + +"@esbuild/netbsd-x64@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.6.tgz#6108d7270599ee37cd57bb14e4516a83541885d5" + integrity sha512-EpWiLX0fzvZn1wxtLxZrEW+oQED9Pwpnh+w4Ffv8ZLuMhUoqR9q9rL4+qHW8F4Mg5oQEKxAoT0G+8JYNqCiR6g== + +"@esbuild/openbsd-x64@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.6.tgz#b1b5aaa2c9028e90a2bef6774a9c67451f53f164" + integrity sha512-fFqTVEktM1PGs2sLKH4M5mhAVEzGpeZJuasAMRnvDZNCV0Cjvm1Hu35moL2vC0DOrAQjNTvj4zWrol/lwQ8Deg== + +"@esbuild/sunos-x64@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.6.tgz#b51b648cea77c62b1934a4fdcfee7aaa9de174cb" + integrity sha512-M+XIAnBpaNvaVAhbe3uBXtgWyWynSdlww/JNZws0FlMPSBy+EpatPXNIlKAdtbFVII9OpX91ZfMb17TU3JKTBA== + +"@esbuild/win32-arm64@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.6.tgz#34e5665f239047c302c8d153406c87db22afd58a" + integrity sha512-2DchFXn7vp/B6Tc2eKdTsLzE0ygqKkNUhUBCNtMx2Llk4POIVMUq5rUYjdcedFlGLeRe1uLCpVvCmE+G8XYybA== + +"@esbuild/win32-ia32@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.6.tgz#f7aaebe325e67f44c0a738e80a98221504677b4a" + integrity sha512-PBo/HPDQllyWdjwAVX+Gl2hH0dfBydL97BAH/grHKC8fubqp02aL4S63otZ25q3sBdINtOBbz1qTZQfXbP4VBg== + +"@esbuild/win32-x64@0.19.6": + version "0.19.6" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.6.tgz#7134e5dea1f5943b013e96fc34f9638a5f3d7e3e" + integrity sha512-OE7yIdbDif2kKfrGa+V0vx/B3FJv2L4KnIiLlvtibPyO9UkgO3rzYE0HhpREo2vmJ1Ixq1zwm9/0er+3VOSZJA== "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" @@ -198,10 +198,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.53.0": - version "8.53.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.53.0.tgz#bea56f2ed2b5baea164348ff4d5a879f6f81f20d" - integrity sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w== +"@eslint/js@8.54.0": + version "8.54.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.54.0.tgz#4fab9a2ff7860082c304f750e94acd644cf984cf" + integrity sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ== "@floating-ui/core@^1.4.2": version "1.5.0" @@ -363,15 +363,15 @@ resolved "https://registry.yarnpkg.com/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.2.tgz#d693d972974a354034454ec1317eb6afd0b00312" integrity sha512-jnOD+/+dSrfTWYfSXBXlo5l5f0q1UuJo3tkbMDCYA2lKUYq79jaxqtGEvnRoh049nt1vdo1+45RinipU6FGY2g== -"@lit/react@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@lit/react/-/react-1.0.1.tgz#00dc227c60947abd3cbdaa03bb9cca7f5b815451" - integrity sha512-io4yIAl9ZFY5coI2ix+nSly4rmEKLFyZM66mxOr9xvxDqwtjdVU/g6Tchb7bo+A23+5Uu/1RZpLCpvHLCGi0rw== +"@lit/react@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@lit/react/-/react-1.0.2.tgz#4951ff1590d69aad912d0a950b3518d19eb7e220" + integrity sha512-UJ5TQ46DPcJDIzyjbwbj6Iye0XcpCxL2yb03zcWq1BpWchpXS3Z0BPVhg7zDfZLF6JemPml8u/gt/+KwJ/23sg== "@lit/reactive-element@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-2.0.1.tgz#b17d8818d9c72ccc489f44e35d87cfa18a9c8c93" - integrity sha512-eu50SQXHRthFwWJMp0oAFg95Rvm6MTPjxSXWuvAu7It90WVFLFpNBoIno7XOXSDvVgTrtKnUV4OLJqys2Svn4g== + version "2.0.2" + resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-2.0.2.tgz#779ae9d265407daaf7737cb892df5ec2a86e22a0" + integrity sha512-SVOwLAWUQg3Ji1egtOt1UiFe4zdDpnWHyc5qctSceJ5XIu0Uc76YmGpIjZgx9YJ0XtdW0Jm507sDvjOu+HnB8w== dependencies: "@lit-labs/ssr-dom-shim" "^1.1.2" @@ -593,11 +593,11 @@ integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== "@playwright/browser-chromium@^1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@playwright/browser-chromium/-/browser-chromium-1.39.0.tgz#549ea67a4734e8a17d5d3fdeabcdcf1e02cffd84" - integrity sha512-s1WPO0qOE7PIZcdcJEd4CHQgXf9rOwy00Den8DsXTI26n/Eqa2HzFSbLRE1Eh2nIJZFSGyKLbopHR0HkT8ClZw== + version "1.40.0" + resolved "https://registry.yarnpkg.com/@playwright/browser-chromium/-/browser-chromium-1.40.0.tgz#459266c181d621d589aed125e4f86dd3cab80a22" + integrity sha512-+MxALUvUcUx8NEKSv2fXfkXrnBe9qcKPAqXjQsLu52gYhIxbF/C63fedLbZsWJU5hnmxIVWVDHMszq2cVl55mw== dependencies: - playwright-core "1.39.0" + playwright-core "1.40.0" "@polka/url@^1.0.0-next.20": version "1.0.0-next.23" @@ -733,9 +733,9 @@ integrity sha512-xKU7bUjiFTIttpWaIZ9qvgg+22O1nmbA+HRxdlR+u6TWsGfmFdXrheJoK4fFxrHNVIOBDvDNKZG+LYBpMHpX3w== "@types/node@*": - version "20.9.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.9.0.tgz#bfcdc230583aeb891cf51e73cfdaacdd8deae298" - integrity sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw== + version "20.9.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.9.2.tgz#002815c8e87fe0c9369121c78b52e800fadc0ac6" + integrity sha512-WHZXKFCEyIUJzAwh3NyyTHYSR35SevJ6mZ1nWwJafKtiQbqRTIKSRcw3Ma3acqgsent3RRDqeVwpHntMk+9irg== dependencies: undici-types "~5.26.4" @@ -1652,9 +1652,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001541: - version "1.0.30001562" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001562.tgz#9d16c5fd7e9c592c4cd5e304bc0f75b0008b2759" - integrity sha512-kfte3Hym//51EdX4239i+Rmp20EsLIYGdPkERegTgU19hQWCRhsRFGKHTliUlsry53tv17K7n077Kqa0WJU4ng== + version "1.0.30001563" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001563.tgz#aa68a64188903e98f36eb9c56e48fba0c1fe2a32" + integrity sha512-na2WUmOxnwIZtwnFI2CZ/3er0wdNzU7hN+cPYz/z2ajHThnkWjNBOpEPP4n+4r2WPM847JaMotaJE3bnfzjyKw== capital-case@^1.0.4: version "1.0.4" @@ -2621,9 +2621,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.4.535: - version "1.4.583" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.583.tgz#7b0ac4f36388da4b5485788adb92cd7dd0abffc4" - integrity sha512-93y1gcONABZ7uqYe/JWDVQP/Pj/sQSunF0HVAPdlg/pfBnOyBMLlQUxWvkqcljJg1+W6cjvPuYD+r1Th9Tn8mA== + version "1.4.588" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.588.tgz#d553f3c008e73488fb181fdf2601fdb0b1ffbb78" + integrity sha512-soytjxwbgcCu7nh5Pf4S2/4wa6UIu+A3p03U2yVr53qGxi1/VTR3ENI+p50v+UxqqZAfl48j3z55ud7VHIOr9w== emoji-regex@^8.0.0: version "8.0.0" @@ -2797,33 +2797,33 @@ esbuild-sass-plugin@2.16.0: resolve "^1.22.6" sass "^1.7.3" -esbuild@0.19.5, esbuild@^0.19.0: - version "0.19.5" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.5.tgz#53a0e19dfbf61ba6c827d51a80813cf071239a8c" - integrity sha512-bUxalY7b1g8vNhQKdB24QDmHeY4V4tw/s6Ak5z+jJX9laP5MoQseTOMemAr0gxssjNcH0MCViG8ONI2kksvfFQ== +esbuild@0.19.6, esbuild@^0.19.0: + version "0.19.6" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.6.tgz#baa0e8b6b9e655c54ffd57f1772e44677a7931cc" + integrity sha512-Xl7dntjA2OEIvpr9j0DVxxnog2fyTGnyVoQXAMQI6eR3mf9zCQds7VIKUDCotDgE/p4ncTgeRqgX8t5d6oP4Gw== optionalDependencies: - "@esbuild/android-arm" "0.19.5" - "@esbuild/android-arm64" "0.19.5" - "@esbuild/android-x64" "0.19.5" - "@esbuild/darwin-arm64" "0.19.5" - "@esbuild/darwin-x64" "0.19.5" - "@esbuild/freebsd-arm64" "0.19.5" - "@esbuild/freebsd-x64" "0.19.5" - "@esbuild/linux-arm" "0.19.5" - "@esbuild/linux-arm64" "0.19.5" - "@esbuild/linux-ia32" "0.19.5" - "@esbuild/linux-loong64" "0.19.5" - "@esbuild/linux-mips64el" "0.19.5" - "@esbuild/linux-ppc64" "0.19.5" - "@esbuild/linux-riscv64" "0.19.5" - "@esbuild/linux-s390x" "0.19.5" - "@esbuild/linux-x64" "0.19.5" - "@esbuild/netbsd-x64" "0.19.5" - "@esbuild/openbsd-x64" "0.19.5" - "@esbuild/sunos-x64" "0.19.5" - "@esbuild/win32-arm64" "0.19.5" - "@esbuild/win32-ia32" "0.19.5" - "@esbuild/win32-x64" "0.19.5" + "@esbuild/android-arm" "0.19.6" + "@esbuild/android-arm64" "0.19.6" + "@esbuild/android-x64" "0.19.6" + "@esbuild/darwin-arm64" "0.19.6" + "@esbuild/darwin-x64" "0.19.6" + "@esbuild/freebsd-arm64" "0.19.6" + "@esbuild/freebsd-x64" "0.19.6" + "@esbuild/linux-arm" "0.19.6" + "@esbuild/linux-arm64" "0.19.6" + "@esbuild/linux-ia32" "0.19.6" + "@esbuild/linux-loong64" "0.19.6" + "@esbuild/linux-mips64el" "0.19.6" + "@esbuild/linux-ppc64" "0.19.6" + "@esbuild/linux-riscv64" "0.19.6" + "@esbuild/linux-s390x" "0.19.6" + "@esbuild/linux-x64" "0.19.6" + "@esbuild/netbsd-x64" "0.19.6" + "@esbuild/openbsd-x64" "0.19.6" + "@esbuild/sunos-x64" "0.19.6" + "@esbuild/win32-arm64" "0.19.6" + "@esbuild/win32-ia32" "0.19.6" + "@esbuild/win32-x64" "0.19.6" escalade@^3.1.1: version "3.1.1" @@ -2956,15 +2956,15 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4 resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== -eslint@8.53.0: - version "8.53.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.53.0.tgz#14f2c8244298fcae1f46945459577413ba2697ce" - integrity sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag== +eslint@8.54.0: + version "8.54.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.54.0.tgz#588e0dd4388af91a2e8fa37ea64924074c783537" + integrity sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" "@eslint/eslintrc" "^2.1.3" - "@eslint/js" "8.53.0" + "@eslint/js" "8.54.0" "@humanwhocodes/config-array" "^0.11.13" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" @@ -3767,9 +3767,9 @@ ieee754@^1.1.13: integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== ignore@^5.1.9, ignore@^5.2.0, ignore@^5.2.4: - version "5.2.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" - integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== + version "5.3.0" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78" + integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg== image-minimizer-webpack-plugin@3.8.3: version "3.8.3" @@ -4405,29 +4405,29 @@ linkify-it@^3.0.1: uc.micro "^1.0.1" lit-element@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-4.0.1.tgz#fe9d82e2d034f819156f561f6f23b0ed0c9d19dc" - integrity sha512-OxRMJem4HKZt0320HplLkBPoi4KHiEHoPHKd8Lzf07ZQVAOKIjZ32yPLRKRDEolFU1RgrQBfSHQMoxKZ72V3Kw== + version "4.0.2" + resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-4.0.2.tgz#1a519896d5ab7c7be7a8729f400499e38779c093" + integrity sha512-/W6WQZUa5VEXwC7H9tbtDMdSs9aWil3Ou8hU6z2cOKWbsm/tXPAcsoaHVEtrDo0zcOIE5GF6QgU55tlGL2Nihg== dependencies: "@lit-labs/ssr-dom-shim" "^1.1.2" "@lit/reactive-element" "^2.0.0" - lit-html "^3.0.0" + lit-html "^3.1.0" -lit-html@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-3.0.2.tgz#25d2718b1e095a148a54c63bcd780c7550bb82f8" - integrity sha512-Q1A5lHza3bnmxoWJn6yS6vQZQdExl4fghk8W1G+jnAEdoFNYo5oeBBb/Ol7zSEdKd3TR7+r0zsJQyuWEVguiyQ== +lit-html@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-3.1.0.tgz#a7b93dd682073f2e2029656f4e9cd91e8034c196" + integrity sha512-FwAjq3iNsaO6SOZXEIpeROlJLUlrbyMkn4iuv4f4u1H40Jw8wkeR/OUXZUHUoiYabGk8Y4Y0F/rgq+R4MrOLmA== dependencies: "@types/trusted-types" "^2.0.2" -lit@3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lit/-/lit-3.0.2.tgz#e22e90c2cbcc3f37bf3c2558df66f3af4331c9cf" - integrity sha512-ZoVUPGgXOQocP4OvxehEOBmC4rWB4cRYDPaz7aFmH8DFytsCi/NeACbr4C6vNPGDEC07BrhUos7uVNayDKLQ2Q== +lit@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/lit/-/lit-3.1.0.tgz#76429b85dc1f5169fed499a0f7e89e2e619010c9" + integrity sha512-rzo/hmUqX8zmOdamDAeydfjsGXbbdtAFqMhmocnh2j9aDYqbu0fjXygjCa0T99Od9VQ/2itwaGrjZz/ZELVl7w== dependencies: "@lit/reactive-element" "^2.0.0" lit-element "^4.0.0" - lit-html "^3.0.0" + lit-html "^3.1.0" loader-runner@^4.2.0: version "4.3.0" @@ -4517,11 +4517,9 @@ lru-cache@^7.5.1, lru-cache@^7.7.1: integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== "lru-cache@^9.1.1 || ^10.0.0": - version "10.0.2" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.2.tgz#34504678cc3266b09b8dfd6fab4e1515258271b7" - integrity sha512-Yj9mA8fPiVgOUpByoTZO5pNrcl5Yk37FcSHsUINpAsaBIEZIuqcCclDZJCVxqQShDsmYX8QG63svJiTbOATZwg== - dependencies: - semver "^7.3.5" + version "10.0.3" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.3.tgz#b40014d7d2d16d94130b87297a04a1f24874ae7c" + integrity sha512-B7gr+F6MkqB3uzINHXNctGieGsRTMwIBgxkp0yq/5BwcuDzD4A8wQpHQW6vDAm1uKSLQghmRdD9sKqf2vJ1cEg== lz-string@1.5.0: version "1.5.0" @@ -5359,17 +5357,17 @@ pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -playwright-core@1.39.0: - version "1.39.0" - resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.39.0.tgz#efeaea754af4fb170d11845b8da30b2323287c63" - integrity sha512-+k4pdZgs1qiM+OUkSjx96YiKsXsmb59evFoqv8SKO067qBA+Z2s/dCzJij/ZhdQcs2zlTAgRKfeiiLm8PQ2qvw== +playwright-core@1.40.0: + version "1.40.0" + resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.40.0.tgz#82f61e5504cb3097803b6f8bbd98190dd34bdf14" + integrity sha512-fvKewVJpGeca8t0ipM56jkVSU6Eo0RmFvQ/MaCQNDYm+sdvKkMBBWTE1FdeMqIdumRaXXjZChWHvIzCGM/tA/Q== playwright@^1.39.0: - version "1.39.0" - resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.39.0.tgz#184c81cd6478f8da28bcd9e60e94fcebf566e077" - integrity sha512-naE5QT11uC/Oiq0BwZ50gDmy8c8WLPRTEWuSSFVG2egBka/1qMoSqYQcROMT9zLwJ86oPofcTH2jBY/5wWOgIw== + version "1.40.0" + resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.40.0.tgz#2a1824b9fe5c4fe52ed53db9ea68003543a99df0" + integrity sha512-gyHAgQjiDf1m34Xpwzaqb76KgfzYrhK7iih+2IzcOCoZWr/8ZqmdBw+t0RU85ZmfJMgtgAiNtBQ/KS2325INXw== dependencies: - playwright-core "1.39.0" + playwright-core "1.40.0" optionalDependencies: fsevents "2.3.2" @@ -6700,15 +6698,16 @@ svgicons2svgfont@^12.0.0: sax "^1.2.4" svg-pathdata "^6.0.3" -svgo@3.0.3, svgo@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.0.3.tgz#8cdfece6d4a0dc1dc116766d806daf817c1798b8" - integrity sha512-X4UZvLhOglD5Xrp834HzGHf8RKUW0Ahigg/08yRO1no9t2NxffOkMiQ0WmaMIbaGlVTlSst2zWANsdhz5ybXgA== +svgo@3.0.4, svgo@^3.0.2: + version "3.0.4" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.0.4.tgz#67b40a710743e358e8d19ec288de8f1e388afbb4" + integrity sha512-T+Xul3JwuJ6VGXKo/p2ndqx1ibxNKnLTvRc1ZTWKCfyKS/GgNjRZcYsK84fxTsy/izr91g/Rwx6fGnVgaFSI5g== dependencies: "@trysound/sax" "0.2.0" commander "^7.2.0" css-select "^5.1.0" css-tree "^2.2.1" + css-what "^6.1.0" csso "5.0.5" picocolors "^1.0.0" @@ -6871,10 +6870,10 @@ ts-api-utils@^1.0.1: resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331" integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg== -ts-loader@9.5.0: - version "9.5.0" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.5.0.tgz#f0a51dda37cc4d8e43e6cb14edebbc599b0c3aa2" - integrity sha512-LLlB/pkB4q9mW2yLdFMnK3dEHbrBjeZTYguaaIfusyojBgAGf5kF+O6KcWqiGzWqHk0LBsoolrp4VftEURhybg== +ts-loader@9.5.1: + version "9.5.1" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.5.1.tgz#63d5912a86312f1fbe32cef0859fb8b2193d9b89" + integrity sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg== dependencies: chalk "^4.1.0" enhanced-resolve "^5.0.0" @@ -7189,10 +7188,10 @@ webidl-conversions@^3.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== -webpack-bundle-analyzer@4.10.0: - version "4.10.0" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.0.tgz#eecb0ade9bd1944d3d2e38262ec9793da6f13e69" - integrity sha512-j+apH0Cs+FY8IOIwxLbkgEJnbQgEPEG8uqLVnRb9tAoGbyKNxQA1u9wNDrTQHK3PinO4Pckew7AE7pnX/RS3wA== +webpack-bundle-analyzer@4.10.1: + version "4.10.1" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.1.tgz#84b7473b630a7b8c21c741f81d8fe4593208b454" + integrity sha512-s3P7pgexgT/HTUSYgxJyn28A+99mmLq4HsJepMPzu0R8ImJc52QNqaFYW1Z2z2uIb1/J3eYgaAWVpaC+v/1aAQ== dependencies: "@discoveryjs/json-ext" "0.5.7" acorn "^8.0.4" From ef251d934fa296af4a199f1084b9f7c28bbba646 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Thu, 16 Nov 2023 11:09:00 -0500 Subject: [PATCH 0254/1012] Removes dead tab code in patch details --- .../components/patch-details-app.ts | 32 +------------------ .../apps/plus/patchDetails/patchDetails.scss | 3 -- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/src/webviews/apps/plus/patchDetails/components/patch-details-app.ts b/src/webviews/apps/plus/patchDetails/components/patch-details-app.ts index eda706281e01b..66eab208c44a8 100644 --- a/src/webviews/apps/plus/patchDetails/components/patch-details-app.ts +++ b/src/webviews/apps/plus/patchDetails/components/patch-details-app.ts @@ -1,5 +1,5 @@ import { Badge, defineGkElement, Menu, MenuItem, Popover } from '@gitkraken/shared-web-components'; -import { html, nothing } from 'lit'; +import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { when } from 'lit/directives/when.js'; import type { DraftDetails, Mode, State } from '../../../../../plus/webviews/patchDetails/protocol'; @@ -108,39 +108,9 @@ export class GlPatchDetailsApp extends GlElement { } } - private renderTabs() { - return nothing; - // return html` - //

- // `; - } - override render() { return html`
- ${this.renderTabs()}
${when( this.mode === 'view', diff --git a/src/webviews/apps/plus/patchDetails/patchDetails.scss b/src/webviews/apps/plus/patchDetails/patchDetails.scss index f1f30c1d99cde..c4d399d0d5037 100644 --- a/src/webviews/apps/plus/patchDetails/patchDetails.scss +++ b/src/webviews/apps/plus/patchDetails/patchDetails.scss @@ -166,9 +166,6 @@ textarea.message-input__control { flex-direction: column; overflow: hidden; } -.details-tab { - flex: none; -} main { flex: 1 1 auto; From 2c85af90e1d93f03db553af6605fc1dde262a8dc Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Fri, 17 Nov 2023 17:02:33 -0500 Subject: [PATCH 0255/1012] Updates commit details to new tree component --- .../apps/commitDetails/commitDetails.ts | 69 +- .../components/commit-details-app.ts | 16 + .../components/gl-commit-details.ts | 39 ++ .../components/gl-details-base.ts | 609 ++++++++++++------ .../components/gl-wip-details.ts | 14 + .../commitDetails/commitDetailsWebview.ts | 4 +- src/webviews/commitDetails/protocol.ts | 2 +- 7 files changed, 522 insertions(+), 231 deletions(-) diff --git a/src/webviews/apps/commitDetails/commitDetails.ts b/src/webviews/apps/commitDetails/commitDetails.ts index f8be93a08c9b7..0c93efd0a68a2 100644 --- a/src/webviews/apps/commitDetails/commitDetails.ts +++ b/src/webviews/apps/commitDetails/commitDetails.ts @@ -27,10 +27,11 @@ import { import type { IpcMessage } from '../../protocol'; import { ExecuteCommandType, onIpc } from '../../protocol'; import { App } from '../shared/appBase'; -import type { FileChangeListItem, FileChangeListItemDetail } from '../shared/components/list/file-change-list-item'; import type { WebviewPane, WebviewPaneExpandedChangeEventDetail } from '../shared/components/webview-pane'; import { DOM } from '../shared/dom'; import type { GlCommitDetailsApp } from './components/commit-details-app'; +import type { GlCommitDetails } from './components/gl-commit-details'; +import type { FileChangeListItemDetail } from './components/gl-details-base'; import './commitDetails.scss'; import '../shared/components/actions/action-item'; import '../shared/components/actions/action-nav'; @@ -61,27 +62,6 @@ export class CommitDetailsApp extends App> { override onBind() { const disposables = [ - DOM.on('file-change-list-item', 'file-open-on-remote', e => - this.onOpenFileOnRemote(e.detail), - ), - DOM.on('file-change-list-item', 'file-open', e => - this.onOpenFile(e.detail), - ), - DOM.on('file-change-list-item', 'file-compare-working', e => - this.onCompareFileWithWorking(e.detail), - ), - DOM.on('file-change-list-item', 'file-compare-previous', e => - this.onCompareFileWithPrevious(e.detail), - ), - DOM.on('file-change-list-item', 'file-more-actions', e => - this.onFileMoreActions(e.detail), - ), - DOM.on('file-change-list-item', 'file-stage', e => - this.onStageFile(e.detail), - ), - DOM.on('file-change-list-item', 'file-unstage', e => - this.onUnstageFile(e.detail), - ), DOM.on('[data-action="commit-actions"]', 'click', e => this.onCommitActions(e)), DOM.on('[data-action="pick-commit"]', 'click', e => this.onPickCommit(e)), DOM.on('[data-action="wip"]', 'click', e => this.onSwitchMode(e, 'wip')), @@ -92,7 +72,7 @@ export class CommitDetailsApp extends App> { DOM.on('[data-action="pin"]', 'click', e => this.onTogglePin(e)), DOM.on('[data-action="back"]', 'click', e => this.onNavigate('back', e)), DOM.on('[data-action="forward"]', 'click', e => this.onNavigate('forward', e)), - DOM.on('[data-action="create-patch"]', 'click', e => this.onCreatePatchFromWip(e)), + DOM.on('[data-action="create-patch"]', 'click', _e => this.onCreatePatchFromWip(true)), DOM.on( '[data-region="rich-pane"]', 'expanded-change', @@ -100,6 +80,33 @@ export class CommitDetailsApp extends App> { ), DOM.on('[data-action="explain-commit"]', 'click', e => this.onExplainCommit(e)), DOM.on('[data-action="switch-ai"]', 'click', e => this.onSwitchAiModel(e)), + DOM.on('gl-wip-details', 'create-patch', e => + this.onCreatePatchFromWip(e.detail.checked), + ), + + DOM.on('gl-commit-details', 'file-open-on-remote', e => + this.onOpenFileOnRemote(e.detail), + ), + DOM.on('gl-commit-details,gl-wip-details', 'file-open', e => + this.onOpenFile(e.detail), + ), + DOM.on('gl-commit-details', 'file-compare-working', e => + this.onCompareFileWithWorking(e.detail), + ), + DOM.on( + 'gl-commit-details,gl-wip-details', + 'file-compare-previous', + e => this.onCompareFileWithPrevious(e.detail), + ), + DOM.on('gl-commit-details', 'file-more-actions', e => + this.onFileMoreActions(e.detail), + ), + DOM.on('gl-wip-details', 'file-stage', e => + this.onStageFile(e.detail), + ), + DOM.on('gl-wip-details', 'file-unstage', e => + this.onUnstageFile(e.detail), + ), ]; return disposables; @@ -153,21 +160,9 @@ export class CommitDetailsApp extends App> { } } - private onCreatePatchFromWip(e: MouseEvent) { + private onCreatePatchFromWip(checked: boolean | 'staged' = true) { if (this.state.wip?.changes == null) return; - - const wipCheckedParam = ((e.target as HTMLElement)?.closest('[data-wip-checked]') as HTMLElement | undefined) - ?.dataset.wipChecked; - let wipChecked: boolean | 'staged'; - if (wipCheckedParam == null) { - wipChecked = true; - } else if (wipCheckedParam === 'staged') { - wipChecked = wipCheckedParam; - } else { - wipChecked = wipCheckedParam === 'true'; - } - - this.sendCommand(CreatePatchFromWipCommandType, { changes: this.state.wip?.changes, checked: wipChecked }); + this.sendCommand(CreatePatchFromWipCommandType, { changes: this.state.wip?.changes, checked: checked }); } private onCommandClickedCore(action?: string) { diff --git a/src/webviews/apps/commitDetails/components/commit-details-app.ts b/src/webviews/apps/commitDetails/components/commit-details-app.ts index 545b60167e9f4..1151282f0042d 100644 --- a/src/webviews/apps/commitDetails/components/commit-details-app.ts +++ b/src/webviews/apps/commitDetails/components/commit-details-app.ts @@ -68,6 +68,22 @@ export class GlCommitDetailsApp extends LitElement { defineGkElement(Badge); } + private indentPreference = 16; + private updateDocumentProperties() { + const preference = this.state?.preferences?.indent; + if (preference === this.indentPreference) return; + this.indentPreference = preference ?? 16; + + const rootStyle = document.documentElement.style; + rootStyle.setProperty('--gitlens-tree-indent', `${this.indentPreference}px`); + } + + override updated(changedProperties: Map) { + if (changedProperties.has('state')) { + this.updateDocumentProperties(); + } + } + override render() { const wip = this.state?.wip; diff --git a/src/webviews/apps/commitDetails/components/gl-commit-details.ts b/src/webviews/apps/commitDetails/components/gl-commit-details.ts index c3fcb00c4e508..c4a07ab5dd663 100644 --- a/src/webviews/apps/commitDetails/components/gl-commit-details.ts +++ b/src/webviews/apps/commitDetails/components/gl-commit-details.ts @@ -8,7 +8,9 @@ import type { PullRequestShape } from '../../../../git/models/pullRequest'; import type { Serialized } from '../../../../system/serialize'; import type { State } from '../../../commitDetails/protocol'; import { messageHeadlineSplitterToken } from '../../../commitDetails/protocol'; +import type { TreeItemAction, TreeItemBase } from '../../shared/components/tree/base'; import { uncommittedSha } from '../commitDetails'; +import type { File } from './gl-details-base'; import { GlDetailsBase } from './gl-details-base'; interface ExplainState { @@ -522,4 +524,41 @@ export class GlCommitDetails extends GlDetailsBase { const { added, deleted, changed } = stats.changedFiles; return html``; } + + override getFileActions(_file: File, _options?: Partial): TreeItemAction[] { + const actions = [ + { + icon: 'go-to-file', + label: 'Open file', + action: 'file-open', + }, + ]; + + if (this.isUncommitted) { + return actions; + } + + actions.push({ + icon: 'git-compare', + label: 'Open Changes with Working File', + action: 'file-compare-working', + }); + + if (!this.isStash) { + actions.push( + { + icon: 'globe', + label: 'Open on remote', + action: 'file-open-on-remote', + }, + { + icon: 'ellipsis', + label: 'Show more actions', + action: 'file-more-actions', + }, + ); + } + + return actions; + } } diff --git a/src/webviews/apps/commitDetails/components/gl-details-base.ts b/src/webviews/apps/commitDetails/components/gl-details-base.ts index 2cee5cafe01ea..4b63ddff50c0b 100644 --- a/src/webviews/apps/commitDetails/components/gl-details-base.ts +++ b/src/webviews/apps/commitDetails/components/gl-details-base.ts @@ -1,16 +1,31 @@ import type { TemplateResult } from 'lit'; import { html, LitElement } from 'lit'; import { property } from 'lit/decorators.js'; -import { ifDefined } from 'lit/directives/if-defined.js'; -import { when } from 'lit/directives/when.js'; +import type { TextDocumentShowOptions } from 'vscode'; import type { HierarchicalItem } from '../../../../system/array'; import { makeHierarchical } from '../../../../system/array'; import type { Preferences, State } from '../../../commitDetails/protocol'; +import type { + TreeItemAction, + TreeItemActionDetail, + TreeItemBase, + TreeItemCheckedDetail, + TreeItemSelectionDetail, + TreeModel, +} from '../../shared/components/tree/base'; +import '../../shared/components/tree/tree-generator'; type Files = Mutable['files']>>; -type File = Files[0]; +export type File = Files[0]; type Mode = 'commit' | 'stash' | 'wip'; +// Can only import types from 'vscode' +const BesideViewColumn = -2; /*ViewColumn.Beside*/ + +export interface FileChangeListItemDetail extends File { + showOptions?: TextDocumentShowOptions; +} + export class GlDetailsBase extends LitElement { readonly tab: 'wip' | 'commit' = 'commit'; @@ -26,165 +41,43 @@ export class GlDetailsBase extends LitElement { @property({ attribute: 'empty-text' }) emptyText? = 'No Files'; - private renderWipCategory(staged = true, hasFiles = true) { - const label = staged ? 'Staged Changes' : 'Unstaged Changes'; - const shareLabel = `Share ${label}`; - return html` - - ${label} - ${when( - this.tab === 'wip', - () => - html` `, - )} - `; + get fileLayout() { + return this.preferences?.files?.layout ?? 'auto'; } - private renderFileList(mode: Mode, files: Files) { - let items; - let classes; - - if (this.isUncommitted) { - items = []; - classes = `indentGuides-${this.preferences?.indentGuides}`; - - const staged = files.filter(f => f.staged); - if (staged.length) { - // items.push(html`Staged Changes`); - items.push(this.renderWipCategory(true, true)); - - for (const f of staged) { - items.push(this.renderFile(mode, f, 2, true)); - } - } - - const unstaged = files.filter(f => !f.staged); - if (unstaged.length) { - // items.push(html`Unstaged Changes`); - items.push(this.renderWipCategory(false, true)); - - for (const f of unstaged) { - items.push(this.renderFile(mode, f, 2, true)); - } - } - } else { - items = files.map(f => this.renderFile(mode, f)); - } - - return html`${items}`; + get isCompact() { + return this.preferences?.files?.compact ?? true; } - private renderFileTree(mode: Mode, files: Files) { - const compact = this.preferences?.files?.compact ?? true; - - let items; - - if (this.isUncommitted) { - items = []; - - const staged = files.filter(f => f.staged); - if (staged.length) { - // items.push(html`Staged Changes`); - items.push(this.renderWipCategory(true, true)); - items.push(...this.renderFileSubtree(mode, staged, 1, compact)); - } - - const unstaged = files.filter(f => !f.staged); - if (unstaged.length) { - // items.push(html`Unstaged Changes`); - items.push(this.renderWipCategory(false, true)); - items.push(...this.renderFileSubtree(mode, unstaged, 1, compact)); - } - } else { - items = this.renderFileSubtree(mode, files, 0, compact); - } - - return html`${items}`; - } - - private renderFileSubtree(mode: Mode, files: Files, rootLevel: number, compact: boolean) { - const tree = makeHierarchical( - files, - n => n.path.split('/'), - (...parts: string[]) => parts.join('/'), - compact, - ); - const flatTree = flattenHeirarchy(tree); - return flatTree.map(({ level, item }) => { - if (item.name === '') return undefined; - - if (item.value == null) { - return html` - - - ${item.name} - - `; - } - - return this.renderFile(mode, item.value, rootLevel + level, true); - }); - } - - private renderFile(mode: Mode, file: File, level: number = 1, tree: boolean = false): TemplateResult<1> { - return html` - - `; + get indentGuides(): 'none' | 'onHover' | 'always' { + return this.preferences?.indentGuides ?? 'none'; } protected renderChangedFiles(mode: Mode, subtitle?: TemplateResult<1>) { - const layout = this.preferences?.files?.layout ?? 'auto'; - + const isTree = this.isTree(this.files?.length ?? 0); let value = 'tree'; let icon = 'list-tree'; let label = 'View as Tree'; - let isTree = false; - if (this.preferences != null && this.files != null) { - if (layout === 'auto') { - isTree = this.files.length > (this.preferences.files?.threshold ?? 5); - } else { - isTree = layout === 'tree'; - } - - switch (layout) { - case 'auto': - value = 'list'; - icon = 'gl-list-auto'; - label = 'View as List'; - break; - case 'list': - value = 'tree'; - icon = 'list-flat'; - label = 'View as Tree'; - break; - case 'tree': - value = 'auto'; - icon = 'list-tree'; - label = 'View as Auto'; - break; - } + switch (this.fileLayout) { + case 'auto': + value = 'list'; + icon = 'gl-list-auto'; + label = 'View as List'; + break; + case 'list': + value = 'tree'; + icon = 'list-flat'; + label = 'View as Tree'; + break; + case 'tree': + value = 'auto'; + icon = 'list-tree'; + label = 'View as Auto'; + break; } + const treeModel = this.createTreeModel(mode, this.files ?? [], isTree, this.isCompact); + return html` Files changed @@ -198,31 +91,7 @@ export class GlDetailsBase extends LitElement { > -
- ${when( - this.files == null, - () => html` -
- -
-
- -
-
- -
- `, - () => - when( - this.files!.length > 0, - () => - isTree - ? this.renderFileTree(mode, this.files!) - : this.renderFileList(mode, this.files!), - () => html`

${this.emptyText}

`, - ), - )} -
+ ${this.renderTreeFileModel(treeModel)} `; } @@ -240,36 +109,392 @@ export class GlDetailsBase extends LitElement { protected override createRenderRoot() { return this; } -} -function flattenHeirarchy(item: HierarchicalItem, level = 0): { level: number; item: HierarchicalItem }[] { - const flattened: { level: number; item: HierarchicalItem }[] = []; - if (item == null) return flattened; + // Tree Model changes + protected isTree(count: number) { + if (this.fileLayout === 'auto') { + return count > (this.preferences?.files?.threshold ?? 5); + } + return this.fileLayout === 'tree'; + } - flattened.push({ level: level, item: item }); + protected createTreeModel(mode: Mode, files: Files, isTree = false, compact = true): TreeModel[] { + if (!this.isUncommitted) { + return this.createFileTreeModel(mode, files, isTree, compact); + } - if (item.children != null) { - const children = Array.from(item.children.values()); - children.sort((a, b) => { - if (!a.value || !b.value) { - return (a.value ? 1 : -1) - (b.value ? 1 : -1); + const children = []; + const staged: Files = []; + const unstaged: Files = []; + for (const f of files) { + if (f.staged) { + staged.push(f); + } else { + unstaged.push(f); } + } - if (a.relativePath < b.relativePath) { - return -1; + if (staged.length === 0 || unstaged.length === 0) { + children.push(...this.createFileTreeModel(mode, files, isTree, compact)); + } else { + if (staged.length) { + children.push({ + label: 'Staged Changes', + path: '', + level: 1, // isMulti ? 2 : 1, + branch: true, + checkable: false, + expanded: true, + checked: false, // change.checked !== false, + // disableCheck: true, + context: ['staged'], + children: this.createFileTreeModel(mode, staged, isTree, compact, { level: 2 }), + actions: this.getStagedActions(), + }); } - if (a.relativePath > b.relativePath) { - return 1; + if (unstaged.length) { + children.push({ + label: 'Unstaged Changes', + path: '', + level: 1, // isMulti ? 2 : 1, + branch: true, + checkable: false, + expanded: true, + checked: false, // change.checked === true, + context: ['unstaged'], + children: this.createFileTreeModel(mode, unstaged, isTree, compact, { level: 2 }), + actions: this.getUnstagedActions(), + }); } + } + + return children; + } + + protected sortChildren(children: TreeModel[]): TreeModel[] { + children.sort((a, b) => { + if (a.branch && !b.branch) return -1; + if (!a.branch && b.branch) return 1; + + if (a.label < b.label) return -1; + if (a.label > b.label) return 1; return 0; }); - children.forEach(child => { - flattened.push(...flattenHeirarchy(child, level + 1)); + return children; + } + + protected createFileTreeModel( + mode: Mode, + files: Files, + isTree = false, + compact = true, + options: Partial = { level: 1 }, + ): TreeModel[] { + if (options.level === undefined) { + options.level = 1; + } + + if (!files.length) { + return [ + { + label: 'No changes', + path: '', + level: options.level, + branch: false, + checkable: false, + expanded: true, + checked: false, + }, + ]; + } + + const children: TreeModel[] = []; + if (isTree) { + const fileTree = makeHierarchical( + files, + n => n.path.split('/'), + (...parts: string[]) => parts.join('/'), + compact, + ); + if (fileTree.children != null) { + for (const child of fileTree.children.values()) { + const childModel = this.walkFileTree(child, { level: options.level }); + children.push(childModel); + } + } + } else { + for (const file of files) { + const child = this.fileToTreeModel(file, { level: options.level, branch: false }, true); + children.push(child); + } + } + + this.sortChildren(children); + + return children; + } + + protected walkFileTree(item: HierarchicalItem, options: Partial = { level: 1 }): TreeModel { + if (options.level === undefined) { + options.level = 1; + } + + let model: TreeModel; + if (item.value == null) { + model = this.folderToTreeModel(item.name, options); + } else { + model = this.fileToTreeModel(item.value, options); + } + + if (item.children != null) { + const children = []; + for (const child of item.children.values()) { + const childModel = this.walkFileTree(child, { ...options, level: options.level + 1 }); + children.push(childModel); + } + + if (children.length > 0) { + this.sortChildren(children); + model.branch = true; + model.children = children; + } + } + + return model; + } + + protected getStagedActions(_options?: Partial): TreeItemAction[] { + if (this.tab === 'wip') { + return [ + { + icon: 'gl-cloud-patch-share', + label: 'Share Staged Changes', + action: 'staged-create-patch', + }, + ]; + } + return []; + } + + protected getUnstagedActions(_options?: Partial): TreeItemAction[] { + if (this.tab === 'wip') { + return [ + { + icon: 'gl-cloud-patch-share', + label: 'Share Unstaged Changes', + action: 'unstaged-create-patch', + }, + ]; + } + return []; + } + + protected getFileActions(_file: File, _options?: Partial): TreeItemAction[] { + return []; + } + + protected fileToTreeModel( + file: File, + options?: Partial, + flat = false, + glue = '/', + ): TreeModel { + const pathIndex = file.path.lastIndexOf(glue); + const fileName = pathIndex !== -1 ? file.path.substring(pathIndex + 1) : file.path; + const filePath = flat && pathIndex !== -1 ? file.path.substring(0, pathIndex) : ''; + + return { + branch: false, + expanded: true, + path: file.path, + level: 1, + checkable: false, + checked: false, + icon: 'file', //{ type: 'status', name: file.status }, + label: fileName, + description: flat === true ? filePath : undefined, + context: [file], + actions: this.getFileActions(file, options), + decorations: [{ type: 'text', label: file.status }], + ...options, + }; + } + + protected folderToTreeModel(name: string, options?: Partial): TreeModel { + return { + branch: false, + expanded: true, + path: name, + level: 1, + checkable: false, + checked: false, + icon: 'folder', + label: name, + ...options, + }; + } + + protected renderTreeFileModel(treeModel: TreeModel[]) { + return html``; + } + + // Tree Model action events + // protected onTreeItemActionClicked?(_e: CustomEvent): void; + protected onTreeItemActionClicked(e: CustomEvent) { + if (!e.detail.context || !e.detail.action) return; + + const action = e.detail.action; + switch (action.action) { + // stage actions + case 'staged-create-patch': + this.onCreatePatch(e); + break; + case 'unstaged-create-patch': + this.onCreatePatch(e, true); + break; + // file actions + case 'file-open': + this.onOpenFile(e); + break; + case 'file-unstage': + this.onUnstageFile(e); + break; + case 'file-stage': + this.onStageFile(e); + break; + case 'file-compare-working': + this.onCompareWorking(e); + break; + case 'file-open-on-remote': + this.onOpenFileOnRemote(e); + break; + case 'file-more-actions': + this.onMoreActions(e); + break; + } + } + + protected onTreeItemChecked?(_e: CustomEvent): void; + + // protected onTreeItemSelected?(_e: CustomEvent): void; + protected onTreeItemSelected(e: CustomEvent) { + if (!e.detail.context) return; + + this.onComparePrevious(e); + } + onCreatePatch(_e: CustomEvent, isAll = false) { + const event = new CustomEvent('create-patch', { + detail: { + checked: isAll ? true : 'staged', + }, + }); + this.dispatchEvent(event); + } + onOpenFile(e: CustomEvent) { + if (!e.detail.context) return; + + const [file] = e.detail.context; + const event = new CustomEvent('file-open', { + detail: this.getEventDetail(file, { + preview: false, + viewColumn: e.detail.altKey ? BesideViewColumn : undefined, + }), + }); + this.dispatchEvent(event); + } + + onOpenFileOnRemote(e: CustomEvent) { + if (!e.detail.context) return; + + const [file] = e.detail.context; + const event = new CustomEvent('file-open-on-remote', { + detail: this.getEventDetail(file, { + preview: false, + viewColumn: e.detail.altKey ? BesideViewColumn : undefined, + }), + }); + this.dispatchEvent(event); + } + + onCompareWorking(e: CustomEvent) { + if (!e.detail.context) return; + + const [file] = e.detail.context; + const event = new CustomEvent('file-compare-working', { + detail: this.getEventDetail(file, { + preview: false, + viewColumn: e.detail.altKey ? BesideViewColumn : undefined, + }), + }); + this.dispatchEvent(event); + } + + onComparePrevious(e: CustomEvent) { + if (!e.detail.context) return; + + const [file] = e.detail.context; + const event = new CustomEvent('file-compare-previous', { + detail: this.getEventDetail(file, { + preview: false, + viewColumn: e.detail.altKey ? BesideViewColumn : undefined, + }), + }); + this.dispatchEvent(event); + } + + onMoreActions(e: CustomEvent) { + if (!e.detail.context) return; + + const [file] = e.detail.context; + const event = new CustomEvent('file-more-actions', { + detail: this.getEventDetail(file), + }); + this.dispatchEvent(event); + } + + onStageFile(e: CustomEvent) { + if (!e.detail.context) return; + + const [file] = e.detail.context; + const event = new CustomEvent('file-stage', { + detail: this.getEventDetail(file, { + preview: false, + viewColumn: e.detail.altKey ? BesideViewColumn : undefined, + }), }); + this.dispatchEvent(event); } - return flattened; + onUnstageFile(e: CustomEvent) { + if (!e.detail.context) return; + + const [file] = e.detail.context; + const event = new CustomEvent('file-unstage', { + detail: this.getEventDetail(file, { + preview: false, + viewColumn: e.detail.altKey ? BesideViewColumn : undefined, + }), + }); + this.dispatchEvent(event); + } + + private getEventDetail(file: File, showOptions?: TextDocumentShowOptions): FileChangeListItemDetail { + return { + path: file.path, + repoPath: file.repoPath, + status: file.status, + // originalPath: this.originalPath, + staged: file.staged, + showOptions: showOptions, + }; + } } diff --git a/src/webviews/apps/commitDetails/components/gl-wip-details.ts b/src/webviews/apps/commitDetails/components/gl-wip-details.ts index d2d3bba62b75d..4739e71549da7 100644 --- a/src/webviews/apps/commitDetails/components/gl-wip-details.ts +++ b/src/webviews/apps/commitDetails/components/gl-wip-details.ts @@ -3,6 +3,8 @@ import { customElement, property } from 'lit/decorators.js'; import { when } from 'lit/directives/when.js'; import { pluralize } from '../../../../system/string'; import type { Wip } from '../../../commitDetails/protocol'; +import type { TreeItemAction, TreeItemBase } from '../../shared/components/tree/base'; +import type { File } from './gl-details-base'; import { GlDetailsBase } from './gl-details-base'; @customElement('gl-wip-details') @@ -76,4 +78,16 @@ export class GlWipDetails extends GlDetailsBase { ${this.renderChangedFiles('wip')} `; } + + override getFileActions(file: File, _options?: Partial): TreeItemAction[] { + const openFile = { + icon: 'go-to-file', + label: 'Open file', + action: 'file-open', + }; + if (file.staged === true) { + return [openFile, { icon: 'remove', label: 'Unstage changes', action: 'file-unstage' }]; + } + return [openFile, { icon: 'plus', label: 'Stage changes', action: 'file-stage' }]; + } } diff --git a/src/webviews/commitDetails/commitDetailsWebview.ts b/src/webviews/commitDetails/commitDetailsWebview.ts index 69d31ea602fc3..1f1108ee347a2 100644 --- a/src/webviews/commitDetails/commitDetailsWebview.ts +++ b/src/webviews/commitDetails/commitDetailsWebview.ts @@ -399,7 +399,8 @@ export class CommitDetailsWebviewProvider 'views.commitDetails.files', 'views.commitDetails.avatars', ]) || - configuration.changedAny(e, 'workbench.tree.renderIndentGuides') + configuration.changedAny(e, 'workbench.tree.renderIndentGuides') || + configuration.changedAny(e, 'workbench.tree.indent') ) { this.updatePendingContext({ preferences: { @@ -430,6 +431,7 @@ export class CommitDetailsWebviewProvider configuration.getAny( 'workbench.tree.renderIndentGuides', ) ?? 'onHover', + indent: configuration.getAny('workbench.tree.indent'), }; } diff --git a/src/webviews/commitDetails/protocol.ts b/src/webviews/commitDetails/protocol.ts index 7989e442c149d..0a4c1038964b6 100644 --- a/src/webviews/commitDetails/protocol.ts +++ b/src/webviews/commitDetails/protocol.ts @@ -37,7 +37,7 @@ export interface Preferences { avatars: boolean; dateFormat: DateTimeFormat | string; files: Config['views']['commitDetails']['files']; - // indent: number; + indent: number | undefined; indentGuides: 'none' | 'onHover' | 'always'; } export type UpdateablePreferences = Partial>; From d2bcd89a1666339bc0da406e02d0524ca25ac775 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Mon, 20 Nov 2023 11:46:47 -0500 Subject: [PATCH 0256/1012] Fixes explain ai button style and interactions --- .../apps/commitDetails/components/gl-commit-details.ts | 2 +- src/webviews/commitDetails/commitDetailsWebview.ts | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/webviews/apps/commitDetails/components/gl-commit-details.ts b/src/webviews/apps/commitDetails/components/gl-commit-details.ts index c4a07ab5dd663..ddbffaef4129a 100644 --- a/src/webviews/apps/commitDetails/components/gl-commit-details.ts +++ b/src/webviews/apps/commitDetails/components/gl-commit-details.ts @@ -321,7 +321,7 @@ export class GlCommitDetails extends GlDetailsBase {

Let AI assist in understanding the changes made with this commit.

- +

Cloud Patches + Cloud Patches ☁️ Preview

@@ -541,6 +544,7 @@

Popular views

Cloud Patches ☁️ { this.updateState(); }); break; + case DidChangeOrgSettingsType.method: + onIpc(DidChangeOrgSettingsType, msg, params => { + this.state.orgSettings = params.orgSettings; + this.setState(this.state); + this.updateOrgSettings(); + }); + break; default: super.onMessageReceived?.(msg); break; @@ -94,6 +105,16 @@ export class WelcomeApp extends App { this.updateRepoState(); this.updateAccountState(); this.updatePromo(); + this.updateOrgSettings(); + } + + private updateOrgSettings() { + const { + orgSettings: { drafts, ai }, + } = this.state; + + document.body.dataset.orgDrafts = drafts ? 'allowed' : 'blocked'; + document.body.dataset.orgAi = ai ? 'allowed' : 'blocked'; } private updatePromo() { diff --git a/src/webviews/home/homeWebview.ts b/src/webviews/home/homeWebview.ts index 2652413b83843..097e747b6a344 100644 --- a/src/webviews/home/homeWebview.ts +++ b/src/webviews/home/homeWebview.ts @@ -1,12 +1,14 @@ import { Disposable, workspace } from 'vscode'; +import type { ContextKeys } from '../../constants'; import type { Container } from '../../container'; import type { Subscription } from '../../plus/gk/account/subscription'; import { isSubscriptionExpired, isSubscriptionPaid, isSubscriptionTrial } from '../../plus/gk/account/subscription'; import type { SubscriptionChangeEvent } from '../../plus/gk/account/subscriptionService'; import { registerCommand } from '../../system/command'; +import { getContext, onDidChangeContext } from '../../system/context'; import type { WebviewController, WebviewProvider } from '../webviewController'; import type { DidChangeRepositoriesParams, State } from './protocol'; -import { DidChangeRepositoriesType, DidChangeSubscriptionType } from './protocol'; +import { DidChangeOrgSettingsType, DidChangeRepositoriesType, DidChangeSubscriptionType } from './protocol'; const emptyDisposable = Object.freeze({ dispose: () => { @@ -27,6 +29,7 @@ export class HomeWebviewProvider implements WebviewProvider { ? workspace.onDidGrantWorkspaceTrust(this.notifyDidChangeRepositories, this) : emptyDisposable, this.container.subscription.onDidChange(this.onSubscriptionChanged, this), + onDidChangeContext(this.onContextChanged, this), ); } @@ -50,6 +53,18 @@ export class HomeWebviewProvider implements WebviewProvider { this.notifyDidChangeRepositories(); } + private getOrgSettings(): State['orgSettings'] { + return { + drafts: !getContext('gitlens:gk:organization:drafts:disabled', false), + }; + } + + private onContextChanged(key: ContextKeys) { + if (key === 'gitlens:gk:organization:drafts:disabled') { + this.notifyDidChangeOrgSettings(); + } + } + private onSubscriptionChanged(e: SubscriptionChangeEvent) { void this.notifyDidChangeSubscription(e.current); } @@ -60,6 +75,7 @@ export class HomeWebviewProvider implements WebviewProvider { repositories: this.getRepositoriesState(), webroot: this.host.getWebRoot(), promoStates: await this.getCanShowPromos(subscription), + orgSettings: this.getOrgSettings(), }; } @@ -98,4 +114,10 @@ export class HomeWebviewProvider implements WebviewProvider { promoStates: await this.getCanShowPromos(subscription), }); } + + private notifyDidChangeOrgSettings() { + void this.host.notify(DidChangeOrgSettingsType, { + orgSettings: this.getOrgSettings(), + }); + } } diff --git a/src/webviews/home/protocol.ts b/src/webviews/home/protocol.ts index 70c4e14f22b3f..07fa6c2f86a8c 100644 --- a/src/webviews/home/protocol.ts +++ b/src/webviews/home/protocol.ts @@ -5,6 +5,9 @@ export interface State extends WebviewState { repositories: DidChangeRepositoriesParams; webroot?: string; promoStates: Record; + orgSettings: { + drafts: boolean; + }; } export interface DidChangeRepositoriesParams { @@ -19,3 +22,8 @@ export interface DidChangeSubscriptionParams { promoStates: Record; } export const DidChangeSubscriptionType = new IpcNotificationType('subscription/didChange'); + +export interface DidChangeOrgSettingsParams { + orgSettings: State['orgSettings']; +} +export const DidChangeOrgSettingsType = new IpcNotificationType('org/settings/didChange'); diff --git a/src/webviews/welcome/protocol.ts b/src/webviews/welcome/protocol.ts index a0bd30b2488c9..11533aaac1cd3 100644 --- a/src/webviews/welcome/protocol.ts +++ b/src/webviews/welcome/protocol.ts @@ -11,6 +11,10 @@ export interface State extends WebviewState { repoFeaturesBlocked?: boolean; isTrialOrPaid: boolean; canShowPromo: boolean; + orgSettings: { + ai: boolean; + drafts: boolean; + }; } export interface UpdateConfigurationParams { @@ -25,3 +29,8 @@ export interface DidChangeParams { state: State; } export const DidChangeNotificationType = new IpcNotificationType('welcome/didChange', true); + +export interface DidChangeOrgSettingsParams { + orgSettings: State['orgSettings']; +} +export const DidChangeOrgSettingsType = new IpcNotificationType('org/settings/didChange'); diff --git a/src/webviews/welcome/welcomeWebview.ts b/src/webviews/welcome/welcomeWebview.ts index 47c1d07012100..cb5e251ad1d3c 100644 --- a/src/webviews/welcome/welcomeWebview.ts +++ b/src/webviews/welcome/welcomeWebview.ts @@ -1,15 +1,17 @@ import type { ConfigurationChangeEvent } from 'vscode'; import { Disposable, workspace } from 'vscode'; +import type { ContextKeys } from '../../constants'; import type { Container } from '../../container'; import type { Subscription } from '../../plus/gk/account/subscription'; import { isSubscriptionPaid, SubscriptionState } from '../../plus/gk/account/subscription'; import type { SubscriptionChangeEvent } from '../../plus/gk/account/subscriptionService'; import { configuration } from '../../system/configuration'; +import { getContext, onDidChangeContext } from '../../system/context'; import type { IpcMessage } from '../protocol'; import { onIpc } from '../protocol'; import type { WebviewController, WebviewProvider } from '../webviewController'; import type { State, UpdateConfigurationParams } from './protocol'; -import { DidChangeNotificationType, UpdateConfigurationCommandType } from './protocol'; +import { DidChangeNotificationType, DidChangeOrgSettingsType, UpdateConfigurationCommandType } from './protocol'; const emptyDisposable = Object.freeze({ dispose: () => { @@ -31,6 +33,7 @@ export class WelcomeWebviewProvider implements WebviewProvider { ? workspace.onDidGrantWorkspaceTrust(() => this.notifyDidChange(), this) : emptyDisposable, this.container.subscription.onDidChange(this.onSubscriptionChanged, this), + onDidChangeContext(this.onContextChanged, this), ); } @@ -46,6 +49,19 @@ export class WelcomeWebviewProvider implements WebviewProvider { void this.notifyDidChange(); } + private getOrgSettings(): State['orgSettings'] { + return { + ai: !getContext('gitlens:gk:organization:ai:disabled', false), + drafts: !getContext('gitlens:gk:organization:drafts:disabled', false), + }; + } + + private onContextChanged(key: ContextKeys) { + if (['gitlens:gk:organization:ai:disabled', 'gitlens:gk:organization:drafts:disabled'].includes(key)) { + this.notifyDidChangeOrgSettings(); + } + } + private onSubscriptionChanged(e: SubscriptionChangeEvent) { void this.notifyDidChange(e.current); } @@ -78,6 +94,7 @@ export class WelcomeWebviewProvider implements WebviewProvider { this.container.git.hasUnsafeRepositories(), isTrialOrPaid: await this.getTrialOrPaidState(subscription), canShowPromo: await this.getCanShowPromo(subscription), + orgSettings: this.getOrgSettings(), }; } @@ -108,4 +125,10 @@ export class WelcomeWebviewProvider implements WebviewProvider { private async notifyDidChange(subscription?: Subscription) { void this.host.notify(DidChangeNotificationType, { state: await this.getState(subscription) }); } + + private notifyDidChangeOrgSettings() { + void this.host.notify(DidChangeOrgSettingsType, { + orgSettings: this.getOrgSettings(), + }); + } } From ceb22af67bc3700bd23cc959990f272c00b39786 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Wed, 31 Jan 2024 15:43:43 -0500 Subject: [PATCH 0479/1012] Fixes keyboard a11y for gl-button --- src/webviews/apps/shared/components/button.ts | 59 +++++++++++++++---- 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/src/webviews/apps/shared/components/button.ts b/src/webviews/apps/shared/components/button.ts index 759fb4f73180b..86b41c7e5fe24 100644 --- a/src/webviews/apps/shared/components/button.ts +++ b/src/webviews/apps/shared/components/button.ts @@ -1,11 +1,16 @@ import type { PropertyValueMap } from 'lit'; import { css, html, LitElement } from 'lit'; -import { customElement, property } from 'lit/decorators.js'; +import { customElement, property, query } from 'lit/decorators.js'; import { focusOutline } from './styles/lit/a11y.css'; import { elementBase } from './styles/lit/base.css'; @customElement('gl-button') export class GlButton extends LitElement { + static override shadowRootOptions: ShadowRootInit = { + ...LitElement.shadowRootOptions, + delegatesFocus: true, + }; + static override styles = [ elementBase, css` @@ -33,11 +38,7 @@ export class GlButton extends LitElement { border-radius: var(--gk-action-radius); } - :host(:not([href])) { - padding: var(--button-padding); - } - - :host([href]) > a { + .control { display: inline-block; padding: var(--button-padding); @@ -46,13 +47,24 @@ export class GlButton extends LitElement { width: 100%; height: 100%; + cursor: pointer; + } + + button.control { + appearance: none; + background: transparent; + border: none; + } + + .control:focus { + outline: none; } :host(:hover) { background: var(--button-hover-background); } - :host(:focus) { + :host(:focus-within) { ${focusOutline} } @@ -111,6 +123,9 @@ export class GlButton extends LitElement { `, ]; + @query('.control') + protected control!: HTMLElement; + @property({ type: Boolean, reflect: true }) full = false; @@ -131,20 +146,38 @@ export class GlButton extends LitElement { @property() appearance?: string; - @property({ type: Number, reflect: true }) - override tabIndex = 0; - protected override updated(changedProperties: PropertyValueMap | Map): void { super.updated(changedProperties); if (changedProperties.has('disabled')) { - this.tabIndex = this.disabled ? -1 : 0; this.setAttribute('aria-disabled', this.disabled.toString()); } } override render() { - const main = html``; - return this.href != null ? html`${main}` : main; + if (this.href != null) { + return html``; + } + return html``; + } + + override focus(options?: FocusOptions) { + this.control.focus(options); + } + + override blur() { + this.control.blur(); + } + + override click() { + this.control.click(); + } +} + +declare global { + interface HTMLElementTagNameMap { + 'gl-button': GlButton; } } From a0223cd70062be8b50be54df08e752a3dc2bba0d Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Wed, 31 Jan 2024 17:13:20 -0500 Subject: [PATCH 0480/1012] Inverts context keys for org settings --- package.json | 32 +++++++++---------- src/constants.ts | 4 +-- src/plus/drafts/draftsService.ts | 7 +--- src/plus/gk/account/organizationService.ts | 8 ++--- .../patchDetails/patchDetailsWebview.ts | 4 +-- .../commitDetails/commitDetailsWebview.ts | 6 ++-- src/webviews/home/homeWebview.ts | 4 +-- src/webviews/welcome/welcomeWebview.ts | 6 ++-- 8 files changed, 33 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index 8139ab7d50fc4..f8b7a09ffe72e 100644 --- a/package.json +++ b/package.json @@ -8893,7 +8893,7 @@ }, { "command": "gitlens.showPatchDetailsPage", - "when": "gitlens:enabled && !gitlens:gk:organization:drafts:disabled && config.gitlens.cloudPatches.enabled" + "when": "gitlens:enabled && gitlens:gk:organization:drafts:enabled && config.gitlens.cloudPatches.enabled" }, { "command": "gitlens.createPatch", @@ -8901,11 +8901,11 @@ }, { "command": "gitlens.createCloudPatch", - "when": "gitlens:enabled && !gitlens:gk:organization:drafts:disabled && config.gitlens.cloudPatches.enabled" + "when": "gitlens:enabled && gitlens:gk:organization:drafts:enabled && config.gitlens.cloudPatches.enabled" }, { "command": "gitlens.shareAsCloudPatch", - "when": "gitlens:enabled && !gitlens:gk:organization:drafts:disabled && config.gitlens.cloudPatches.enabled" + "when": "gitlens:enabled && gitlens:gk:organization:drafts:enabled && config.gitlens.cloudPatches.enabled" }, { "command": "gitlens.openCloudPatch", @@ -8937,7 +8937,7 @@ }, { "command": "gitlens.showDraftsView", - "when": "gitlens:enabled && !gitlens:gk:organization:drafts:disabled" + "when": "gitlens:enabled && gitlens:gk:organization:drafts:enabled" }, { "command": "gitlens.showFileHistoryView", @@ -9381,7 +9381,7 @@ }, { "command": "gitlens.switchAIModel", - "when": "gitlens:enabled && !gitlens:gk:organization:ai:disabled" + "when": "gitlens:enabled && gitlens:gk:organization:ai:enabled" }, { "command": "gitlens.switchMode", @@ -11241,11 +11241,11 @@ }, { "command": "gitlens.generateCommitMessage", - "when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && !gitlens:gk:organization:ai:disabled && config.gitlens.ai.experimental.generateCommitMessage.enabled" + "when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:gk:organization:ai:enabled && config.gitlens.ai.experimental.generateCommitMessage.enabled" }, { "command": "gitlens.resetAIKey", - "when": "gitlens:enabled && !gitlens:gk:organization:ai:disabled" + "when": "gitlens:enabled && gitlens:gk:organization:ai:enabled" } ], "editor/context": [ @@ -11605,7 +11605,7 @@ }, { "command": "gitlens.generateCommitMessage", - "when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && !gitlens:gk:organization:ai:disabled && config.gitlens.ai.experimental.generateCommitMessage.enabled && config.gitlens.menus.scmRepository.generateCommitMessage", + "when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:gk:organization:ai:enabled && config.gitlens.ai.experimental.generateCommitMessage.enabled && config.gitlens.menus.scmRepository.generateCommitMessage", "group": "4_gitlens@2" } ], @@ -11641,7 +11641,7 @@ }, { "command": "gitlens.generateCommitMessage", - "when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && !gitlens:gk:organization:ai:disabled && config.gitlens.ai.experimental.generateCommitMessage.enabled && scmProvider == git && config.gitlens.menus.scmRepository.generateCommitMessage", + "when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:gk:organization:ai:enabled && config.gitlens.ai.experimental.generateCommitMessage.enabled && scmProvider == git && config.gitlens.menus.scmRepository.generateCommitMessage", "group": "2_z_gitlens@2" }, { @@ -12978,7 +12978,7 @@ }, { "command": "gitlens.createCloudPatch", - "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && !gitlens:gk:organization:drafts:disabled && config.gitlens.cloudPatches.enabled && viewItem =~ /gitlens:(commit|stash)\\b/", + "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:gk:organization:drafts:enabled && config.gitlens.cloudPatches.enabled && viewItem =~ /gitlens:(commit|stash)\\b/", "group": "1_gitlens_actions_1@3" }, { @@ -13873,7 +13873,7 @@ }, { "command": "gitlens.createCloudPatch", - "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && !gitlens:gk:organization:drafts:disabled && config.gitlens.cloudPatches.enabled && viewItem =~ /gitlens:compare:results(?!:)\\b/", + "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:gk:organization:drafts:enabled && config.gitlens.cloudPatches.enabled && viewItem =~ /gitlens:compare:results(?!:)\\b/", "group": "1_gitlens_secondary_actions@2" }, { @@ -14271,7 +14271,7 @@ }, { "command": "gitlens.createCloudPatch", - "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && !gitlens:gk:organization:drafts:disabled && config.gitlens.cloudPatches.enabled && webviewItem =~ /gitlens:(commit|stash)\\b/", + "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:gk:organization:drafts:enabled && config.gitlens.cloudPatches.enabled && webviewItem =~ /gitlens:(commit|stash)\\b/", "group": "1_gitlens_actions_1@3" }, { @@ -14534,12 +14534,12 @@ "gitlens/share": [ { "command": "gitlens.shareAsCloudPatch", - "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && !gitlens:gk:organization:drafts:disabled && config.gitlens.cloudPatches.enabled && viewItem =~ /gitlens:((commit|stash|compare:results(?!:)|)\\b|file\\b(?=.*?\\b\\+committed\\b))/", + "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:gk:organization:drafts:enabled && config.gitlens.cloudPatches.enabled && viewItem =~ /gitlens:((commit|stash|compare:results(?!:)|)\\b|file\\b(?=.*?\\b\\+committed\\b))/", "group": "1_a_gitlens@1" }, { "command": "gitlens.graph.shareAsCloudPatch", - "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && !gitlens:gk:organization:drafts:disabled && config.gitlens.cloudPatches.enabled && webviewItem =~ /gitlens:(commit|stash)\\b/", + "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:gk:organization:drafts:enabled && config.gitlens.cloudPatches.enabled && webviewItem =~ /gitlens:(commit|stash)\\b/", "group": "1_a_gitlens@1" }, { @@ -14787,7 +14787,7 @@ }, { "command": "gitlens.createCloudPatch", - "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && !gitlens:gk:organization:drafts:disabled && config.gitlens.cloudPatches.enabled && viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/", + "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:gk:organization:drafts:enabled && config.gitlens.cloudPatches.enabled && viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/", "group": "1_gitlens_secondary_actions@3" }, { @@ -16021,7 +16021,7 @@ { "id": "gitlens.views.drafts", "name": "Cloud Patches", - "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && !gitlens:gk:organization:drafts:disabled && config.gitlens.cloudPatches.enabled", + "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:gk:organization:drafts:enabled && config.gitlens.cloudPatches.enabled", "contextualTitle": "GitLens", "icon": "$(gitlens-cloud-patch)", "initialSize": 2, diff --git a/src/constants.ts b/src/constants.ts index dc08174d7d0af..3f6ec91b9c1d6 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -633,9 +633,9 @@ export type ContextKeys = | `${typeof extensionPrefix}:disabled` | `${typeof extensionPrefix}:enabled` | `${typeof extensionPrefix}:gk:hasOrganizations` - | `${typeof extensionPrefix}:gk:organization:ai:disabled` + | `${typeof extensionPrefix}:gk:organization:ai:enabled` | `${typeof extensionPrefix}:gk:organization:drafts:byob` - | `${typeof extensionPrefix}:gk:organization:drafts:disabled` + | `${typeof extensionPrefix}:gk:organization:drafts:enabled` | `${typeof extensionPrefix}:hasConnectedRemotes` | `${typeof extensionPrefix}:hasRemotes` | `${typeof extensionPrefix}:hasRichRemotes` diff --git a/src/plus/drafts/draftsService.ts b/src/plus/drafts/draftsService.ts index 8523b7b482612..bab36ee9b6c5e 100644 --- a/src/plus/drafts/draftsService.ts +++ b/src/plus/drafts/draftsService.ts @@ -402,12 +402,7 @@ export class DraftService implements Disposable { const rsp = await this.connection.fetchGkDevApi('/v1/drafts', { method: 'GET' }); if (!rsp.ok) { - let message = 'Unable to open drafts'; - if (rsp.status === 403) { - message = - "The Cloud Patches feature has been disabled by your organization. Please contact your organization's admin to enable it"; - } - await handleBadDraftResponse(message, rsp, scope); + await handleBadDraftResponse('Unable to open drafts', rsp, scope); } const draft = ((await rsp.json()) as Result).data; diff --git a/src/plus/gk/account/organizationService.ts b/src/plus/gk/account/organizationService.ts index 1f6058e07e000..8972f6a952b0d 100644 --- a/src/plus/gk/account/organizationService.ts +++ b/src/plus/gk/account/organizationService.ts @@ -139,14 +139,14 @@ export class OrganizationService implements Disposable { private async updateOrganizationPermissions(orgId: string | undefined): Promise { const settings = orgId != null ? await this.getOrganizationSettings(orgId) : undefined; if (settings == null) { - void setContext('gitlens:gk:organization:ai:disabled', false); - void setContext('gitlens:gk:organization:drafts:disabled', false); + void setContext('gitlens:gk:organization:ai:enabled', true); + void setContext('gitlens:gk:organization:drafts:enabled', true); void setContext('gitlens:gk:organization:drafts:byob', false); return; } - void setContext('gitlens:gk:organization:ai:disabled', settings.aiSettings.enabled === false); - void setContext('gitlens:gk:organization:drafts:disabled', settings.draftsSettings.enabled === false); + void setContext('gitlens:gk:organization:ai:enabled', settings.aiSettings.enabled ?? true); + void setContext('gitlens:gk:organization:drafts:enabled', settings.draftsSettings.enabled ?? true); void setContext('gitlens:gk:organization:drafts:byob', settings.draftsSettings.bucket != null); } diff --git a/src/plus/webviews/patchDetails/patchDetailsWebview.ts b/src/plus/webviews/patchDetails/patchDetailsWebview.ts index 96cefb244ce53..84ad6e0ae828d 100644 --- a/src/plus/webviews/patchDetails/patchDetailsWebview.ts +++ b/src/plus/webviews/patchDetails/patchDetailsWebview.ts @@ -325,7 +325,7 @@ export class PatchDetailsWebviewProvider } private onContextChanged(key: ContextKeys) { - if (['gitlens:gk:organization:ai:disabled', 'gitlens:gk:organization:drafts:disabled'].includes(key)) { + if (['gitlens:gk:organization:ai:enabled', 'gitlens:gk:organization:drafts:enabled'].includes(key)) { this._context.orgSettings = this.getOrgSettings(); this.updateState(); } @@ -333,7 +333,7 @@ export class PatchDetailsWebviewProvider private getOrgSettings(): State['orgSettings'] { return { - ai: !getContext('gitlens:gk:organization:ai:disabled', false), + ai: getContext('gitlens:gk:organization:ai:enabled', false), byob: getContext('gitlens:gk:organization:drafts:byob', false), }; } diff --git a/src/webviews/commitDetails/commitDetailsWebview.ts b/src/webviews/commitDetails/commitDetailsWebview.ts index 2fb7f25be4e1f..296e975bea4d9 100644 --- a/src/webviews/commitDetails/commitDetailsWebview.ts +++ b/src/webviews/commitDetails/commitDetailsWebview.ts @@ -438,7 +438,7 @@ export class CommitDetailsWebviewProvider } private onContextChanged(key: ContextKeys) { - if (['gitlens:gk:organization:ai:disabled', 'gitlens:gk:organization:drafts:disabled'].includes(key)) { + if (['gitlens:gk:organization:ai:enabled', 'gitlens:gk:organization:drafts:enabled'].includes(key)) { this.updatePendingContext({ orgSettings: this.getOrgSettings() }); this.updateState(); } @@ -446,8 +446,8 @@ export class CommitDetailsWebviewProvider private getOrgSettings(): State['orgSettings'] { return { - ai: !getContext('gitlens:gk:organization:ai:disabled', false), - drafts: !getContext('gitlens:gk:organization:drafts:disabled', false), + ai: getContext('gitlens:gk:organization:ai:enabled', false), + drafts: getContext('gitlens:gk:organization:drafts:enabled', false), }; } diff --git a/src/webviews/home/homeWebview.ts b/src/webviews/home/homeWebview.ts index 097e747b6a344..8cfa28ec2bd5a 100644 --- a/src/webviews/home/homeWebview.ts +++ b/src/webviews/home/homeWebview.ts @@ -55,12 +55,12 @@ export class HomeWebviewProvider implements WebviewProvider { private getOrgSettings(): State['orgSettings'] { return { - drafts: !getContext('gitlens:gk:organization:drafts:disabled', false), + drafts: getContext('gitlens:gk:organization:drafts:enabled', false), }; } private onContextChanged(key: ContextKeys) { - if (key === 'gitlens:gk:organization:drafts:disabled') { + if (key === 'gitlens:gk:organization:drafts:enabled') { this.notifyDidChangeOrgSettings(); } } diff --git a/src/webviews/welcome/welcomeWebview.ts b/src/webviews/welcome/welcomeWebview.ts index cb5e251ad1d3c..a94b0f45e5edd 100644 --- a/src/webviews/welcome/welcomeWebview.ts +++ b/src/webviews/welcome/welcomeWebview.ts @@ -51,13 +51,13 @@ export class WelcomeWebviewProvider implements WebviewProvider { private getOrgSettings(): State['orgSettings'] { return { - ai: !getContext('gitlens:gk:organization:ai:disabled', false), - drafts: !getContext('gitlens:gk:organization:drafts:disabled', false), + ai: getContext('gitlens:gk:organization:ai:enabled', false), + drafts: getContext('gitlens:gk:organization:drafts:enabled', false), }; } private onContextChanged(key: ContextKeys) { - if (['gitlens:gk:organization:ai:disabled', 'gitlens:gk:organization:drafts:disabled'].includes(key)) { + if (['gitlens:gk:organization:ai:enabled', 'gitlens:gk:organization:drafts:enabled'].includes(key)) { this.notifyDidChangeOrgSettings(); } } From 23fffa47e66de30e15827536bcf800d7e5afcf62 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 31 Jan 2024 18:12:45 -0500 Subject: [PATCH 0481/1012] Adds open changes/compare features to PRs in the Graph Adds "Open in Commit Graph" option to prs in the views Renames "Compare Pull Request with Base" to "Compare Pull Request" --- CHANGELOG.md | 5 +- package.json | 62 ++++++++++++++++++-- src/plus/webviews/graph/graphWebview.ts | 75 ++++++++++++++++++++++--- src/plus/webviews/graph/protocol.ts | 5 ++ src/plus/webviews/graph/registration.ts | 15 +++++ src/views/nodes/pullRequestNode.ts | 27 +++++++++ 6 files changed, 174 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e8a331b3855a..db1c946d17518 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,9 +9,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Added - Adds new comparison features to pull requests in GitLens views - - Adds an _Open Pull Request Changes_ inline button and context menu command to pull requests to view the pull request changes in a multi-diff editor (single tab) + - Adds an _Open Pull Request Changes_ context menu command on pull requests in the _Commit Graph_ and other GitLens views to view pull request changes in a multi-diff editor (single tab) - Requires VS Code `1.85` or later with `multiDiffEditor.experimental.enabled` and `gitlens.experimental.openChangesInMultiDiffEditor` to be enabled - - Adds a _Compare Pull Request with Base_ inline button and context menu command to pull requests to open a comparison for the pull request + - Adds a _Compare Pull Request_ context menu command on pull requests in the _Commit Graph_ and other GitLens views to open a comparison between the head and base of the pull request for easy reviewing +- Adds an _Open in Commit Graph_ context menu command on pull requests in GitLens view to open the tip commit in the _Commit Graph_ - Adds an _Open All Changes_ inline button to branch status (upstream) and branch status files in GitLens views - Adds an _Open Changes_ submenu to branch status (upstream) and branch status files in GitLens views - Adds an alternate flow (pick another file) when using the _Open File at Revision..._ and _Open Changes with Revision..._ commands to open a file that has been renamed and the rename is currently unstaged — closes [#3109](https://github.com/gitkraken/vscode-gitlens/issues/3109) diff --git a/package.json b/package.json index f8b7a09ffe72e..36a5f44938c5a 100644 --- a/package.json +++ b/package.json @@ -6941,7 +6941,7 @@ }, { "command": "gitlens.views.openPullRequestComparison", - "title": "Compare Pull Request with Base", + "title": "Compare Pull Request", "category": "GitLens", "icon": "$(compare-changes)" }, @@ -8316,6 +8316,24 @@ "category": "GitLens", "icon": "$(git-pull-request-create)" }, + { + "command": "gitlens.graph.openPullRequest", + "title": "Open Pull Request", + "category": "GitLens", + "icon": "$(git-pull-request)" + }, + { + "command": "gitlens.graph.openPullRequestChanges", + "title": "Open Pull Request Changes", + "category": "GitLens", + "icon": "$(diff-multiple)" + }, + { + "command": "gitlens.graph.openPullRequestComparison", + "title": "Compare Pull Request", + "category": "GitLens", + "icon": "$(compare-changes)" + }, { "command": "gitlens.graph.openPullRequestOnRemote", "title": "Open Pull Request on Remote", @@ -11067,6 +11085,18 @@ "command": "gitlens.graph.createPullRequest", "when": "false" }, + { + "command": "gitlens.graph.openPullRequest", + "when": "false" + }, + { + "command": "gitlens.graph.openPullRequestChanges", + "when": "false" + }, + { + "command": "gitlens.graph.openPullRequestComparison", + "when": "false" + }, { "command": "gitlens.graph.openPullRequestOnRemote", "when": "false" @@ -13265,13 +13295,13 @@ "alt": "gitlens.copyRemotePullRequestUrl" }, { - "command": "gitlens.views.openPullRequest", - "when": "gitlens:action:openPullRequest > 1 && viewItem =~ /gitlens:pullrequest\\b/", + "command": "gitlens.views.openPullRequestChanges", + "when": "config.gitlens.experimental.openChangesInMultiDiffEditor && viewItem =~ /gitlens:pullrequest\\b(?=.*?\\b\\+refs\\b)/", "group": "1_gitlens_actions@1" }, { - "command": "gitlens.views.openPullRequestChanges", - "when": "config.gitlens.experimental.openChangesInMultiDiffEditor && viewItem =~ /gitlens:pullrequest\\b(?=.*?\\b\\+refs\\b)/", + "command": "gitlens.views.openPullRequest", + "when": "gitlens:action:openPullRequest > 1 && viewItem =~ /gitlens:pullrequest\\b/", "group": "1_gitlens_actions@98" }, { @@ -13280,6 +13310,11 @@ "group": "1_gitlens_actions@99", "alt": "gitlens.copyRemotePullRequestUrl" }, + { + "command": "gitlens.showInCommitGraph", + "when": "viewItem =~ /gitlens:pullrequest\\b(?=.*?\\b\\+refs\\b)/", + "group": "3_gitlens_explore@1" + }, { "command": "gitlens.views.openPullRequestComparison", "when": "viewItem =~ /gitlens:pullrequest\\b(?=.*?\\b\\+refs\\b)/", @@ -14355,10 +14390,25 @@ "when": "webviewItem =~ /gitlens:tag\\b/", "group": "8_gitlens_actions@10" }, + { + "command": "gitlens.graph.openPullRequestChanges", + "when": "config.gitlens.experimental.openChangesInMultiDiffEditor && webviewItem =~ /gitlens:pullrequest\\b(?=.*?\\b\\+refs\\b)/", + "group": "1_gitlens_actions@1" + }, + { + "command": "gitlens.graph.openPullRequest", + "when": "gitlens:action:openPullRequest > 1 && webviewItem =~ /gitlens:pullrequest\\b/", + "group": "1_gitlens_actions@98" + }, { "command": "gitlens.graph.openPullRequestOnRemote", "when": "webviewItem =~ /gitlens:pullrequest\\b/", - "group": "1_gitlens_actions@1" + "group": "1_gitlens_actions@99" + }, + { + "command": "gitlens.graph.openPullRequestComparison", + "when": "webviewItem =~ /gitlens:pullrequest\\b(?=.*?\\b\\+refs\\b)/", + "group": "4_gitlens_compare@1" }, { "command": "gitlens.graph.push", diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts index 918c1d129d771..7573efe4b4a55 100644 --- a/src/plus/webviews/graph/graphWebview.ts +++ b/src/plus/webviews/graph/graphWebview.ts @@ -1,6 +1,6 @@ import type { ColorTheme, ConfigurationChangeEvent, Uri } from 'vscode'; import { CancellationTokenSource, Disposable, env, window } from 'vscode'; -import type { CreatePullRequestActionContext } from '../../../api/gitlens'; +import type { CreatePullRequestActionContext, OpenPullRequestActionContext } from '../../../api/gitlens'; import { getAvatarUri } from '../../../avatars'; import { parseCommandContext } from '../../../commands/base'; import type { CopyDeepLinkCommandArgs } from '../../../commands/copyDeepLink'; @@ -454,6 +454,9 @@ export class GraphWebviewProvider implements WebviewProvider({ - webviewItem: 'gitlens:pullrequest', + webviewItem: `gitlens:pullrequest${pr.refs ? '+refs' : ''}`, webviewItemValue: { type: 'pullrequest', id: pr.id, url: pr.url, + repoPath: repoPath, + refs: pr.refs, + provider: { + id: pr.provider.id, + name: pr.provider.name, + domain: pr.provider.domain, + icon: pr.provider.icon, + }, }, }), }; @@ -2644,13 +2655,63 @@ export class GraphWebviewProvider implements WebviewProvider('openPullRequest', { + repoPath: pr.repoPath, + provider: { + id: pr.provider.id, + name: pr.provider.name, + domain: pr.provider.domain, + }, + pullRequest: { + id: pr.id, + url: pr.url, + }, + }); + } + + return Promise.resolve(); + } + + @debug() + private openPullRequestChanges(item?: GraphItemContext) { + if (isGraphItemTypedContext(item, 'pullrequest')) { + const pr = item.webviewItemValue; + if (pr.refs?.base != null && pr.refs.head != null) { + return this.container.searchAndCompareView.openComparisonChanges( + pr.repoPath, + { ref: pr.refs.head.sha, label: pr.refs.head.branch }, + { ref: pr.refs.base.sha, label: pr.refs.base.branch }, + { title: `Changes in Pull Request #${pr.id}` }, + ); + } + } + + return Promise.resolve(); + } + + @debug() + private openPullRequestComparison(item?: GraphItemContext) { + if (isGraphItemTypedContext(item, 'pullrequest')) { + const pr = item.webviewItemValue; + if (pr.refs?.base != null && pr.refs.head != null) { + return this.container.searchAndCompareView.compare( + pr.repoPath, + { ref: pr.refs.head.sha, label: pr.refs.head.branch }, + { ref: pr.refs.base.sha, label: pr.refs.base.branch }, + ); + } + } + + return Promise.resolve(); + } + @debug() private openPullRequestOnRemote(item?: GraphItemContext, clipboard?: boolean) { - if ( - isGraphItemContext(item) && - typeof item.webviewItemValue === 'object' && - item.webviewItemValue.type === 'pullrequest' - ) { + if (isGraphItemTypedContext(item, 'pullrequest')) { const { url } = item.webviewItemValue; return executeCommand(Commands.OpenPullRequestOnRemote, { pr: { url: url }, diff --git a/src/plus/webviews/graph/protocol.ts b/src/plus/webviews/graph/protocol.ts index e3f07b98062da..4a75c83179b82 100644 --- a/src/plus/webviews/graph/protocol.ts +++ b/src/plus/webviews/graph/protocol.ts @@ -26,6 +26,7 @@ import type { Config, DateStyle } from '../../../config'; import type { RepositoryVisibility } from '../../../git/gitProvider'; import type { GitTrackingState } from '../../../git/models/branch'; import type { GitGraphRowType } from '../../../git/models/graph'; +import type { PullRequestRefs } from '../../../git/models/pullRequest'; import type { GitBranchReference, GitReference, @@ -33,6 +34,7 @@ import type { GitStashReference, GitTagReference, } from '../../../git/models/reference'; +import type { RemoteProviderReference } from '../../../git/models/remoteProvider'; import type { GitSearchResultData, SearchQuery } from '../../../git/search'; import type { DateTimeFormat } from '../../../system/date'; import type { WebviewItemContext, WebviewItemGroupContext } from '../../../system/webview'; @@ -485,6 +487,9 @@ export interface GraphPullRequestContextValue { type: 'pullrequest'; id: string; url: string; + repoPath: string; + refs?: PullRequestRefs; + provider: RemoteProviderReference; } export interface GraphBranchContextValue { diff --git a/src/plus/webviews/graph/registration.ts b/src/plus/webviews/graph/registration.ts index 73c6165719d67..69056cc90ab18 100644 --- a/src/plus/webviews/graph/registration.ts +++ b/src/plus/webviews/graph/registration.ts @@ -11,6 +11,7 @@ import { ViewNode } from '../../../views/nodes/abstract/viewNode'; import type { BranchNode } from '../../../views/nodes/branchNode'; import type { CommitFileNode } from '../../../views/nodes/commitFileNode'; import type { CommitNode } from '../../../views/nodes/commitNode'; +import { PullRequestNode } from '../../../views/nodes/pullRequestNode'; import type { StashNode } from '../../../views/nodes/stashNode'; import type { TagNode } from '../../../views/nodes/tagNode'; import type { @@ -137,9 +138,16 @@ export function registerGraphWebviewCommands( | BranchNode | CommitNode | CommitFileNode + | PullRequestNode | StashNode | TagNode, ) => { + if (args instanceof PullRequestNode) { + if (args.ref == null) return; + + args = { ref: args.ref }; + } + const preserveFocus = 'preserveFocus' in args ? args.preserveFocus ?? false : false; if (configuration.get('graph.layout') === 'panel') { if (!container.graphView.visible) { @@ -165,9 +173,16 @@ export function registerGraphWebviewCommands( | BranchNode | CommitNode | CommitFileNode + | PullRequestNode | StashNode | TagNode, ) => { + if (args instanceof PullRequestNode) { + if (args.ref == null) return; + + args = { ref: args.ref }; + } + const preserveFocus = 'preserveFocus' in args ? args.preserveFocus ?? false : false; void container.graphView.show({ preserveFocus: preserveFocus }, args); }, diff --git a/src/views/nodes/pullRequestNode.ts b/src/views/nodes/pullRequestNode.ts index af1e93a4507f5..12041d9f9e172 100644 --- a/src/views/nodes/pullRequestNode.ts +++ b/src/views/nodes/pullRequestNode.ts @@ -4,6 +4,7 @@ import { GitBranch } from '../../git/models/branch'; import type { GitCommit } from '../../git/models/commit'; import { getIssueOrPullRequestMarkdownIcon, getIssueOrPullRequestThemeIcon } from '../../git/models/issue'; import type { PullRequest } from '../../git/models/pullRequest'; +import type { GitBranchReference } from '../../git/models/reference'; import type { ViewsWithCommits } from '../viewBase'; import { ContextValues, getViewNodeId, ViewNode } from './abstract/viewNode'; @@ -47,6 +48,32 @@ export class PullRequestNode extends ViewNode<'pullrequest', ViewsWithCommits> { return this.pullRequest.url; } + get baseRef(): GitBranchReference | undefined { + if (this.pullRequest.refs?.base != null) { + return { + refType: 'branch', + repoPath: this.repoPath, + ref: this.pullRequest.refs.base.sha, + name: this.pullRequest.refs.base.branch, + remote: true, + }; + } + return undefined; + } + + get ref(): GitBranchReference | undefined { + if (this.pullRequest.refs?.head != null) { + return { + refType: 'branch', + repoPath: this.repoPath, + ref: this.pullRequest.refs.head.sha, + name: this.pullRequest.refs.head.branch, + remote: true, + }; + } + return undefined; + } + getChildren(): ViewNode[] { return []; } From a02e1a9aa8451b1fff7b6f1b3d900306470339a8 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 31 Jan 2024 18:32:37 -0500 Subject: [PATCH 0482/1012] Renames FocusService to EnrichmentService --- src/container.ts | 20 +++---- .../{focusService.ts => enrichmentService.ts} | 56 +++++++++++++------ src/plus/webviews/focus/focusWebview.ts | 37 ++++++------ src/plus/webviews/focus/protocol.ts | 2 +- 4 files changed, 69 insertions(+), 46 deletions(-) rename src/plus/focus/{focusService.ts => enrichmentService.ts} (72%) diff --git a/src/container.ts b/src/container.ts index fab99f76d2bd8..47934eaf73baf 100644 --- a/src/container.ts +++ b/src/container.ts @@ -19,7 +19,7 @@ import { GitProviderService } from './git/gitProviderService'; import { LineHoverController } from './hovers/lineHoverController'; import type { RepositoryPathMappingProvider } from './pathMapping/repositoryPathMappingProvider'; import { DraftService } from './plus/drafts/draftsService'; -import { FocusService } from './plus/focus/focusService'; +import { EnrichmentService } from './plus/focus/enrichmentService'; import { AccountAuthenticationProvider } from './plus/gk/account/authenticationProvider'; import { OrganizationService } from './plus/gk/account/organizationService'; import { SubscriptionService } from './plus/gk/account/subscriptionService'; @@ -460,6 +460,15 @@ export class Container { return this._documentTracker; } + private _enrichments: EnrichmentService | undefined; + get enrichments() { + if (this._enrichments == null) { + this._disposables.push((this._enrichments = new EnrichmentService(this, new ServerConnection(this)))); + } + + return this._enrichments; + } + @memoize() get env(): Environment { if (this.prereleaseOrDebugging) { @@ -486,15 +495,6 @@ export class Container { return this._fileHistoryView; } - private _focus: FocusService | undefined; - get focus() { - if (this._focus == null) { - this._disposables.push((this._focus = new FocusService(this, new ServerConnection(this)))); - } - - return this._focus; - } - private readonly _git: GitProviderService; get git() { return this._git; diff --git a/src/plus/focus/focusService.ts b/src/plus/focus/enrichmentService.ts similarity index 72% rename from src/plus/focus/focusService.ts rename to src/plus/focus/enrichmentService.ts index 09d87008eb1c8..4f7ba2b464d15 100644 --- a/src/plus/focus/focusService.ts +++ b/src/plus/focus/enrichmentService.ts @@ -1,7 +1,6 @@ -import type { Disposable } from 'vscode'; +import type { CancellationToken, Disposable } from 'vscode'; import type { Container } from '../../container'; -import { AuthenticationRequiredError } from '../../errors'; -import type { GitRemote } from '../../git/models/remote'; +import { AuthenticationRequiredError, CancellationError } from '../../errors'; import type { RemoteProvider } from '../../git/remotes/remoteProvider'; import { log } from '../../system/decorators/log'; import { Logger } from '../../system/logger'; @@ -9,10 +8,10 @@ import { getLogScope } from '../../system/logger.scope'; import type { ServerConnection } from '../gk/serverConnection'; import { ensureAccount, ensurePaidPlan } from '../utils'; -export interface FocusItem { +export interface EnrichableItem { type: EnrichedItemResponse['entityType']; id: string; - remote: GitRemote; + provider: EnrichedItemResponse['provider']; url: string; expiresAt?: string; } @@ -55,7 +54,7 @@ type EnrichedItemResponse = { expiresAt?: string; }; -export class FocusService implements Disposable { +export class EnrichmentService implements Disposable { constructor( private readonly container: Container, private readonly connection: ServerConnection, @@ -78,15 +77,18 @@ export class FocusService implements Disposable { } @log() - async get(type?: EnrichedItemResponse['type']): Promise { + async get(type?: EnrichedItemResponse['type'], cancellation?: CancellationToken): Promise { const scope = getLogScope(); try { type Result = { data: EnrichedItemResponse[] }; const rsp = await this.connection.fetchGkDevApi('v1/enrich-items', { method: 'GET' }); + if (cancellation?.isCancellationRequested) throw new CancellationError(); const result = (await rsp.json()) as Result; + if (cancellation?.isCancellationRequested) throw new CancellationError(); + return type == null ? result.data : result.data.filter(i => i.type === type); } catch (ex) { if (ex instanceof AuthenticationRequiredError) return []; @@ -98,17 +100,17 @@ export class FocusService implements Disposable { } @log() - getPins(): Promise { - return this.get('pin'); + getPins(cancellation?: CancellationToken): Promise { + return this.get('pin', cancellation); } @log() - getSnoozed(): Promise { - return this.get('snooze'); + getSnoozed(cancellation?: CancellationToken): Promise { + return this.get('snooze', cancellation); } - @log({ args: { 0: i => `${i.id} (${i.remote.provider.name} ${i.type})` } }) - async pinItem(item: FocusItem): Promise { + @log({ args: { 0: i => `${i.id} (${i.provider} ${i.type})` } }) + async pinItem(item: EnrichableItem): Promise { const scope = getLogScope(); try { @@ -119,7 +121,7 @@ export class FocusService implements Disposable { type Result = { data: EnrichedItemResponse }; const rq: EnrichedItemRequest = { - provider: item.remote.provider.id as EnrichedItemResponse['provider'], + provider: item.provider, entityType: item.type, entityId: item.id, entityUrl: item.url, @@ -150,8 +152,8 @@ export class FocusService implements Disposable { return this.delete(id, 'unpin'); } - @log({ args: { 0: i => `${i.id} (${i.remote.provider.name} ${i.type})` } }) - async snoozeItem(item: FocusItem): Promise { + @log({ args: { 0: i => `${i.id} (${i.provider} ${i.type})` } }) + async snoozeItem(item: EnrichableItem): Promise { const scope = getLogScope(); try { @@ -162,7 +164,7 @@ export class FocusService implements Disposable { type Result = { data: EnrichedItemResponse }; const rq: EnrichedItemRequest = { - provider: item.remote.provider.id as EnrichedItemResponse['provider'], + provider: item.provider, entityType: item.type, entityId: item.id, entityUrl: item.url, @@ -196,3 +198,23 @@ export class FocusService implements Disposable { return this.delete(id, 'unsnooze'); } } + +export function convertRemoteProviderToEnrichProvider(provider: RemoteProvider): EnrichedItemResponse['provider'] { + switch (provider.id) { + case 'azure-devops': + return 'azure'; + + case 'bitbucket': + case 'bitbucket-server': + return 'bitbucket'; + + case 'github': + return 'github'; + + case 'gitlab': + return 'gitlab'; + + default: + throw new Error(`Unknown remote provider '${provider.id}'`); + } +} diff --git a/src/plus/webviews/focus/focusWebview.ts b/src/plus/webviews/focus/focusWebview.ts index 6765947bc6b8e..0672dd3992dd3 100644 --- a/src/plus/webviews/focus/focusWebview.ts +++ b/src/plus/webviews/focus/focusWebview.ts @@ -33,7 +33,8 @@ import { getSettledValue } from '../../../system/promise'; import type { IpcMessage } from '../../../webviews/protocol'; import { onIpc } from '../../../webviews/protocol'; import type { WebviewController, WebviewProvider } from '../../../webviews/webviewController'; -import type { EnrichedItem, FocusItem } from '../../focus/focusService'; +import type { EnrichableItem, EnrichedItem } from '../../focus/enrichmentService'; +import { convertRemoteProviderToEnrichProvider } from '../../focus/enrichmentService'; import type { SubscriptionChangeEvent } from '../../gk/account/subscriptionService'; import type { ShowInCommitGraphCommandArgs } from '../graph/protocol'; import type { @@ -151,17 +152,17 @@ export class FocusWebviewProvider implements WebviewProvider { if (issueWithRemote == null) return; if (pin) { - await this.container.focus.unpinItem(pin); + await this.container.enrichments.unpinItem(pin); this._enrichedItems = this._enrichedItems?.filter(e => e.id !== pin); issueWithRemote.enriched = issueWithRemote.enriched?.filter(e => e.id !== pin); } else { - const focusItem: FocusItem = { + const focusItem: EnrichableItem = { type: 'issue', id: issueWithRemote.issue.nodeId!, - remote: issueWithRemote.repoAndRemote.remote, + provider: convertRemoteProviderToEnrichProvider(issueWithRemote.repoAndRemote.remote.provider), url: issueWithRemote.issue.url, }; - const enrichedItem = await this.container.focus.pinItem(focusItem); + const enrichedItem = await this.container.enrichments.pinItem(focusItem); if (enrichedItem == null) return; if (this._enrichedItems == null) { this._enrichedItems = []; @@ -182,20 +183,20 @@ export class FocusWebviewProvider implements WebviewProvider { if (issueWithRemote == null) return; if (snooze) { - await this.container.focus.unsnoozeItem(snooze); + await this.container.enrichments.unsnoozeItem(snooze); this._enrichedItems = this._enrichedItems?.filter(e => e.id !== snooze); issueWithRemote.enriched = issueWithRemote.enriched?.filter(e => e.id !== snooze); } else { - const focusItem: FocusItem = { + const focusItem: EnrichableItem = { type: 'issue', id: issueWithRemote.issue.nodeId!, - remote: issueWithRemote.repoAndRemote.remote, + provider: convertRemoteProviderToEnrichProvider(issueWithRemote.repoAndRemote.remote.provider), url: issueWithRemote.issue.url, }; if (expiresAt != null) { focusItem.expiresAt = expiresAt; } - const enrichedItem = await this.container.focus.snoozeItem(focusItem); + const enrichedItem = await this.container.enrichments.snoozeItem(focusItem); if (enrichedItem == null) return; if (this._enrichedItems == null) { this._enrichedItems = []; @@ -216,17 +217,17 @@ export class FocusWebviewProvider implements WebviewProvider { if (prWithRemote == null) return; if (pin) { - await this.container.focus.unpinItem(pin); + await this.container.enrichments.unpinItem(pin); this._enrichedItems = this._enrichedItems?.filter(e => e.id !== pin); prWithRemote.enriched = prWithRemote.enriched?.filter(e => e.id !== pin); } else { - const focusItem: FocusItem = { + const focusItem: EnrichableItem = { type: 'pr', id: prWithRemote.pullRequest.nodeId!, - remote: prWithRemote.repoAndRemote.remote, + provider: convertRemoteProviderToEnrichProvider(prWithRemote.repoAndRemote.remote.provider), url: prWithRemote.pullRequest.url, }; - const enrichedItem = await this.container.focus.pinItem(focusItem); + const enrichedItem = await this.container.enrichments.pinItem(focusItem); if (enrichedItem == null) return; if (this._enrichedItems == null) { this._enrichedItems = []; @@ -247,20 +248,20 @@ export class FocusWebviewProvider implements WebviewProvider { if (prWithRemote == null) return; if (snooze) { - await this.container.focus.unsnoozeItem(snooze); + await this.container.enrichments.unsnoozeItem(snooze); this._enrichedItems = this._enrichedItems?.filter(e => e.id !== snooze); prWithRemote.enriched = prWithRemote.enriched?.filter(e => e.id !== snooze); } else { - const focusItem: FocusItem = { + const focusItem: EnrichableItem = { type: 'pr', id: prWithRemote.pullRequest.nodeId!, - remote: prWithRemote.repoAndRemote.remote, + provider: convertRemoteProviderToEnrichProvider(prWithRemote.repoAndRemote.remote.provider), url: prWithRemote.pullRequest.url, }; if (expiresAt != null) { focusItem.expiresAt = expiresAt; } - const enrichedItem = await this.container.focus.snoozeItem(focusItem); + const enrichedItem = await this.container.enrichments.snoozeItem(focusItem); if (enrichedItem == null) return; if (this._enrichedItems == null) { this._enrichedItems = []; @@ -770,7 +771,7 @@ export class FocusWebviewProvider implements WebviewProvider { private async getEnrichedItems(force?: boolean): Promise { // TODO needs cache invalidation if (force || this._enrichedItems == null) { - const enrichedItems = await this.container.focus.get(); + const enrichedItems = await this.container.enrichments.get(); this._enrichedItems = enrichedItems; } return this._enrichedItems; diff --git a/src/plus/webviews/focus/protocol.ts b/src/plus/webviews/focus/protocol.ts index e7fe3cebbe5ef..e6b3c3d3b0050 100644 --- a/src/plus/webviews/focus/protocol.ts +++ b/src/plus/webviews/focus/protocol.ts @@ -3,7 +3,7 @@ import type { IssueShape } from '../../../git/models/issue'; import type { PullRequestShape } from '../../../git/models/pullRequest'; import type { WebviewState } from '../../../webviews/protocol'; import { IpcCommandType, IpcNotificationType } from '../../../webviews/protocol'; -import type { EnrichedItem } from '../../focus/focusService'; +import type { EnrichedItem } from '../../focus/enrichmentService'; export interface State extends WebviewState { access: FeatureAccess; From c72e9f7fb658c55ec4da7671a1cd26b27a89ad81 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 2 Feb 2024 10:50:46 -0500 Subject: [PATCH 0483/1012] Moves some array fns to iterable --- src/git/gitProviderService.ts | 4 +- src/git/models/repository.ts | 3 +- .../integrations/providers/github/github.ts | 16 +++-- src/system/array.ts | 70 ------------------- src/system/iterable.ts | 66 +++++++++++++++++ src/views/draftsView.ts | 2 +- src/views/nodes/UncommittedFilesNode.ts | 4 +- .../nodes/branchTrackingStatusFilesNode.ts | 4 +- src/views/nodes/statusFilesNode.ts | 4 +- .../apps/plus/graph/minimap/minimap.ts | 3 +- 10 files changed, 86 insertions(+), 90 deletions(-) diff --git a/src/git/gitProviderService.ts b/src/git/gitProviderService.ts index f613479f2d4eb..fd7f75e079700 100644 --- a/src/git/gitProviderService.ts +++ b/src/git/gitProviderService.ts @@ -22,7 +22,7 @@ import type { SubscriptionChangeEvent } from '../plus/gk/account/subscriptionSer import type { ProviderIntegration } from '../plus/integrations/providerIntegration'; import type { RepoComparisonKey } from '../repositories'; import { asRepoComparisonKey, Repositories } from '../repositories'; -import { groupByFilterMap, groupByMap, joinUnique } from '../system/array'; +import { joinUnique } from '../system/array'; import { registerCommand } from '../system/command'; import { configuration } from '../system/configuration'; import { setContext } from '../system/context'; @@ -30,7 +30,7 @@ import { gate } from '../system/decorators/gate'; import { debug, log } from '../system/decorators/log'; import type { Deferrable } from '../system/function'; import { debounce } from '../system/function'; -import { count, filter, first, flatMap, join, map, some } from '../system/iterable'; +import { count, filter, first, flatMap, groupByFilterMap, groupByMap, join, map, some } from '../system/iterable'; import { Logger } from '../system/logger'; import { getLogScope, setLogScopeExit } from '../system/logger.scope'; import { getBestPath, getScheme, isAbsolute, maybeUri, normalizePath } from '../system/path'; diff --git a/src/git/models/repository.ts b/src/git/models/repository.ts index b1384f71485a6..9f6484685f504 100644 --- a/src/git/models/repository.ts +++ b/src/git/models/repository.ts @@ -9,7 +9,6 @@ import type { FeatureAccess, Features, PlusFeatures } from '../../features'; import { showCreatePullRequestPrompt, showGenericErrorMessage } from '../../messages'; import type { ProviderIntegration } from '../../plus/integrations/providerIntegration'; import { asRepoComparisonKey } from '../../repositories'; -import { groupByMap } from '../../system/array'; import { executeActionCommand } from '../../system/command'; import { configuration } from '../../system/configuration'; import { formatDate, fromNow } from '../../system/date'; @@ -17,7 +16,7 @@ import { gate } from '../../system/decorators/gate'; import { debug, log, logName } from '../../system/decorators/log'; import type { Deferrable } from '../../system/function'; import { debounce } from '../../system/function'; -import { filter, join, min, some } from '../../system/iterable'; +import { filter, groupByMap, join, min, some } from '../../system/iterable'; import { getLoggableName, Logger } from '../../system/logger'; import { getLogScope } from '../../system/logger.scope'; import { updateRecordValue } from '../../system/object'; diff --git a/src/plus/integrations/providers/github/github.ts b/src/plus/integrations/providers/github/github.ts index 15c9fd8597553..64b83c3035c84 100644 --- a/src/plus/integrations/providers/github/github.ts +++ b/src/plus/integrations/providers/github/github.ts @@ -30,9 +30,9 @@ import { showIntegrationRequestFailed500WarningMessage, showIntegrationRequestTimedOutWarningMessage, } from '../../../../messages'; -import { uniqueBy } from '../../../../system/array'; import { configuration } from '../../../../system/configuration'; import { debug } from '../../../../system/decorators/log'; +import { uniqueBy } from '../../../../system/iterable'; import { Logger } from '../../../../system/logger'; import type { LogScope } from '../../../../system/logger.scope'; import { getLogScope } from '../../../../system/logger.scope'; @@ -2847,10 +2847,12 @@ function isGitHubDotCom(options?: { baseUrl?: string }) { } function uniqueWithReasons(items: T[], lookup: (item: T) => unknown): T[] { - return uniqueBy(items, lookup, (original, current) => { - if (current.reasons.length !== 0) { - original.reasons.push(...current.reasons); - } - return original; - }); + return [ + ...uniqueBy(items, lookup, (original, current) => { + if (current.reasons.length !== 0) { + original.reasons.push(...current.reasons); + } + return original; + }), + ]; } diff --git a/src/system/array.ts b/src/system/array.ts index f337df2217e6a..4f3a6c00fa1f2 100644 --- a/src/system/array.ts +++ b/src/system/array.ts @@ -78,55 +78,6 @@ export function findLastIndex(source: T[], predicate: (value: T, index: numbe return -1; } -export function groupBy(source: readonly T[], groupingKey: (item: T) => string): Record { - return source.reduce>((groupings, current) => { - const value = groupingKey(current); - const group = groupings[value]; - if (group === undefined) { - groupings[value] = [current]; - } else { - group.push(current); - } - return groupings; - }, Object.create(null)); -} - -export function groupByMap( - source: readonly TValue[], - groupingKey: (item: TValue) => TKey, -): Map { - return source.reduce((groupings, current) => { - const value = groupingKey(current); - const group = groupings.get(value); - if (group === undefined) { - groupings.set(value, [current]); - } else { - group.push(current); - } - return groupings; - }, new Map()); -} - -export function groupByFilterMap( - source: readonly TValue[], - groupingKey: (item: TValue) => TKey, - predicateMapper: (item: TValue) => TMapped | null | undefined, -): Map { - return source.reduce((groupings, current) => { - const mapped = predicateMapper(current); - if (mapped != null) { - const value = groupingKey(current); - const group = groupings.get(value); - if (group === undefined) { - groupings.set(value, [mapped]); - } else { - group.push(mapped); - } - } - return groupings; - }, new Map()); -} - export function intersection(sources: T[][], comparator: (a: T, b: T) => boolean): T[] { const results: T[] = []; @@ -253,24 +204,3 @@ export function joinUnique(source: readonly T[], separator: string): string { export function splitAt(source: T[], index: number): [T[], T[]] { return index < 0 ? [source, []] : [source.slice(0, index), source.slice(index)]; } - -export function uniqueBy( - source: readonly TValue[], - uniqueKey: (item: TValue) => TKey, - onDuplicate: (original: TValue, current: TValue) => TValue | void, -): TValue[] { - const map = source.reduce((uniques, current) => { - const value = uniqueKey(current); - const original = uniques.get(value); - if (original === undefined) { - uniques.set(value, current); - } else { - const updated = onDuplicate(original, current); - if (updated !== undefined) { - uniques.set(value, updated); - } - } - return uniques; - }, new Map()); - return [...map.values()]; -} diff --git a/src/system/iterable.ts b/src/system/iterable.ts index f69502491d340..445ecec7e01af 100644 --- a/src/system/iterable.ts +++ b/src/system/iterable.ts @@ -145,6 +145,72 @@ export function flatten(source: Iterable> | IterableIterator i); } +export function groupBy( + source: Iterable | IterableIterator, + groupingKey: (item: T) => string, +): Record { + const groupings: Record = Object.create(null); + + for (const current of source) { + const value = groupingKey(current); + const group = groupings[value]; + if (group === undefined) { + groupings[value] = [current]; + } else { + group.push(current); + } + } + + return groupings; +} + +export function groupByMap( + source: Iterable | IterableIterator, + groupingKey: (item: TValue) => TKey, + options?: { filterNullGroups?: boolean }, +): Map { + const groupings = new Map(); + + const filterNullGroups = options?.filterNullGroups ?? false; + + for (const current of source) { + const value = groupingKey(current); + if (value == null && filterNullGroups) continue; + + const group = groupings.get(value); + if (group === undefined) { + groupings.set(value, [current]); + } else { + group.push(current); + } + } + + return groupings; +} + +export function groupByFilterMap( + source: Iterable | IterableIterator, + groupingKey: (item: TValue) => TKey, + predicateMapper: (item: TValue) => TMapped | null | undefined, +): Map { + const groupings = new Map(); + + for (const current of source) { + const mapped = predicateMapper(current); + if (mapped == null) continue; + + const value = groupingKey(current); + const group = groupings.get(value); + if (group === undefined) { + groupings.set(value, [mapped]); + } else { + group.push(mapped); + } + } + + return groupings; +} + export function has(source: Iterable | IterableIterator, item: T): boolean { return some(source, i => i === item); } diff --git a/src/views/draftsView.ts b/src/views/draftsView.ts index b6d591a8576f5..4557bbcb8546b 100644 --- a/src/views/draftsView.ts +++ b/src/views/draftsView.ts @@ -8,9 +8,9 @@ import { unknownGitUri } from '../git/gitUri'; import type { Draft } from '../gk/models/drafts'; import { showPatchesView } from '../plus/drafts/actions'; import { ensurePlusFeaturesEnabled } from '../plus/gk/utils'; -import { groupByFilterMap } from '../system/array'; import { executeCommand } from '../system/command'; import { gate } from '../system/decorators/gate'; +import { groupByFilterMap } from '../system/iterable'; import { CacheableChildrenViewNode } from './nodes/abstract/cacheableChildrenViewNode'; import { DraftNode } from './nodes/draftNode'; import { GroupingNode } from './nodes/groupingNode'; diff --git a/src/views/nodes/UncommittedFilesNode.ts b/src/views/nodes/UncommittedFilesNode.ts index d3d3e0bc3376e..b660e5a412224 100644 --- a/src/views/nodes/UncommittedFilesNode.ts +++ b/src/views/nodes/UncommittedFilesNode.ts @@ -3,8 +3,8 @@ import { GitUri } from '../../git/gitUri'; import type { GitTrackingState } from '../../git/models/branch'; import type { GitFileWithCommit } from '../../git/models/file'; import type { GitStatus, GitStatusFile } from '../../git/models/status'; -import { groupBy, makeHierarchical } from '../../system/array'; -import { flatMap } from '../../system/iterable'; +import { makeHierarchical } from '../../system/array'; +import { flatMap, groupBy } from '../../system/iterable'; import { joinPaths, normalizePath } from '../../system/path'; import type { ViewsWithWorkingTree } from '../viewBase'; import { ContextValues, getViewNodeId, ViewNode } from './abstract/viewNode'; diff --git a/src/views/nodes/branchTrackingStatusFilesNode.ts b/src/views/nodes/branchTrackingStatusFilesNode.ts index f27944f828743..080f6451d5f8f 100644 --- a/src/views/nodes/branchTrackingStatusFilesNode.ts +++ b/src/views/nodes/branchTrackingStatusFilesNode.ts @@ -4,8 +4,8 @@ import { GitUri } from '../../git/gitUri'; import type { GitBranch } from '../../git/models/branch'; import type { GitFileWithCommit } from '../../git/models/file'; import { createRevisionRange } from '../../git/models/reference'; -import { groupByMap, makeHierarchical } from '../../system/array'; -import { filter, flatMap, map } from '../../system/iterable'; +import { makeHierarchical } from '../../system/array'; +import { filter, flatMap, groupByMap, map } from '../../system/iterable'; import { joinPaths, normalizePath } from '../../system/path'; import { pluralize, sortCompare } from '../../system/string'; import type { ViewsWithCommits } from '../viewBase'; diff --git a/src/views/nodes/statusFilesNode.ts b/src/views/nodes/statusFilesNode.ts index aed0ead02b298..48f6e765ba711 100644 --- a/src/views/nodes/statusFilesNode.ts +++ b/src/views/nodes/statusFilesNode.ts @@ -5,8 +5,8 @@ import type { GitCommit } from '../../git/models/commit'; import type { GitFileWithCommit } from '../../git/models/file'; import type { GitLog } from '../../git/models/log'; import type { GitStatus, GitStatusFile } from '../../git/models/status'; -import { groupBy, makeHierarchical } from '../../system/array'; -import { filter, flatMap, map } from '../../system/iterable'; +import { makeHierarchical } from '../../system/array'; +import { filter, flatMap, groupBy, map } from '../../system/iterable'; import { joinPaths, normalizePath } from '../../system/path'; import { pluralize, sortCompare } from '../../system/string'; import type { ViewsWithWorkingTree } from '../viewBase'; diff --git a/src/webviews/apps/plus/graph/minimap/minimap.ts b/src/webviews/apps/plus/graph/minimap/minimap.ts index a8073f61860d0..f3bbbda79d2ee 100644 --- a/src/webviews/apps/plus/graph/minimap/minimap.ts +++ b/src/webviews/apps/plus/graph/minimap/minimap.ts @@ -1,9 +1,8 @@ import { css, customElement, FASTElement, html, observable, ref } from '@microsoft/fast-element'; import type { Chart, DataItem, RegionOptions } from 'billboard.js'; -import { groupByMap } from '../../../../../system/array'; import { debug } from '../../../../../system/decorators/log'; import { debounce } from '../../../../../system/function'; -import { first, flatMap, map, union } from '../../../../../system/iterable'; +import { first, flatMap, groupByMap, map, union } from '../../../../../system/iterable'; import { pluralize } from '../../../../../system/string'; import { formatDate, formatNumeric, fromNow } from '../../../shared/date'; From dc1fa65d8c1076e2fe2736ab6a01aa042b354281 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sat, 3 Feb 2024 19:28:41 -0500 Subject: [PATCH 0484/1012] Closes #3134 adds font settings for file blame --- CHANGELOG.md | 1 + package.json | 21 +++++++++++++++++ src/annotations/annotations.ts | 8 +++++-- .../gutterBlameAnnotationProvider.ts | 23 ++++++++++++++++++- src/config.ts | 3 +++ 5 files changed, 53 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db1c946d17518..ea69973178bd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds an _Open Changes_ submenu to branch status (upstream) and branch status files in GitLens views - Adds an alternate flow (pick another file) when using the _Open File at Revision..._ and _Open Changes with Revision..._ commands to open a file that has been renamed and the rename is currently unstaged — closes [#3109](https://github.com/gitkraken/vscode-gitlens/issues/3109) - Adds an _Open File Annotation Settings_ command to the _File Annotations_ submenu in the editor toolbar to open the GitLens Settings editor to the file annotations sections +- Adds new font settings to control the font family, size, and weight of the _File Blame_ annotations — closes [#3134](https://github.com/gitkraken/vscode-gitlens/issues/3134) ### Changed diff --git a/package.json b/package.json index 36a5f44938c5a..7fb1b2fa3ca26 100644 --- a/package.json +++ b/package.json @@ -2209,6 +2209,27 @@ "scope": "window", "order": 20 }, + "gitlens.blame.fontFamily": { + "type": "string", + "default": "", + "markdownDescription": "Specifies the font family of the file blame annotations", + "scope": "window", + "order": 21 + }, + "gitlens.blame.fontSize": { + "type": "number", + "default": 0, + "markdownDescription": "Specifies the font size of the file blame annotations", + "scope": "window", + "order": 22 + }, + "gitlens.blame.fontWeight": { + "type": "string", + "default": "normal", + "markdownDescription": "Specifies the font weight of the file blame annotations", + "scope": "window", + "order": 22 + }, "gitlens.blame.heatmap.enabled": { "type": "boolean", "default": true, diff --git a/src/annotations/annotations.ts b/src/annotations/annotations.ts index 9d37eade8e9a6..13a806f8cdb58 100644 --- a/src/annotations/annotations.ts +++ b/src/annotations/annotations.ts @@ -16,6 +16,7 @@ import type { GitCommit } from '../git/models/commit'; import { scale, toRgba } from '../system/color'; import { configuration } from '../system/configuration'; import { getWidth, interpolate, pad } from '../system/string'; +import type { BlameFontOptions } from './gutterBlameAnnotationProvider'; export interface ComputedHeatmap { coldThresholdTimestamp: number; @@ -166,6 +167,7 @@ export function getGutterRenderOptions( avatars: boolean, format: string, options: CommitFormatOptions, + fontOptions: BlameFontOptions, ): RenderOptions { // Get the character count of all the tokens, assuming there there is a cap (bail if not) let chars = 0; @@ -212,12 +214,14 @@ export function getGutterRenderOptions( borderStyle: borderStyle, borderWidth: borderWidth, color: new ThemeColor('gitlens.gutterForegroundColor' satisfies Colors), - fontWeight: 'normal', - fontStyle: 'normal', + fontWeight: fontOptions.weight ?? 'normal', + fontStyle: fontOptions.weight ?? 'normal', height: '100%', margin: '0 26px -1px 0', textDecoration: `${separateLines ? 'overline solid rgba(0, 0, 0, .2)' : 'none'};box-sizing: border-box${ avatars ? ';padding: 0 0 0 18px' : '' + }${fontOptions.family ? `;font-family: ${fontOptions.family}` : ''}${ + fontOptions.size ? `;font-size: ${fontOptions.size}px` : '' }`, width: width, uncommittedColor: new ThemeColor('gitlens.gutterUncommittedForegroundColor' satisfies Colors), diff --git a/src/annotations/gutterBlameAnnotationProvider.ts b/src/annotations/gutterBlameAnnotationProvider.ts index 98afce8c299a1..91675261cf14b 100644 --- a/src/annotations/gutterBlameAnnotationProvider.ts +++ b/src/annotations/gutterBlameAnnotationProvider.ts @@ -22,6 +22,12 @@ import { Decorations } from './fileAnnotationController'; const maxSmallIntegerV8 = 2 ** 30; // Max number that can be stored in V8's smis (small integers) +export interface BlameFontOptions { + family: string; + size: number; + weight: string; +} + export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase { constructor(container: Container, editor: TextEditor, trackedDocument: TrackedGitDocument) { super(container, 'blame', editor, trackedDocument); @@ -68,10 +74,23 @@ export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase { tokenOptions: tokenOptions, }; + const fontOptions: BlameFontOptions = { + family: configuration.get('blame.fontFamily'), + size: configuration.get('blame.fontSize'), + weight: configuration.get('blame.fontWeight'), + }; + const avatars = cfg.avatars; const gravatarDefault = configuration.get('defaultGravatarsStyle'); const separateLines = cfg.separateLines; - const renderOptions = getGutterRenderOptions(separateLines, cfg.heatmap, cfg.avatars, cfg.format, options); + const renderOptions = getGutterRenderOptions( + separateLines, + cfg.heatmap, + cfg.avatars, + cfg.format, + options, + fontOptions, + ); const decorationOptions = []; const decorationsMap = new Map(); @@ -109,6 +128,8 @@ export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase { if (separateLines) { gutter.renderOptions.before!.textDecoration = `none;box-sizing: border-box${ avatars ? ';padding: 0 0 0 18px' : '' + }${fontOptions.family ? `;font-family: ${fontOptions.family}` : ''}${ + fontOptions.size ? `;font-size: ${fontOptions.size}px` : '' }`; } diff --git a/src/config.ts b/src/config.ts index 82d7da7a54e73..34e2c45599783 100644 --- a/src/config.ts +++ b/src/config.ts @@ -25,6 +25,9 @@ export interface Config { readonly avatars: boolean; readonly compact: boolean; readonly dateFormat: DateTimeFormat | (string & object) | null; + readonly fontFamily: string; + readonly fontSize: number; + readonly fontWeight: string; readonly format: string; readonly heatmap: { readonly enabled: boolean; From 4af8bb7b8b60143c0a75b9f7c95e13cdd8bf0a5a Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sun, 4 Feb 2024 15:15:00 -0500 Subject: [PATCH 0485/1012] Removes unneeded eslint-config-prettier --- .eslintrc.base.json | 3 +-- package.json | 1 - yarn.lock | 5 ----- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.eslintrc.base.json b/.eslintrc.base.json index 48a8d9336121c..c1509d5a8c98e 100644 --- a/.eslintrc.base.json +++ b/.eslintrc.base.json @@ -6,8 +6,7 @@ "eslint:recommended", "plugin:@typescript-eslint/strict-type-checked", "plugin:import/recommended", - "plugin:import/typescript", - "prettier" + "plugin:import/typescript" ], "parser": "@typescript-eslint/parser", "parserOptions": { diff --git a/package.json b/package.json index 7fb1b2fa3ca26..9046784a0964d 100644 --- a/package.json +++ b/package.json @@ -16486,7 +16486,6 @@ "esbuild-sass-plugin": "3.0.0", "eslint": "8.56.0", "eslint-cli": "1.1.1", - "eslint-config-prettier": "9.1.0", "eslint-import-resolver-typescript": "3.6.1", "eslint-plugin-anti-trojan-source": "1.1.1", "eslint-plugin-import": "2.29.1", diff --git a/yarn.lock b/yarn.lock index 8999ee078dc69..4b585f1219757 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3138,11 +3138,6 @@ eslint-cli@1.1.1: debug "^2.6.8" resolve "^1.3.3" -eslint-config-prettier@9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz#31af3d94578645966c082fcb71a5846d3c94867f" - integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw== - eslint-import-resolver-node@^0.3.9: version "0.3.9" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac" From e1f752d3386f4b106c065183f1cebd86391dcace Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sun, 4 Feb 2024 15:32:43 -0500 Subject: [PATCH 0486/1012] Updates dependencies --- package.json | 8 +- yarn.lock | 216 ++++++++++++++++++++++++++------------------------- 2 files changed, 115 insertions(+), 109 deletions(-) diff --git a/package.json b/package.json index 9046784a0964d..97c06e31e85e7 100644 --- a/package.json +++ b/package.json @@ -16478,7 +16478,7 @@ "concurrently": "8.2.2", "copy-webpack-plugin": "12.0.2", "csp-html-webpack-plugin": "5.1.0", - "css-loader": "6.9.1", + "css-loader": "6.10.0", "css-minimizer-webpack-plugin": "6.0.0", "cssnano-preset-advanced": "6.0.3", "esbuild": "0.20.0", @@ -16498,11 +16498,11 @@ "image-minimizer-webpack-plugin": "4.0.0", "license-checker-rseidelsohn": "4.3.0", "lz-string": "1.5.0", - "mini-css-extract-plugin": "2.7.7", + "mini-css-extract-plugin": "2.8.0", "mocha": "10.2.0", "prettier": "3.1.0", "sass": "1.70.0", - "sass-loader": "14.0.0", + "sass-loader": "14.1.0", "schema-utils": "4.2.0", "sharp": "0.32.6", "svgo": "3.2.0", @@ -16510,7 +16510,7 @@ "ts-loader": "9.5.1", "tsc-alias": "1.8.8", "typescript": "5.3.3", - "webpack": "5.90.0", + "webpack": "5.90.1", "webpack-bundle-analyzer": "4.10.1", "webpack-cli": "5.1.4", "webpack-node-externals": "3.0.0", diff --git a/yarn.lock b/yarn.lock index 4b585f1219757..00b533240a854 100644 --- a/yarn.lock +++ b/yarn.lock @@ -57,9 +57,9 @@ regenerator-runtime "^0.14.0" "@bufbuild/protobuf@^1.0.0": - version "1.7.1" - resolved "https://registry.yarnpkg.com/@bufbuild/protobuf/-/protobuf-1.7.1.tgz#ce295b06d3f2f38c2671ee315c4ad296bbcbb337" - integrity sha512-UlI3lKLFBjZQJ0cHf47YUH6DzZxZYWk3sf6dKYyPUaXrfXq4z+zZqNO3q0lPUzyJgh14s6VscjcNFBaQBhYd9Q== + version "1.7.2" + resolved "https://registry.yarnpkg.com/@bufbuild/protobuf/-/protobuf-1.7.2.tgz#1b3d6c66ebd987f7da7f1e3f0546cffaa87f8732" + integrity sha512-i5GE2Dk5ekdlK1TR7SugY4LWRrKSfb5T1Qn4unpIMbfxoeGKERKQ59HG3iYewacGD10SR7UzevfPnh6my4tNmQ== "@discoveryjs/json-ext@0.5.7", "@discoveryjs/json-ext@^0.5.0": version "0.5.7" @@ -500,22 +500,22 @@ methods "^1.1.2" path-to-regexp "^6.2.1" -"@lit-labs/ssr-dom-shim@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.2.tgz#d693d972974a354034454ec1317eb6afd0b00312" - integrity sha512-jnOD+/+dSrfTWYfSXBXlo5l5f0q1UuJo3tkbMDCYA2lKUYq79jaxqtGEvnRoh049nt1vdo1+45RinipU6FGY2g== +"@lit-labs/ssr-dom-shim@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.2.0.tgz#353ce4a76c83fadec272ea5674ede767650762fd" + integrity sha512-yWJKmpGE6lUURKAaIltoPIE/wrbY3TEkqQt+X0m+7fQNnAv0keydnYvbiJFP1PnMhizmIWRWOG5KLhYyc/xl+g== "@lit/react@1.0.2": version "1.0.2" resolved "https://registry.yarnpkg.com/@lit/react/-/react-1.0.2.tgz#4951ff1590d69aad912d0a950b3518d19eb7e220" integrity sha512-UJ5TQ46DPcJDIzyjbwbj6Iye0XcpCxL2yb03zcWq1BpWchpXS3Z0BPVhg7zDfZLF6JemPml8u/gt/+KwJ/23sg== -"@lit/reactive-element@^2.0.0": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-2.0.3.tgz#29d7d4ee8d9b00804be957cc6937577eb4d3db63" - integrity sha512-e067EuTNNgOHm1tZcc0Ia7TCzD/9ZpoPegHKgesrGK6pSDRGkGDAQbYuQclqLPIoJ9eC8Kb9mYtGryWcM5AywA== +"@lit/reactive-element@^2.0.0", "@lit/reactive-element@^2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-2.0.4.tgz#8f2ed950a848016383894a26180ff06c56ae001b" + integrity sha512-GFn91inaUa2oHLak8awSIigYz0cU0Payr1rcFsrkf5OJ5eSPxElyZfKh0f2p9FsTiZWXQdWGJeXZICEfXXYSXQ== dependencies: - "@lit-labs/ssr-dom-shim" "^1.1.2" + "@lit-labs/ssr-dom-shim" "^1.2.0" "@microsoft/fast-element@1.12.0", "@microsoft/fast-element@^1.12.0", "@microsoft/fast-element@^1.6.2", "@microsoft/fast-element@^1.9.0": version "1.12.0" @@ -733,11 +733,11 @@ integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== "@playwright/browser-chromium@^1.41.1": - version "1.41.1" - resolved "https://registry.yarnpkg.com/@playwright/browser-chromium/-/browser-chromium-1.41.1.tgz#800f9f4f5b10a87e9728d5999dd9e705c1352f7a" - integrity sha512-rgPTuAmA+8zQLb7+GDY7hrdnCRMrL2C/JPFylWeQBJkQtldJsk2pELUR7NESeJtXVzML/x+aFnGPRY0r5+YO3Q== + version "1.41.2" + resolved "https://registry.yarnpkg.com/@playwright/browser-chromium/-/browser-chromium-1.41.2.tgz#f6b2e51b95bb98e916e7c42c9a6f885923cfcd4b" + integrity sha512-vzobqNg2K6cJPyXCVaUxq8uDV54l3pEJvkO58XK0CBV2nl9IBySXvEqcgwsQc8PmQ930yVDrz0oCrMR6H/Qv3A== dependencies: - playwright-core "1.41.1" + playwright-core "1.41.2" "@polka/url@^1.0.0-next.24": version "1.0.0-next.24" @@ -957,9 +957,9 @@ integrity sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg== "@types/node@*": - version "20.11.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.10.tgz#6c3de8974d65c362f82ee29db6b5adf4205462f9" - integrity sha512-rZEfe/hJSGYmdfX9tvcPMYeYPW2sNl50nsw4jZmRcaG0HIAb0WYEpsB05GOb53vjqpyE9GUhlDQ4jLSoB5q9kg== + version "20.11.16" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.16.tgz#4411f79411514eb8e2926f036c86c9f0e4ec6708" + integrity sha512-gKb0enTmRCzXSSUJDq6/sPcqrfCv2mkkG6Jt/clpn5eiCbKTY+SgZUxo+p8ZKMof5dCp9vHQUAB7wOUTod22wQ== dependencies: undici-types "~5.26.4" @@ -1544,12 +1544,12 @@ argparse@^2.0.1: integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== array-buffer-byte-length@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead" - integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A== + version "1.0.1" + resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f" + integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg== dependencies: - call-bind "^1.0.2" - is-array-buffer "^3.0.1" + call-bind "^1.0.5" + is-array-buffer "^3.0.4" array-find-index@^1.0.2: version "1.0.2" @@ -1660,10 +1660,10 @@ autoprefixer@^10.4.16: picocolors "^1.0.0" postcss-value-parser "^4.2.0" -available-typed-arrays@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" - integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== +available-typed-arrays@^1.0.5, available-typed-arrays@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.6.tgz#ac812d8ce5a6b976d738e1c45f08d0b00bc7d725" + integrity sha512-j1QzY8iPNPG4o4xmO3ptzpRxTciqD3MgEHtifP/YnJpIo58Xu+ne4BejlbkuaLfXn/nz6HFiw29bLpj2PNMdGg== azure-devops-node-api@^11.0.1: version "11.2.0" @@ -1853,7 +1853,7 @@ cache-content-type@^1.0.0: mime-types "^2.1.18" ylru "^1.2.0" -call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5: +call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513" integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ== @@ -1901,9 +1901,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001578, caniuse-lite@^1.0.30001580: - version "1.0.30001581" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001581.tgz#0dfd4db9e94edbdca67d57348ebc070dece279f4" - integrity sha512-whlTkwhqV2tUmP3oYhtNfaWGYHDdS3JYFQBKXxcUR9qqPWsRhFHhoISO2Xnl/g0xyKzht9mI1LZpiNWfMzHixQ== + version "1.0.30001583" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001583.tgz#abb2970cc370801dc7e27bf290509dc132cfa390" + integrity sha512-acWTYaha8xfhA/Du/z4sNZjHUWjkiuoAi2LM+T/aL+kemKQgPT1xBb/YKjlQ0Qo8gvbHsGNplrEJ+9G3gL7i4Q== capital-case@^1.0.4: version "1.0.4" @@ -2289,10 +2289,10 @@ css-declaration-sorter@^7.1.1: resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-7.1.1.tgz#9796bcc257b4647c39993bda8d431ce32b666f80" integrity sha512-dZ3bVTEEc1vxr3Bek9vGwfB5Z6ESPULhcRvO472mfjVnj8jRcTnKO8/JTczlvxM10Myb+wBM++1MtdO76eWcaQ== -css-loader@6.9.1: - version "6.9.1" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.9.1.tgz#9ec9a434368f2bdfeffbf8f6901a1ce773586c6b" - integrity sha512-OzABOh0+26JKFdMzlK6PY1u5Zx8+Ck7CVRlcGNZoY9qwJjdfu2VWFuprTIpPW+Av5TZTVViYWcFQaEEQURLknQ== +css-loader@6.10.0: + version "6.10.0" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.10.0.tgz#7c172b270ec7b833951b52c348861206b184a4b7" + integrity sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw== dependencies: icss-utils "^5.1.0" postcss "^8.4.33" @@ -2875,9 +2875,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.4.648: - version "1.4.650" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.650.tgz#b38ef9de16991b9f7b924246770576ab91ab3d64" - integrity sha512-sYSQhJCJa4aGA1wYol5cMQgekDBlbVfTRavlGZVr3WZpDdOPcp6a6xUnFfrt8TqZhsBYYbDxJZCjGfHuGupCRQ== + version "1.4.656" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.656.tgz#b374fb7cab9b782a5bc967c0ce0e19826186b9c9" + integrity sha512-9AQB5eFTHyR3Gvt2t/NwR0le2jBSUNwCnMbUCejFWHD+so4tH40/dRLgoE+jxlPeWS43XJewyvCv+I8LPMl49Q== emoji-regex@^8.0.0: version "8.0.0" @@ -2942,9 +2942,9 @@ env-paths@^2.2.0: integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== envinfo@^7.7.3: - version "7.11.0" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.11.0.tgz#c3793f44284a55ff8c82faf1ffd91bc6478ea01f" - integrity sha512-G9/6xF1FPbIw0TtalAMaVPpiq2aDEuKLXM314jPVAO9r2fo2a4BLqMNkmRS7O/xPPZ+COAhGIz3ETvHEV3eUcg== + version "7.11.1" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.11.1.tgz#2ffef77591057081b0129a8fd8cf6118da1b94e1" + integrity sha512-8PiZgZNIB4q/Lw4AhOvAfB/ityHAd2bli3lESSWmWSzSsl5dKpy5N1d1Rfkd2teq/g9xN90lc6o98DOjMeYHpg== err-code@^2.0.2: version "2.0.3" @@ -3003,6 +3003,11 @@ es-abstract@^1.22.1: unbox-primitive "^1.0.2" which-typed-array "^1.1.13" +es-errors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.0.0.tgz#1936450fb8cff7bffb969335d0e55dfca7279aab" + integrity sha512-yHV74THqMJUyFKkHyN7hyENcEZM3Dj2a2IrdClY+IT4BFQHkIVwlh8s6uZfjsFydMdNHv0F5mWgAA3ajFbsvVQ== + es-module-lexer@^1.2.1: version "1.4.1" resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5" @@ -3585,11 +3590,12 @@ get-caller-file@^2.0.5: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b" - integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA== +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.3.tgz#9d2d284a238e62672f556361e7d4e1a4686ae50e" + integrity sha512-JIcZczvcMVE7AUOP+X72bh8HqHBRxFdz5PDHYtNG/lE3yk9b3KZBJlwFcTyPYjg3L4RLLmZJzvjxhaZVapxFrQ== dependencies: + es-errors "^1.0.0" function-bind "^1.1.2" has-proto "^1.0.1" has-symbols "^1.0.3" @@ -3826,12 +3832,12 @@ has-symbols@^1.0.2, has-symbols@^1.0.3: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== -has-tostringtag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" - integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== +has-tostringtag@^1.0.0, has-tostringtag@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc" + integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw== dependencies: - has-symbols "^1.0.2" + has-symbols "^1.0.3" has-unicode@^2.0.1: version "2.0.1" @@ -4054,9 +4060,9 @@ ieee754@^1.1.13: integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== ignore@^5.1.9, ignore@^5.2.0, ignore@^5.2.4: - version "5.3.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78" - integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg== + version "5.3.1" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef" + integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw== image-minimizer-webpack-plugin@4.0.0: version "4.0.0" @@ -4166,14 +4172,13 @@ ip@^2.0.0: resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== -is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" - integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w== +is-array-buffer@^3.0.2, is-array-buffer@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98" + integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw== dependencies: call-bind "^1.0.2" - get-intrinsic "^1.2.0" - is-typed-array "^1.1.10" + get-intrinsic "^1.2.1" is-arrayish@^0.2.1: version "0.2.1" @@ -4363,11 +4368,11 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: has-symbols "^1.0.2" is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9: - version "1.1.12" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a" - integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg== + version "1.1.13" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229" + integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw== dependencies: - which-typed-array "^1.1.11" + which-typed-array "^1.1.14" is-unicode-supported@^0.1.0: version "0.1.0" @@ -4692,18 +4697,18 @@ linkify-it@^3.0.1: uc.micro "^1.0.1" lit-element@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-4.0.3.tgz#18239840a7c1a6a6e09c6ed3b5cd3db0512ebf15" - integrity sha512-2vhidmC7gGLfnVx41P8UZpzyS0Fb8wYhS5RCm16cMW3oERO0Khd3EsKwtRpOnttuByI5rURjT2dfoA7NlInCNw== + version "4.0.4" + resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-4.0.4.tgz#e0b37ebbe2394bcb9578d611a409f49475dff361" + integrity sha512-98CvgulX6eCPs6TyAIQoJZBCQPo80rgXR+dVBs61cstJXqtI+USQZAbA4gFHh6L/mxBx9MrgPLHLsUgDUHAcCQ== dependencies: - "@lit-labs/ssr-dom-shim" "^1.1.2" - "@lit/reactive-element" "^2.0.0" - lit-html "^3.1.0" + "@lit-labs/ssr-dom-shim" "^1.2.0" + "@lit/reactive-element" "^2.0.4" + lit-html "^3.1.2" -lit-html@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-3.1.1.tgz#50c2e74a2074f85fc9816676ac11cf0c96f257c3" - integrity sha512-x/EwfGk2D/f4odSFM40hcGumzqoKv0/SUh6fBO+1Ragez81APrcAMPo1jIrCDd9Sn+Z4CT867HWKViByvkDZUA== +lit-html@^3.1.0, lit-html@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-3.1.2.tgz#6655ce82367472de7680c62b1bcb0beb0e426fa1" + integrity sha512-3OBZSUrPnAHoKJ9AMjRL/m01YJxQMf+TMHanNtTHG68ubjnZxK0RFl102DPzsw4mWnHibfZIBJm3LWCZ/LmMvg== dependencies: "@types/trusted-types" "^2.0.2" @@ -4956,12 +4961,13 @@ min-indent@^1.0.1: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -mini-css-extract-plugin@2.7.7: - version "2.7.7" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.7.tgz#4acf02f362c641c38fb913bfcb7ca2fc4a7cf339" - integrity sha512-+0n11YGyRavUR3IlaOzJ0/4Il1avMvJ1VJfhWfCn24ITQXhRr1gghbhhrda6tgtNcpZaWKdSuwKq20Jb7fnlyw== +mini-css-extract-plugin@2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.0.tgz#1aeae2a90a954b6426c9e8311eab36b450f553a0" + integrity sha512-CxmUYPFcTgET1zImteG/LZOy/4T5rTojesQXkSNBiquhydn78tfbCE9sjIjnJ/UcjNjOC1bphTCCW5rrS7cXAg== dependencies: schema-utils "^4.0.0" + tapable "^2.2.1" minimatch@5.0.1: version "5.0.1" @@ -5649,17 +5655,17 @@ pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -playwright-core@1.41.1: - version "1.41.1" - resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.41.1.tgz#9c152670010d9d6f970f34b68e3e935d3c487431" - integrity sha512-/KPO5DzXSMlxSX77wy+HihKGOunh3hqndhqeo/nMxfigiKzogn8kfL0ZBDu0L1RKgan5XHCPmn6zXd2NUJgjhg== +playwright-core@1.41.2: + version "1.41.2" + resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.41.2.tgz#db22372c708926c697acc261f0ef8406606802d9" + integrity sha512-VaTvwCA4Y8kxEe+kfm2+uUUw5Lubf38RxF7FpBxLPmGe5sdNkSg5e3ChEigaGrX7qdqT3pt2m/98LiyvU2x6CA== playwright@^1.41.1: - version "1.41.1" - resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.41.1.tgz#83325f34165840d019355c2a78a50f21ed9b9c85" - integrity sha512-gdZAWG97oUnbBdRL3GuBvX3nDDmUOuqzV/D24dytqlKt+eI5KbwusluZRGljx1YoJKZ2NRPaeWiFTeGZO7SosQ== + version "1.41.2" + resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.41.2.tgz#4e760b1c79f33d9129a8c65cc27953be6dd35042" + integrity sha512-v0bOa6H2GJChDL8pAeLa/LZC4feoAMbSQm1/jF/ySsWWoaNItvrMP7GEkvEEFyCTUYKMxjQKaTSg5up7nR6/8A== dependencies: - playwright-core "1.41.1" + playwright-core "1.41.2" optionalDependencies: fsevents "2.3.2" @@ -6548,10 +6554,10 @@ sass-embedded@^1.70.0: sass-embedded-win32-ia32 "1.70.0" sass-embedded-win32-x64 "1.70.0" -sass-loader@14.0.0: - version "14.0.0" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-14.0.0.tgz#fc8390f7cc16863622cd16f3ea07b36ba6ea8f91" - integrity sha512-oceP9wWbep/yRJ2+sMbCzk0UsXsDzdNis+N8nu9i5GwPXjy6v3DNB6TqfJLSpPO9k4+B8x8p/CEgjA9ZLkoLug== +sass-loader@14.1.0: + version "14.1.0" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-14.1.0.tgz#43ba90e0cd8a15a1e932e818c525b0115a0ce8a3" + integrity sha512-LS2mLeFWA+orYxHNu+O18Xe4jR0kyamNOOUsE3NyBP4DvIL+8stHpNX0arYTItdPe80kluIiJ7Wfe/9iHSRO0Q== dependencies: neo-async "^2.6.2" @@ -6942,9 +6948,9 @@ stream-shift@^1.0.0: integrity sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ== streamx@^2.15.0: - version "2.15.6" - resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.6.tgz#28bf36997ebc7bf6c08f9eba958735231b833887" - integrity sha512-q+vQL4AAz+FdfT137VF69Cc/APqUbxy+MDOImRrMvchJpigHj9GksgDU2LYbO9rx7RX6osWgxJB2WxhYv4SZAw== + version "2.15.7" + resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.7.tgz#a12fe09faa3fda2483e8044c406b72286994a138" + integrity sha512-NPEKS5+yjyo597eafGbKW5ujh7Sm6lDLHZQd/lRSz6S0VarpADBJItqfB4PnwpS+472oob1GX5cCY9vzfJpHUA== dependencies: fast-fifo "^1.1.0" queue-tick "^1.0.1" @@ -7133,7 +7139,7 @@ tapable@^1.0.0: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0: +tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== @@ -7675,10 +7681,10 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@5.90.0, webpack@^5: - version "5.90.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.90.0.tgz#313bfe16080d8b2fee6e29b6c986c0714ad4290e" - integrity sha512-bdmyXRCXeeNIePv6R6tGPyy20aUobw4Zy8r0LUS2EWO+U+Ke/gYDgsCh7bl5rB6jPpr4r0SZa6dPxBxLooDT3w== +webpack@5.90.1, webpack@^5: + version "5.90.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.90.1.tgz#62ab0c097d7cbe83d32523dbfbb645cdb7c3c01c" + integrity sha512-SstPdlAC5IvgFnhiRok8hqJo/+ArAbNv7rhU4fnWGHNVfN59HSQFaxZDSAL3IFG2YmqxuRs+IU33milSxbPlog== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.5" @@ -7724,16 +7730,16 @@ which-boxed-primitive@^1.0.2: is-string "^1.0.5" is-symbol "^1.0.3" -which-typed-array@^1.1.11, which-typed-array@^1.1.13: - version "1.1.13" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36" - integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow== +which-typed-array@^1.1.13, which-typed-array@^1.1.14: + version "1.1.14" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.14.tgz#1f78a111aee1e131ca66164d8bdc3ab062c95a06" + integrity sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg== dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.4" + available-typed-arrays "^1.0.6" + call-bind "^1.0.5" for-each "^0.3.3" gopd "^1.0.1" - has-tostringtag "^1.0.0" + has-tostringtag "^1.0.1" which@^2.0.1, which@^2.0.2: version "2.0.2" From 2e2f8724ea0a9da4417cfb50660317d9ee044351 Mon Sep 17 00:00:00 2001 From: yutotnh <57719497+yutotnh@users.noreply.github.com> Date: Mon, 22 Jan 2024 03:08:04 +0900 Subject: [PATCH 0487/1012] Fix typos in README.md and package.json --- README.md | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6106758ca50c3..5aa6bc3fd2f27 100644 --- a/README.md +++ b/README.md @@ -427,7 +427,8 @@ A big thanks to the people that have contributed to this project 🙏❤️: - WofWca ([@WofWca](https://github.com/WofWca)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=WofWca) - 不见月 ([@nooooooom](https://github.com/nooooooom)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=nooooooom) - Ian Chamberlain ([@ian-h-chamberlain](https://github.com/ian-h-chamberlain)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=ian-h-chamberlain) -- Brandon Cheng ([@gluxon](https://github.com/gluxon)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=gluxon)` +- Brandon Cheng ([@gluxon](https://github.com/gluxon)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=gluxon) +- yutotnh ([@yutotnh](https://github.com/yutotnh)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=yutotnh) Also special thanks to the people that have provided support, testing, brainstorming, etc: diff --git a/package.json b/package.json index 97c06e31e85e7..e59d7ad3c3a2f 100644 --- a/package.json +++ b/package.json @@ -3331,7 +3331,7 @@ "null" ], "default": null, - "markdownDescription": "Specifies the locale, a [BCP 47 language tag](https://en.wikipedia.org/wiki/IETF_language_tag#List_of_major_primary_language_subtags), to use for date formatting, defaults to the VS Code locale. Use `system` to follow the current system locale, or choose a specific locale, e.g `en-US` — US English, `en-GB` — British English, `de-DE` — German, 'ja-JP = Japanese, etc.", + "markdownDescription": "Specifies the locale, a [BCP 47 language tag](https://en.wikipedia.org/wiki/IETF_language_tag#List_of_major_primary_language_subtags), to use for date formatting, defaults to the VS Code locale. Use `system` to follow the current system locale, or choose a specific locale, e.g `en-US` — US English, `en-GB` — British English, `de-DE` — German, `ja-JP` = Japanese, etc.", "scope": "window", "order": 21 }, From 61feb7608b8bfcd8ee6a2848bcc434aa8210e835 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 5 Feb 2024 14:45:56 -0500 Subject: [PATCH 0488/1012] Adds copy/paste for patches --- CHANGELOG.md | 6 +- package.json | 73 +++++++- src/commands/patches.ts | 159 ++++++++++++++++-- src/constants.ts | 2 + src/env/node/git/localGitProvider.ts | 90 ++++++---- src/git/errors.ts | 25 +++ src/git/gitProvider.ts | 3 +- src/git/gitProviderService.ts | 12 +- .../patchDetails/patchDetailsWebview.ts | 14 +- 9 files changed, 328 insertions(+), 56 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea69973178bd8..30e1d4342c413 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Requires VS Code `1.85` or later with `multiDiffEditor.experimental.enabled` and `gitlens.experimental.openChangesInMultiDiffEditor` to be enabled - Adds a _Compare Pull Request_ context menu command on pull requests in the _Commit Graph_ and other GitLens views to open a comparison between the head and base of the pull request for easy reviewing - Adds an _Open in Commit Graph_ context menu command on pull requests in GitLens view to open the tip commit in the _Commit Graph_ +- Adds ability to copy changes, commits, stashes, and comparison as a patch to the clipboard + - Adds a _Copy as Patch_ context menu command on files, commits, stashes, and comparisons in GitLens views + - Adds a _Copy as Patch_ context menu command on files in the _Changes_ and _Staged Changes_ groups as well as the groups themselves in the _Source Control_ view + - Adds a _Apply Copied Patch_ command in the command palette to apply a patch from the clipboard - Adds an _Open All Changes_ inline button to branch status (upstream) and branch status files in GitLens views - Adds an _Open Changes_ submenu to branch status (upstream) and branch status files in GitLens views - Adds an alternate flow (pick another file) when using the _Open File at Revision..._ and _Open Changes with Revision..._ commands to open a file that has been renamed and the rename is currently unstaged — closes [#3109](https://github.com/gitkraken/vscode-gitlens/issues/3109) @@ -89,7 +93,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Cloud Patches that have been explicitly shared with you, i.e. you are a collaborator, now will appear in the _Cloud Patches_ view under _Shared with Me_ - Adds timed snoozing for items in the _Focus View_ — choose from a selection of times when snoozing and the item will automatically move out of the snoozed tab when that time expires - Adds the ability to open folder changes — closes [#3020](https://github.com/gitkraken/vscode-gitlens/issues/3020) - - Adds _Open Folder Changes with Revision..._ & _Open Folder Changes with Branch or Tag..._ commands to the Command Palette and to the _Explorer_ and _Source Control_ views + - Adds _Open Folder Changes with Revision..._ & _Open Folder Changes with Branch or Tag..._ commands to the command palette and to the _Explorer_ and _Source Control_ views - Requires VS Code `1.85` or later and `multiDiffEditor.experimental.enabled` to be enabled - Adds last modified time of the file when showing blame annotations for uncommitted changes - Adds search results to the minimap tooltips on the _Commit Graph_ diff --git a/package.json b/package.json index e59d7ad3c3a2f..036881a72a3a4 100644 --- a/package.json +++ b/package.json @@ -5166,6 +5166,16 @@ "title": "Show Patch Details", "category": "GitLens" }, + { + "command": "gitlens.applyPatchFromClipboard", + "title": "Apply Copied Patch", + "category": "GitLens" + }, + { + "command": "gitlens.copyPatchToClipboard", + "title": "Copy as Patch", + "category": "GitLens" + }, { "command": "gitlens.createPatch", "title": "Create Patch...", @@ -8934,9 +8944,17 @@ "command": "gitlens.showPatchDetailsPage", "when": "gitlens:enabled && gitlens:gk:organization:drafts:enabled && config.gitlens.cloudPatches.enabled" }, + { + "command": "gitlens.applyPatchFromClipboard", + "when": "gitlens:enabled && !gitlens:untrusted && !gitlens:hasVirtualFolders" + }, + { + "command": "gitlens.copyPatchToClipboard", + "when": "gitlens:enabled && !gitlens:untrusted && !gitlens:hasVirtualFolders" + }, { "command": "gitlens.createPatch", - "when": "false && gitlens:enabled" + "when": "false && gitlens:enabled && !gitlens:untrusted && !gitlens:hasVirtualFolders" }, { "command": "gitlens.createCloudPatch", @@ -11714,7 +11732,7 @@ }, { "submenu": "gitlens/scm/resourceGroup/changes", - "when": "gitlens:enabled && scmProvider == git && scmResourceGroup =~ /^(workingTree|index)$/ && config.gitlens.menus.scmGroup.compare", + "when": "gitlens:enabled && scmProvider == git && scmResourceGroup =~ /^(workingTree|index|merge)$/ && config.gitlens.menus.scmGroup.compare", "group": "2_gitlens@1" }, { @@ -11730,7 +11748,12 @@ { "command": "gitlens.openOnlyChangedFiles", "when": "gitlens:enabled && scmProvider == git && scmResourceGroup =~ /^(workingTree|index)$/ && config.gitlens.menus.scmGroup.openClose", - "group": "3_gitlens@2" + "group": "3_gitlens@3" + }, + { + "command": "gitlens.copyPatchToClipboard", + "when": "gitlens:enabled && scmProvider == git && scmResourceGroup =~ /^(workingTree|index)$/ && config.gitlens.menus.scmGroup.compare", + "group": "7_cutcopypaste@97" } ], "scm/resourceFolder/context": [ @@ -11738,6 +11761,11 @@ "submenu": "gitlens/scm/resourceFolder/changes", "when": "gitlens:enabled && scmProvider == git && scmResourceGroup =~ /^(workingTree|index|merge)$/ && config.gitlens.menus.scmItem.compare", "group": "2_gitlens@1" + }, + { + "command": "gitlens.copyPatchToClipboard", + "when": "gitlens:enabled && scmProvider == git && scmResourceGroup =~ /^(workingTree|index)$/ && config.gitlens.menus.scmGroup.compare", + "group": "7_cutcopypaste@97" } ], "scm/resourceState/context": [ @@ -11771,6 +11799,11 @@ "when": "gitlens:enabled && scmProvider == git && scmResourceGroup =~ /^(workingTree|index|merge)$/ && config.gitlens.menus.scmItem.share", "group": "7_a_gitlens_share@1" }, + { + "command": "gitlens.copyPatchToClipboard", + "when": "gitlens:enabled && scmProvider == git && scmResourceGroup =~ /^(workingTree|index)$/ && config.gitlens.menus.scmItem.compare", + "group": "7_cutcopypaste@97" + }, { "command": "gitlens.copyRelativePathToClipboard", "when": "gitlens:enabled && gitlens:hasRemotes && scmProvider == git && scmResourceGroup =~ /^(workingTree|index|merge)$/ && config.gitlens.menus.scmItem.clipboard", @@ -13027,6 +13060,11 @@ "when": "false && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:(commit|stash)\\b/", "group": "1_gitlens_actions_1@2" }, + { + "command": "gitlens.copyPatchToClipboard", + "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:(commit|stash)\\b/", + "group": "7_gitlens_cutcopypaste@97" + }, { "command": "gitlens.createCloudPatch", "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:gk:organization:drafts:enabled && config.gitlens.cloudPatches.enabled && viewItem =~ /gitlens:(commit|stash)\\b/", @@ -13081,14 +13119,29 @@ }, { "command": "gitlens.copyShaToClipboard", - "when": "(viewItem =~ /gitlens:(commit|stash)\\b/) || (viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view =~ /gitlens\\.views\\.(file|line)History/)", + "when": "viewItem =~ /gitlens:(commit|stash)\\b/", "group": "7_gitlens_cutcopypaste@3" }, { "command": "gitlens.copyMessageToClipboard", - "when": "(viewItem =~ /gitlens:(commit|stash)\\b/) || (viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view =~ /gitlens\\.views\\.(file|line)History/)", + "when": "viewItem =~ /gitlens:(commit|stash)\\b/", "group": "7_gitlens_cutcopypaste@4" }, + { + "command": "gitlens.copyPatchToClipboard", + "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/", + "group": "7_gitlens_cutcopypaste@3" + }, + { + "command": "gitlens.copyShaToClipboard", + "when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view =~ /gitlens\\.views\\.(file|line)History/", + "group": "7_gitlens_cutcopypaste@97" + }, + { + "command": "gitlens.copyMessageToClipboard", + "when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view =~ /gitlens\\.views\\.(file|line)History/", + "group": "7_gitlens_cutcopypaste@98" + }, { "submenu": "gitlens/commit/copy", "when": "viewItem =~ /gitlens:(branch|commit|remote|repo-folder|repository|stash|tag|file\\b(?=.*?\\b\\+committed\\b))\\b/", @@ -13927,6 +13980,11 @@ "when": "false && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:compare:results(?!:)\\b/", "group": "1_gitlens_secondary_actions@1" }, + { + "command": "gitlens.copyPatchToClipboard", + "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:compare:results(?!:)\\b/", + "group": "7_gitlens_cutcopypaste@97" + }, { "command": "gitlens.createCloudPatch", "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:gk:organization:drafts:enabled && config.gitlens.cloudPatches.enabled && viewItem =~ /gitlens:compare:results(?!:)\\b/", @@ -14325,6 +14383,11 @@ "when": "false && !gitlens:untrusted && !gitlens:hasVirtualFolders && webviewItem =~ /gitlens:(commit|stash)\\b/", "group": "1_gitlens_actions_1@2" }, + { + "command": "gitlens.copyPatchToClipboard", + "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && webviewItem =~ /gitlens:(commit|stash)\\b/", + "group": "7_cutcopypaste@97" + }, { "command": "gitlens.createCloudPatch", "when": "!gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:gk:organization:drafts:enabled && config.gitlens.cloudPatches.enabled && webviewItem =~ /gitlens:(commit|stash)\\b/", diff --git a/src/commands/patches.ts b/src/commands/patches.ts index 93db64e264a01..4a1b764ba90a0 100644 --- a/src/commands/patches.ts +++ b/src/commands/patches.ts @@ -1,7 +1,12 @@ import type { TextEditor } from 'vscode'; -import { window, workspace } from 'vscode'; +import { env, Uri, window, workspace } from 'vscode'; +import type { ScmResource } from '../@types/vscode.git.resources'; +import { ScmResourceGroupType } from '../@types/vscode.git.resources.enums'; import { Commands } from '../constants'; import type { Container } from '../container'; +import { ApplyPatchCommitError, ApplyPatchCommitErrorReason } from '../git/errors'; +import { uncommitted, uncommittedStaged } from '../git/models/constants'; +import type { GitDiff } from '../git/models/diff'; import { isSha, shortenRevision } from '../git/models/reference'; import type { Repository } from '../git/models/repository'; import type { Draft, LocalDraft } from '../gk/models/drafts'; @@ -9,6 +14,7 @@ import { showPatchesView } from '../plus/drafts/actions'; import type { Change, CreateDraft } from '../plus/webviews/patchDetails/protocol'; import { getRepositoryOrShowPicker } from '../quickpicks/repositoryPicker'; import { command } from '../system/command'; +import { map } from '../system/iterable'; import { Logger } from '../system/logger'; import type { CommandContext } from './base'; import { @@ -16,28 +22,75 @@ import { Command, isCommandContextViewNodeHasCommit, isCommandContextViewNodeHasComparison, + isCommandContextViewNodeHasFileCommit, } from './base'; export interface CreatePatchCommandArgs { to?: string; from?: string; repoPath?: string; + uris?: Uri[]; } -@command() -export class CreatePatchCommand extends Command { - constructor(private readonly container: Container) { - super(Commands.CreatePatch); +abstract class CreatePatchCommandBase extends Command { + constructor( + private readonly container: Container, + command: Commands | Commands[], + ) { + super(command); } - protected override preExecute(context: CommandContext, args?: CreatePatchCommandArgs) { + protected override async preExecute(context: CommandContext, args?: CreatePatchCommandArgs) { if (args == null) { - if (context.type === 'viewItem') { + if (context.type === 'scm-states') { + const resourcesByGroup = new Map(); + const uris = new Set(); + + let repo; + for (const resource of context.scmResourceStates as ScmResource[]) { + repo ??= await this.container.git.getOrOpenRepository(resource.resourceUri); + + uris.add(resource.resourceUri.toString()); + + let groupResources = resourcesByGroup.get(resource.resourceGroupType!); + if (groupResources == null) { + groupResources = []; + resourcesByGroup.set(resource.resourceGroupType!, groupResources); + } else { + groupResources.push(resource); + } + } + + args = { + repoPath: repo?.path, + to: + resourcesByGroup.size == 1 && resourcesByGroup.has(ScmResourceGroupType.Index) + ? uncommittedStaged + : uncommitted, + from: 'HEAD', + uris: [...map(uris, u => Uri.parse(u))], + }; + } else if (context.type === 'scm-groups') { + const group = context.scmResourceGroups[0]; + if (!group?.resourceStates?.length) return; + + const repo = await this.container.git.getOrOpenRepository(group.resourceStates[0].resourceUri); + + args = { + repoPath: repo?.path, + to: group.id === 'index' ? uncommittedStaged : uncommitted, + from: 'HEAD', + }; + } else if (context.type === 'viewItem') { if (isCommandContextViewNodeHasCommit(context)) { args = { repoPath: context.node.commit.repoPath, to: context.node.commit.ref, + from: `${context.node.commit.ref}^`, }; + if (isCommandContextViewNodeHasFileCommit(context)) { + args.uris = [context.node.uri]; + } } else if (isCommandContextViewNodeHasComparison(context)) { args = { repoPath: context.node.uri.fsPath, @@ -51,17 +104,33 @@ export class CreatePatchCommand extends Command { return this.execute(args); } - async execute(args?: CreatePatchCommandArgs) { + protected async getDiff(title: string, args?: CreatePatchCommandArgs): Promise { let repo; - if (args?.repoPath == null) { - repo = await getRepositoryOrShowPicker('Create Patch'); - } else { + if (args?.repoPath != null) { repo = this.container.git.getRepository(args.repoPath); } - if (repo == null) return undefined; - if (args?.to == null) return; + repo ??= await getRepositoryOrShowPicker(title); + if (repo == null) return; + + return this.container.git.getDiff( + repo.uri, + args?.to ?? uncommitted, + args?.from ?? 'HEAD', + args?.uris?.length ? { uris: args.uris } : undefined, + ); + } - const diff = await this.container.git.getDiff(repo.uri, args.to ?? 'HEAD', args.from); + abstract override execute(args?: CreatePatchCommandArgs): Promise; +} + +@command() +export class CreatePatchCommand extends CreatePatchCommandBase { + constructor(container: Container) { + super(container, Commands.CreatePatch); + } + + async execute(args?: CreatePatchCommandArgs) { + const diff = await this.getDiff('Create Patch', args); if (diff == null) return; const d = await workspace.openTextDocument({ content: diff.contents, language: 'diff' }); @@ -77,6 +146,68 @@ export class CreatePatchCommand extends Command { } } +@command() +export class CopyPatchToClipboardCommand extends CreatePatchCommandBase { + constructor(container: Container) { + super(container, Commands.CopyPatchToClipboard); + } + + async execute(args?: CreatePatchCommandArgs) { + const diff = await this.getDiff('Copy as Patch', args); + if (diff == null) return; + + await env.clipboard.writeText(diff.contents); + void window.showInformationMessage( + "Copied patch \u2014 use 'Apply Copied Patch' in another window to apply it", + ); + } +} + +@command() +export class ApplyPatchFromClipboardCommand extends Command { + constructor(private readonly container: Container) { + super(Commands.ApplyPatchFromClipboard); + } + + async execute() { + const patch = await env.clipboard.readText(); + let repo = this.container.git.highlander; + + // Make sure it looks like a valid patch + const valid = patch.length ? await this.container.git.validatePatch(repo?.uri ?? Uri.file(''), patch) : false; + if (!valid) { + void window.showWarningMessage('No valid patch found in the clipboard'); + return; + } + + repo ??= await getRepositoryOrShowPicker('Apply Copied Patch'); + if (repo == null) return; + + try { + const commit = await this.container.git.createUnreachableCommitForPatch( + repo.uri, + patch, + 'HEAD', + 'Pasted Patch', + ); + if (commit == null) return; + + await this.container.git.applyUnreachableCommitForPatch(repo.uri, commit.sha); + void window.showInformationMessage(`Patch applied successfully`); + } catch (ex) { + if (ex instanceof ApplyPatchCommitError) { + if (ex.reason === ApplyPatchCommitErrorReason.AppliedWithConflicts) { + void window.showWarningMessage('Patch applied with conflicts'); + } else { + void window.showErrorMessage(ex.message); + } + } else { + void window.showErrorMessage(`Unable apply patch: ${ex.message}`); + } + } + } +} + @command() export class CreateCloudPatchCommand extends Command { constructor(private readonly container: Container) { diff --git a/src/constants.ts b/src/constants.ts index 3f6ec91b9c1d6..0ea56451a0dd4 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -146,6 +146,8 @@ export const enum Commands { CopyRemoteRepositoryUrl = 'gitlens.copyRemoteRepositoryUrl', CopyShaToClipboard = 'gitlens.copyShaToClipboard', CopyRelativePathToClipboard = 'gitlens.copyRelativePathToClipboard', + ApplyPatchFromClipboard = 'gitlens.applyPatchFromClipboard', + CopyPatchToClipboard = 'gitlens.copyPatchToClipboard', CreatePatch = 'gitlens.createPatch', CreateCloudPatch = 'gitlens.createCloudPatch', CreatePullRequestOnRemote = 'gitlens.createPullRequestOnRemote', diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts index 1204c90666c73..7b24b0e462bec 100644 --- a/src/env/node/git/localGitProvider.ts +++ b/src/env/node/git/localGitProvider.ts @@ -16,6 +16,8 @@ import { emojify } from '../../../emojis'; import { Features } from '../../../features'; import { GitErrorHandling } from '../../../git/commandOptions'; import { + ApplyPatchCommitError, + ApplyPatchCommitErrorReason, BlameIgnoreRevsFileBadRevisionError, BlameIgnoreRevsFileError, CherryPickError, @@ -1091,13 +1093,13 @@ export class LocalGitProvider implements GitProvider, Disposable { await this.git.stash__push(repoPath, undefined, { includeUntracked: true }); } catch (ex) { Logger.error(ex, scope); - if (ex instanceof StashPushError) { - void showGenericErrorMessage(`Error applying patch - unable to stash changes: ${ex.message}`); - } else { - void showGenericErrorMessage(`Error applying patch - unable to stash changes`); - } - - return; + throw new ApplyPatchCommitError( + ApplyPatchCommitErrorReason.StashFailed, + `Unable to apply patch; failed stashing working changes changes${ + ex instanceof StashPushError ? `: ${ex.message}` : '' + }`, + ex, + ); } } @@ -1114,8 +1116,10 @@ export class LocalGitProvider implements GitProvider, Disposable { // worktree cannot be opened and we cannot handle issues elegantly. if (options?.createWorktreePath != null) { if (options?.branchName === null || options.branchName === currentBranch?.name) { - void showGenericErrorMessage(`Error applying patch - unable to create worktree`); - return; + throw new ApplyPatchCommitError( + ApplyPatchCommitErrorReason.CreateWorktreeFailed, + 'Unable to apply patch; failed creating worktree', + ); } try { @@ -1125,13 +1129,13 @@ export class LocalGitProvider implements GitProvider, Disposable { }); } catch (ex) { Logger.error(ex, scope); - if (ex instanceof WorktreeCreateError) { - void showGenericErrorMessage(`Error applying patch - unable to create worktree: ${ex.message}`); - } else { - void showGenericErrorMessage(`Error applying patch - unable to create worktree`); - } - - return; + throw new ApplyPatchCommitError( + ApplyPatchCommitErrorReason.CreateWorktreeFailed, + `Unable to apply patch; failed creating worktree${ + ex instanceof WorktreeCreateError ? `: ${ex.message}` : '' + }`, + ex, + ); } const worktree = await this.container.git.getWorktree( @@ -1139,8 +1143,10 @@ export class LocalGitProvider implements GitProvider, Disposable { w => normalizePath(w.uri.fsPath) === normalizePath(options.createWorktreePath!), ); if (worktree == null) { - void showGenericErrorMessage(`Error applying patch - unable to create worktree`); - return; + throw new ApplyPatchCommitError( + ApplyPatchCommitErrorReason.CreateWorktreeFailed, + 'Unable to apply patch; failed creating worktree', + ); } targetPath = worktree.uri.fsPath; @@ -1158,22 +1164,20 @@ export class LocalGitProvider implements GitProvider, Disposable { await this.git.cherrypick(targetPath, ref, { noCommit: true, errors: GitErrorHandling.Throw }); } catch (ex) { Logger.error(ex, scope); - if (ex instanceof CherryPickError) { - if (ex.reason === CherryPickErrorReason.Conflict) { - void showGenericErrorMessage( - `Error applying patch - conflicts detected. Please resolve conflicts.`, - ); - } else { - void showGenericErrorMessage(`Error applying patch - unable to apply patch changes: ${ex.message}`); - } - } else { - void showGenericErrorMessage(`Error applying patch - unable to apply patch changes`); + if (ex instanceof CherryPickError && ex.reason === CherryPickErrorReason.Conflict) { + throw new ApplyPatchCommitError( + ApplyPatchCommitErrorReason.AppliedWithConflicts, + `Patch applied with conflicts`, + ex, + ); } - return; + throw new ApplyPatchCommitError( + ApplyPatchCommitErrorReason.ApplyFailed, + `Unable to apply patch${ex instanceof CherryPickError ? `: ${ex.message}` : ''}`, + ex, + ); } - - void window.showInformationMessage(`Patch applied successfully`); } @log() @@ -3012,7 +3016,7 @@ export class LocalGitProvider implements GitProvider, Disposable { repoPath: string, to: string, from?: string, - options?: { context?: number }, + options?: { context?: number; uris?: Uri[] }, ): Promise { const scope = getLogScope(); const params = [`-U${options?.context ?? 3}`]; @@ -3044,6 +3048,10 @@ export class LocalGitProvider implements GitProvider, Disposable { params.push(from, to); } + if (options?.uris) { + params.push('--', ...options.uris.map(u => u.fsPath)); + } + let data; try { data = await this.git.diff2(repoPath, { errors: GitErrorHandling.Throw }, ...params); @@ -5489,6 +5497,24 @@ export class LocalGitProvider implements GitProvider, Disposable { return this.git.check_ref_format(ref, repoPath); } + @log({ args: { 1: false } }) + async validatePatch(repoPath: string | undefined, contents: string): Promise { + try { + await this.git.apply2(repoPath!, { stdin: contents }, '--check'); + return true; + } catch (ex) { + if (ex instanceof Error && ex.message) { + if (ex.message.includes('No valid patches in input')) { + return false; + } + + return true; + } + + return false; + } + } + @log() async validateReference(repoPath: string, ref: string): Promise { if (ref == null || ref.length === 0) return false; diff --git a/src/git/errors.ts b/src/git/errors.ts index ba9696b87fd31..806c97c855039 100644 --- a/src/git/errors.ts +++ b/src/git/errors.ts @@ -6,6 +6,31 @@ export class GitSearchError extends Error { } } +export const enum ApplyPatchCommitErrorReason { + StashFailed = 1, + CreateWorktreeFailed = 2, + ApplyFailed = 3, + AppliedWithConflicts = 4, +} + +export class ApplyPatchCommitError extends Error { + static is(ex: unknown, reason?: ApplyPatchCommitErrorReason): ex is ApplyPatchCommitError { + return ex instanceof ApplyPatchCommitError && (reason == null || ex.reason === reason); + } + + readonly original?: Error; + readonly reason: ApplyPatchCommitErrorReason | undefined; + + constructor(reason: ApplyPatchCommitErrorReason, message?: string, original?: Error) { + message ||= 'Unable to apply patch'; + super(message); + + this.original = original; + this.reason = reason; + Error.captureStackTrace?.(this, ApplyPatchCommitError); + } +} + export class BlameIgnoreRevsFileError extends Error { static is(ex: unknown): ex is BlameIgnoreRevsFileError { return ex instanceof BlameIgnoreRevsFileError; diff --git a/src/git/gitProvider.ts b/src/git/gitProvider.ts index 2af5634d39803..d9f01394d7411 100644 --- a/src/git/gitProvider.ts +++ b/src/git/gitProvider.ts @@ -292,7 +292,7 @@ export interface GitProvider extends Disposable { repoPath: string | Uri, to: string, from?: string, - options?: { context?: number }, + options?: { context?: number; uris?: Uri[] }, ): Promise; getDiffFiles?(repoPath: string | Uri, contents: string): Promise; /** @@ -488,6 +488,7 @@ export interface GitProvider extends Disposable { ): Promise; validateBranchOrTagName(repoPath: string, ref: string): Promise; + validatePatch?(repoPath: string | undefined, contents: string): Promise; validateReference(repoPath: string, ref: string): Promise; stageFile(repoPath: string, pathOrUri: string | Uri): Promise; diff --git a/src/git/gitProviderService.ts b/src/git/gitProviderService.ts index fd7f75e079700..7c8c522da97ab 100644 --- a/src/git/gitProviderService.ts +++ b/src/git/gitProviderService.ts @@ -1773,7 +1773,7 @@ export class GitProviderService implements Disposable { repoPath: string | Uri, to: string, from?: string, - options?: { context?: number }, + options?: { context?: number; uris?: Uri[] }, ): Promise { const { provider, path } = this.getProvider(repoPath); return provider.getDiff?.(path, to, from, options); @@ -2637,6 +2637,16 @@ export class GitProviderService implements Disposable { return provider.validateBranchOrTagName(path, ref); } + @log({ args: { 1: false }, exit: true }) + async validatePatch(repoPath: string | Uri, contents: string): Promise { + try { + const { provider, path } = this.getProvider(repoPath); + return (await provider.validatePatch?.(path || undefined, contents)) ?? false; + } catch { + return false; + } + } + @log({ exit: true }) async validateReference(repoPath: string | Uri, ref: string): Promise { if (ref == null || ref.length === 0) return false; diff --git a/src/plus/webviews/patchDetails/patchDetailsWebview.ts b/src/plus/webviews/patchDetails/patchDetailsWebview.ts index 84ad6e0ae828d..a209375159771 100644 --- a/src/plus/webviews/patchDetails/patchDetailsWebview.ts +++ b/src/plus/webviews/patchDetails/patchDetailsWebview.ts @@ -6,6 +6,7 @@ import type { ContextKeys } from '../../../constants'; import { Commands, GlyphChars } from '../../../constants'; import type { Container } from '../../../container'; import { openChanges, openChangesWithWorking, openFile } from '../../../git/actions/commit'; +import { ApplyPatchCommitError, ApplyPatchCommitErrorReason } from '../../../git/errors'; import type { RepositoriesChangeEvent } from '../../../git/gitProviderService'; import type { GitCommit } from '../../../git/models/commit'; import { uncommitted, uncommittedStaged } from '../../../git/models/constants'; @@ -445,9 +446,18 @@ export class PatchDetailsWebviewProvider }; } - void this.container.git.applyUnreachableCommitForPatch(commit.repoPath, commit.ref, options); + await this.container.git.applyUnreachableCommitForPatch(commit.repoPath, commit.ref, options); + void window.showInformationMessage(`Patch applied successfully`); } catch (ex) { - void window.showErrorMessage(`Unable apply patch to '${patch.baseRef}': ${ex.message}`); + if (ex instanceof ApplyPatchCommitError) { + if (ex.reason === ApplyPatchCommitErrorReason.AppliedWithConflicts) { + void window.showWarningMessage('Patch applied with conflicts'); + } else { + void window.showErrorMessage(ex.message); + } + } else { + void window.showErrorMessage(`Unable apply patch to '${patch.baseRef}': ${ex.message}`); + } } } } From 5aa561d1720dc41af112096dda798b3e6a5a8d20 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 5 Feb 2024 15:31:45 -0500 Subject: [PATCH 0489/1012] Graduates `openChangesInMultiDiffEditor` to be on by default --- CHANGELOG.md | 9 +++++++- package.json | 62 ++++++++++++++++++++++++++-------------------------- 2 files changed, 39 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30e1d4342c413..c9adc741cee3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,9 +8,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Added +- Adds ability to open multiple changes in VS Code's new multi-diff editor, previously experimental and now enabled by default + - Adds an inline _Open All Changes_ command to commits, stashes, and comparisons in the views + - Changes _Open All Changes_ & _Open All Changes with Working Tree_ commands to use the new multi-diff editor when enabled + - Adds _Open All Changes, Individually_ & _Open All Changes with Working Tree, Individually_ commands to provide access to the previous behavior + - Adds a `gitlens.views.openChangesInMultiDiffEditor` setting, which is enabled by default, to specify whether to open changes in the multi-diff editor (single tab) or in individual diff editors (multiple tabs) + - Requires VS Code `1.86` or later, or VS Code `1.85` with `multiDiffEditor.experimental.enabled` enabled - Adds new comparison features to pull requests in GitLens views - Adds an _Open Pull Request Changes_ context menu command on pull requests in the _Commit Graph_ and other GitLens views to view pull request changes in a multi-diff editor (single tab) - - Requires VS Code `1.85` or later with `multiDiffEditor.experimental.enabled` and `gitlens.experimental.openChangesInMultiDiffEditor` to be enabled + - Requires VS Code `1.86` or later, or VS Code `1.85` with `multiDiffEditor.experimental.enabled` enabled - Adds a _Compare Pull Request_ context menu command on pull requests in the _Commit Graph_ and other GitLens views to open a comparison between the head and base of the pull request for easy reviewing - Adds an _Open in Commit Graph_ context menu command on pull requests in GitLens view to open the tip commit in the _Commit Graph_ - Adds ability to copy changes, commits, stashes, and comparison as a patch to the clipboard @@ -27,6 +33,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Moves the pull request to be first item in the _Commits_ view, when applicable - Moves the branch comparison to be below the branch status in the _Commits_ view to keep top focus on the status over the comparison +- Renames the `gitlens.experimental.openChangesInMultiDiffEditor` setting to `gitlens.views.openChangesInMultiDiffEditor` as it is no longer experimental and enabled by default ### Fixed diff --git a/package.json b/package.json index 036881a72a3a4..c9d985412d52f 100644 --- a/package.json +++ b/package.json @@ -655,10 +655,10 @@ "scope": "window", "order": 51 }, - "gitlens.views.experimental.multiSelect.enabled": { + "gitlens.views.openChangesInMultiDiffEditor": { "type": "boolean", - "default": false, - "markdownDescription": "Specifies whether to enable experimental multi-select support in the views.\n**NOTE**: Requires a restart to take effect.", + "default": true, + "markdownDescription": "Specifies whether to open multiple changes in VS Code's experimental multi-diff editor (single tab) or in individual diff editors (multiple tabs)", "scope": "window", "order": 60 }, @@ -2718,21 +2718,6 @@ "markdownDescription": "Specifies whether to enable the preview of _Cloud Patches_, which allow you to easily and securely share code with your teammates or other developers", "scope": "window", "order": 10 - }, - "gitlens.cloudPatches.experimental.layout": { - "type": "string", - "default": "view", - "enum": [ - "editor", - "view" - ], - "enumDescriptions": [ - "Prefer showing Cloud Patches in the editor area", - "Prefer showing Cloud Patches in a view" - ], - "markdownDescription": "Specifies the preferred layout of for _Cloud Patches_ (experimental)", - "scope": "window", - "order": 11 } } }, @@ -4056,19 +4041,34 @@ "title": "Experimental", "order": 9500, "properties": { - "gitlens.experimental.openChangesInMultiDiffEditor": { + "gitlens.experimental.allowAnnotationsWhenDirty": { "type": "boolean", "default": false, - "markdownDescription": "(Experimental) Specifies whether to open multiple changes in VS Code's experimental multi-diff editor (single tab) or in individual diff editors (multiple tabs)", + "markdownDescription": "(Experimental) Specifies whether file annotations are allowed on files with unsaved changes (dirty). Use `#gitlens.advanced.blame.delayAfterEdit#` to control how long to wait before the annotation will update while the file is still dirty", "scope": "window", "order": 10 }, - "gitlens.experimental.allowAnnotationsWhenDirty": { + "gitlens.cloudPatches.experimental.layout": { + "type": "string", + "default": "view", + "enum": [ + "editor", + "view" + ], + "enumDescriptions": [ + "Prefer showing Cloud Patches in the editor area", + "Prefer showing Cloud Patches in a view" + ], + "markdownDescription": "(Experimental) Specifies the preferred layout of for _Cloud Patches_", + "scope": "window", + "order": 20 + }, + "gitlens.views.experimental.multiSelect.enabled": { "type": "boolean", "default": false, - "markdownDescription": "(Experimental) Specifies whether file annotations are allowed on files with unsaved changes (dirty). Use `#gitlens.advanced.blame.delayAfterEdit#` to control how long to wait before the annotation will update while the file is still dirty", + "markdownDescription": "(Experimental) Specifies whether to enable experimental multi-select support in the views.\n**NOTE**: Requires a restart to take effect.", "scope": "window", - "order": 20 + "order": 30 } } }, @@ -13077,7 +13077,7 @@ }, { "command": "gitlens.views.openChangedFileDiffs", - "when": "viewItem =~ /gitlens:(compare:results(?!:)\\b(?!.*?\\b\\+filtered\\b)|commit|stash|results:files|status-branch:files|status:upstream:(ahead|behind))\\b/ && config.gitlens.experimental.openChangesInMultiDiffEditor", + "when": "viewItem =~ /gitlens:(compare:results(?!:)\\b(?!.*?\\b\\+filtered\\b)|commit|stash|results:files|status-branch:files|status:upstream:(ahead|behind))\\b/ && config.gitlens.views.openChangesInMultiDiffEditor && config.multiDiffEditor.experimental.enabled", "group": "inline@90", "alt": "gitlens.views.openChangedFileDiffsWithWorking" }, @@ -13354,7 +13354,7 @@ }, { "command": "gitlens.views.openPullRequestChanges", - "when": "config.gitlens.experimental.openChangesInMultiDiffEditor && viewItem =~ /gitlens:pullrequest\\b(?=.*?\\b\\+refs\\b)/", + "when": "viewItem =~ /gitlens:pullrequest\\b(?=.*?\\b\\+refs\\b)/ && config.multiDiffEditor.experimental.enabled", "group": "inline@2" }, { @@ -13370,7 +13370,7 @@ }, { "command": "gitlens.views.openPullRequestChanges", - "when": "config.gitlens.experimental.openChangesInMultiDiffEditor && viewItem =~ /gitlens:pullrequest\\b(?=.*?\\b\\+refs\\b)/", + "when": "viewItem =~ /gitlens:pullrequest\\b(?=.*?\\b\\+refs\\b)/ && config.multiDiffEditor.experimental.enabled", "group": "1_gitlens_actions@1" }, { @@ -14476,7 +14476,7 @@ }, { "command": "gitlens.graph.openPullRequestChanges", - "when": "config.gitlens.experimental.openChangesInMultiDiffEditor && webviewItem =~ /gitlens:pullrequest\\b(?=.*?\\b\\+refs\\b)/", + "when": "webviewItem =~ /gitlens:pullrequest\\b(?=.*?\\b\\+refs\\b)/ && config.multiDiffEditor.experimental.enabled", "group": "1_gitlens_actions@1" }, { @@ -14789,7 +14789,7 @@ }, { "command": "gitlens.views.openChangedFileDiffsIndividually", - "when": "config.gitlens.experimental.openChangesInMultiDiffEditor", + "when": "config.gitlens.views.openChangesInMultiDiffEditor && config.multiDiffEditor.experimental.enabled", "group": "1_gitlens@2" }, { @@ -14798,7 +14798,7 @@ }, { "command": "gitlens.views.openChangedFileDiffsWithWorkingIndividually", - "when": "config.gitlens.experimental.openChangesInMultiDiffEditor", + "when": "config.gitlens.views.openChangesInMultiDiffEditor && config.multiDiffEditor.experimental.enabled", "group": "1_gitlens@4" }, { @@ -14821,7 +14821,7 @@ }, { "command": "gitlens.graph.openChangedFileDiffsIndividually", - "when": "config.gitlens.experimental.openChangesInMultiDiffEditor", + "when": "config.gitlens.views.openChangesInMultiDiffEditor && config.multiDiffEditor.experimental.enabled", "group": "1_gitlens@2" }, { @@ -14831,7 +14831,7 @@ }, { "command": "gitlens.graph.openChangedFileDiffsWithWorkingIndividually", - "when": "config.gitlens.experimental.openChangesInMultiDiffEditor", + "when": "config.gitlens.views.openChangesInMultiDiffEditor && config.multiDiffEditor.experimental.enabled", "group": "1_gitlens@4" }, { From 0501679d3ea9f63b8ccacb35ebceaeb8ab763aaf Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 5 Feb 2024 15:42:42 -0500 Subject: [PATCH 0490/1012] Fixes missing rename --- src/config.ts | 2 +- src/git/actions/commit.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config.ts b/src/config.ts index 34e2c45599783..4fb49f11e38a6 100644 --- a/src/config.ts +++ b/src/config.ts @@ -77,7 +77,6 @@ export interface Config { readonly experimental: { readonly allowAnnotationsWhenDirty: boolean; readonly generateCommitMessagePrompt: string; - readonly openChangesInMultiDiffEditor: boolean; }; readonly fileAnnotations: { readonly command: string | null; @@ -569,6 +568,7 @@ export interface ViewsCommonConfig { readonly description: string; }; }; + readonly openChangesInMultiDiffEditor: boolean; readonly pageItemLimit: number; readonly showRelativeDateMarkers: boolean; diff --git a/src/git/actions/commit.ts b/src/git/actions/commit.ts index 4c076b7b321b4..1d1042f9e499e 100644 --- a/src/git/actions/commit.ts +++ b/src/git/actions/commit.ts @@ -117,13 +117,13 @@ export async function openAllChanges( maybeOptions?: TextDocumentShowOptions & { title?: string }, ): Promise { if (isCommit(commitOrFiles)) { - if (configuration.get('experimental.openChangesInMultiDiffEditor')) { + if (configuration.get('views.openChangesInMultiDiffEditor')) { return openAllChangesInChangesEditor(commitOrFiles, refsOrOptions as TextDocumentShowOptions | undefined); } return openAllChangesIndividually(commitOrFiles, refsOrOptions as TextDocumentShowOptions | undefined); } - if (configuration.get('experimental.openChangesInMultiDiffEditor')) { + if (configuration.get('views.openChangesInMultiDiffEditor')) { return openAllChangesInChangesEditor(commitOrFiles, refsOrOptions as RefRange, maybeOptions); } return openAllChangesIndividually(commitOrFiles, refsOrOptions as RefRange, maybeOptions); @@ -263,7 +263,7 @@ export async function openAllChangesWithWorking( maybeOptions?: TextDocumentShowOptions & { title?: string }, ) { if (isCommit(commitOrFiles)) { - if (configuration.get('experimental.openChangesInMultiDiffEditor')) { + if (configuration.get('views.openChangesInMultiDiffEditor')) { return openAllChangesInChangesEditor(commitOrFiles, refOrOptions as TextDocumentShowOptions | undefined); } return openAllChangesWithWorkingIndividually( @@ -272,7 +272,7 @@ export async function openAllChangesWithWorking( ); } - if (configuration.get('experimental.openChangesInMultiDiffEditor')) { + if (configuration.get('views.openChangesInMultiDiffEditor')) { return openAllChangesInChangesEditor( commitOrFiles, { From 0c59a640ed0870a770f008f7343d99ad4940c393 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 5 Feb 2024 21:46:12 -0500 Subject: [PATCH 0491/1012] Fixes focus issues on Settings UI --- src/webviews/apps/settings/partials/autolinks.html | 2 +- src/webviews/apps/settings/partials/blame.html | 2 +- src/webviews/apps/settings/partials/changes.html | 2 +- src/webviews/apps/settings/partials/code-lens.html | 2 +- src/webviews/apps/settings/partials/commit-graph.html | 2 +- src/webviews/apps/settings/partials/current-line.html | 2 +- src/webviews/apps/settings/partials/dates.html | 2 +- src/webviews/apps/settings/partials/heatmap.html | 2 +- src/webviews/apps/settings/partials/hovers.html | 2 +- src/webviews/apps/settings/partials/menus.html | 2 +- src/webviews/apps/settings/partials/modes.html | 2 +- src/webviews/apps/settings/partials/rebase-editor.html | 2 +- src/webviews/apps/settings/partials/shortcuts.html | 2 +- src/webviews/apps/settings/partials/sorting.html | 2 +- src/webviews/apps/settings/partials/status-bar.html | 2 +- src/webviews/apps/settings/partials/terminal-links.html | 2 +- src/webviews/apps/settings/partials/views.branches.html | 2 +- .../apps/settings/partials/views.commitDetails.html | 2 +- src/webviews/apps/settings/partials/views.commits.html | 2 +- .../apps/settings/partials/views.contributors.html | 2 +- .../apps/settings/partials/views.file-history.html | 2 +- .../apps/settings/partials/views.line-history.html | 2 +- src/webviews/apps/settings/partials/views.remotes.html | 2 +- .../apps/settings/partials/views.repositories.html | 2 +- .../apps/settings/partials/views.searchAndCompare.html | 2 +- src/webviews/apps/settings/partials/views.stashes.html | 2 +- src/webviews/apps/settings/partials/views.tags.html | 2 +- src/webviews/apps/settings/partials/views.worktrees.html | 2 +- src/webviews/apps/settings/settings.ts | 7 ++++++- 29 files changed, 34 insertions(+), 29 deletions(-) diff --git a/src/webviews/apps/settings/partials/autolinks.html b/src/webviews/apps/settings/partials/autolinks.html index 7c3a99fb24290..e4c3c12a71df1 100644 --- a/src/webviews/apps/settings/partials/autolinks.html +++ b/src/webviews/apps/settings/partials/autolinks.html @@ -1,4 +1,4 @@ -
+

Autolinks

diff --git a/src/webviews/apps/settings/partials/blame.html b/src/webviews/apps/settings/partials/blame.html index 17b98618827a3..39ae2685f0161 100644 --- a/src/webviews/apps/settings/partials/blame.html +++ b/src/webviews/apps/settings/partials/blame.html @@ -1,4 +1,4 @@ -

+

File Blame diff --git a/src/webviews/apps/settings/partials/changes.html b/src/webviews/apps/settings/partials/changes.html index 7db518445e101..3d9b2d8543f32 100644 --- a/src/webviews/apps/settings/partials/changes.html +++ b/src/webviews/apps/settings/partials/changes.html @@ -1,4 +1,4 @@ -
+

File Changes diff --git a/src/webviews/apps/settings/partials/code-lens.html b/src/webviews/apps/settings/partials/code-lens.html index ab405fe92d498..2ba2ec80bb0b6 100644 --- a/src/webviews/apps/settings/partials/code-lens.html +++ b/src/webviews/apps/settings/partials/code-lens.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/webviews/apps/settings/partials/commit-graph.html b/src/webviews/apps/settings/partials/commit-graph.html index e62ba000ab7e1..c5b1b0784b326 100644 --- a/src/webviews/apps/settings/partials/commit-graph.html +++ b/src/webviews/apps/settings/partials/commit-graph.html @@ -1,4 +1,4 @@ -
+

Commit Graph ✨ diff --git a/src/webviews/apps/settings/partials/current-line.html b/src/webviews/apps/settings/partials/current-line.html index c8bab22196353..d9769b033bae8 100644 --- a/src/webviews/apps/settings/partials/current-line.html +++ b/src/webviews/apps/settings/partials/current-line.html @@ -1,4 +1,4 @@ -
+
+

Dates & Times

diff --git a/src/webviews/apps/settings/partials/heatmap.html b/src/webviews/apps/settings/partials/heatmap.html index 56b6e77f63b31..3272e108a92c8 100644 --- a/src/webviews/apps/settings/partials/heatmap.html +++ b/src/webviews/apps/settings/partials/heatmap.html @@ -1,4 +1,4 @@ -
+

File Heatmap diff --git a/src/webviews/apps/settings/partials/hovers.html b/src/webviews/apps/settings/partials/hovers.html index 927919f59602a..a100c79f942b5 100644 --- a/src/webviews/apps/settings/partials/hovers.html +++ b/src/webviews/apps/settings/partials/hovers.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/webviews/apps/settings/partials/menus.html b/src/webviews/apps/settings/partials/menus.html index a7c385ee1d373..e26db70d9a968 100644 --- a/src/webviews/apps/settings/partials/menus.html +++ b/src/webviews/apps/settings/partials/menus.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/webviews/apps/settings/partials/modes.html b/src/webviews/apps/settings/partials/modes.html index 5d070be1d6c2c..ffe593252163e 100644 --- a/src/webviews/apps/settings/partials/modes.html +++ b/src/webviews/apps/settings/partials/modes.html @@ -1,4 +1,4 @@ -
+

Modes diff --git a/src/webviews/apps/settings/partials/rebase-editor.html b/src/webviews/apps/settings/partials/rebase-editor.html index 1644859396982..5d10a79ddedd7 100644 --- a/src/webviews/apps/settings/partials/rebase-editor.html +++ b/src/webviews/apps/settings/partials/rebase-editor.html @@ -1,4 +1,4 @@ -
+
+

Keyboard Shortcuts

diff --git a/src/webviews/apps/settings/partials/sorting.html b/src/webviews/apps/settings/partials/sorting.html index dd7930c0ba689..be70fbb6262fc 100644 --- a/src/webviews/apps/settings/partials/sorting.html +++ b/src/webviews/apps/settings/partials/sorting.html @@ -1,4 +1,4 @@ -
+

Sorting

diff --git a/src/webviews/apps/settings/partials/status-bar.html b/src/webviews/apps/settings/partials/status-bar.html index 93cbc3f2a8d76..c1eb759a287dc 100644 --- a/src/webviews/apps/settings/partials/status-bar.html +++ b/src/webviews/apps/settings/partials/status-bar.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/webviews/apps/settings/partials/terminal-links.html b/src/webviews/apps/settings/partials/terminal-links.html index 96e72d7bc6bef..90f2a2194c01e 100644 --- a/src/webviews/apps/settings/partials/terminal-links.html +++ b/src/webviews/apps/settings/partials/terminal-links.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/webviews/apps/settings/partials/views.branches.html b/src/webviews/apps/settings/partials/views.branches.html index 12415ab2f5d7c..04e6a38ae55cc 100644 --- a/src/webviews/apps/settings/partials/views.branches.html +++ b/src/webviews/apps/settings/partials/views.branches.html @@ -1,4 +1,4 @@ -
+

Branches view diff --git a/src/webviews/apps/settings/partials/views.commitDetails.html b/src/webviews/apps/settings/partials/views.commitDetails.html index 386913c507eec..37b236dbcb6d7 100644 --- a/src/webviews/apps/settings/partials/views.commitDetails.html +++ b/src/webviews/apps/settings/partials/views.commitDetails.html @@ -1,4 +1,4 @@ -
+

Commit Details view diff --git a/src/webviews/apps/settings/partials/views.commits.html b/src/webviews/apps/settings/partials/views.commits.html index e0cd039c4ae9c..f0c685ae46cb3 100644 --- a/src/webviews/apps/settings/partials/views.commits.html +++ b/src/webviews/apps/settings/partials/views.commits.html @@ -1,4 +1,4 @@ -
+

Commits view diff --git a/src/webviews/apps/settings/partials/views.contributors.html b/src/webviews/apps/settings/partials/views.contributors.html index 6cb658a3b9594..b1c553a300b3a 100644 --- a/src/webviews/apps/settings/partials/views.contributors.html +++ b/src/webviews/apps/settings/partials/views.contributors.html @@ -1,4 +1,4 @@ -
+

Contributors view diff --git a/src/webviews/apps/settings/partials/views.file-history.html b/src/webviews/apps/settings/partials/views.file-history.html index e8c5583d44d74..4bd5ce217b106 100644 --- a/src/webviews/apps/settings/partials/views.file-history.html +++ b/src/webviews/apps/settings/partials/views.file-history.html @@ -1,4 +1,4 @@ -
+

File History view diff --git a/src/webviews/apps/settings/partials/views.line-history.html b/src/webviews/apps/settings/partials/views.line-history.html index 58869b452dbe4..c94c9cad84f7b 100644 --- a/src/webviews/apps/settings/partials/views.line-history.html +++ b/src/webviews/apps/settings/partials/views.line-history.html @@ -1,4 +1,4 @@ -
+

Line History view diff --git a/src/webviews/apps/settings/partials/views.remotes.html b/src/webviews/apps/settings/partials/views.remotes.html index df21e60da5cd3..77d41fd348a53 100644 --- a/src/webviews/apps/settings/partials/views.remotes.html +++ b/src/webviews/apps/settings/partials/views.remotes.html @@ -1,4 +1,4 @@ -
+

Remotes view diff --git a/src/webviews/apps/settings/partials/views.repositories.html b/src/webviews/apps/settings/partials/views.repositories.html index c288718242e6e..87e9efb0b266c 100644 --- a/src/webviews/apps/settings/partials/views.repositories.html +++ b/src/webviews/apps/settings/partials/views.repositories.html @@ -1,4 +1,4 @@ -
+

Repositories view diff --git a/src/webviews/apps/settings/partials/views.searchAndCompare.html b/src/webviews/apps/settings/partials/views.searchAndCompare.html index cc59bc9e44e82..5504198cd0587 100644 --- a/src/webviews/apps/settings/partials/views.searchAndCompare.html +++ b/src/webviews/apps/settings/partials/views.searchAndCompare.html @@ -1,4 +1,4 @@ -
+

Search & Compare view diff --git a/src/webviews/apps/settings/partials/views.stashes.html b/src/webviews/apps/settings/partials/views.stashes.html index 585ee114843f2..e5e18085fa8a0 100644 --- a/src/webviews/apps/settings/partials/views.stashes.html +++ b/src/webviews/apps/settings/partials/views.stashes.html @@ -1,4 +1,4 @@ -
+

Stashes view diff --git a/src/webviews/apps/settings/partials/views.tags.html b/src/webviews/apps/settings/partials/views.tags.html index 4f0cff192c7fe..c8dd864181fc1 100644 --- a/src/webviews/apps/settings/partials/views.tags.html +++ b/src/webviews/apps/settings/partials/views.tags.html @@ -1,4 +1,4 @@ -
+

Tags view diff --git a/src/webviews/apps/settings/partials/views.worktrees.html b/src/webviews/apps/settings/partials/views.worktrees.html index e1ef35aa47249..90fa184d070ed 100644 --- a/src/webviews/apps/settings/partials/views.worktrees.html +++ b/src/webviews/apps/settings/partials/views.worktrees.html @@ -1,4 +1,4 @@ -
+

Worktrees view ✨ diff --git a/src/webviews/apps/settings/settings.ts b/src/webviews/apps/settings/settings.ts index 2fae79ca789ee..733109a6383d9 100644 --- a/src/webviews/apps/settings/settings.ts +++ b/src/webviews/apps/settings/settings.ts @@ -117,6 +117,7 @@ export class SettingsApp extends App { this.onSettingExpanderCicked(target, e), ), DOM.on('a[data-action="jump"]', 'mousedown', e => { + e.target?.focus(); e.stopPropagation(); e.preventDefault(); }), @@ -124,6 +125,7 @@ export class SettingsApp extends App { this.onJumpToLinkClicked(target, e), ), DOM.on('[data-action]', 'mousedown', e => { + e.target?.focus(); e.stopPropagation(); e.preventDefault(); }), @@ -434,7 +436,10 @@ export class SettingsApp extends App { const newTop = el.getBoundingClientRect().top - document.body.getBoundingClientRect().top - (offset ?? 0); - if (Math.abs(top - newTop) < 2) return; + if (Math.abs(top - newTop) < 2) { + el.focus({ preventScroll: true }); + return; + } this.scrollTo(el, behavior, offset); }, 50); From 1547235bf052f10dc4a3c68d6f494fee8e12a206 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 5 Feb 2024 22:37:05 -0500 Subject: [PATCH 0492/1012] Fixes Settings UI secondary links and styles --- src/webviews/apps/settings/partials/autolinks.html | 8 ++++---- src/webviews/apps/settings/partials/blame.html | 8 ++++---- src/webviews/apps/settings/partials/changes.html | 8 ++++---- src/webviews/apps/settings/partials/code-lens.html | 8 ++++---- .../apps/settings/partials/commit-graph.html | 13 +++++++++++++ .../apps/settings/partials/current-line.html | 8 ++++---- src/webviews/apps/settings/partials/dates.html | 8 ++++---- src/webviews/apps/settings/partials/heatmap.html | 8 ++++---- src/webviews/apps/settings/partials/hovers.html | 8 ++++---- src/webviews/apps/settings/partials/menus.html | 8 ++++---- src/webviews/apps/settings/partials/modes.html | 8 ++++---- src/webviews/apps/settings/partials/status-bar.html | 8 ++++---- .../apps/settings/partials/views.branches.html | 8 ++++---- .../apps/settings/partials/views.commitDetails.html | 8 ++++---- .../apps/settings/partials/views.commits.html | 8 ++++---- .../apps/settings/partials/views.contributors.html | 8 ++++---- .../apps/settings/partials/views.file-history.html | 8 ++++---- .../apps/settings/partials/views.line-history.html | 8 ++++---- .../apps/settings/partials/views.remotes.html | 8 ++++---- .../apps/settings/partials/views.repositories.html | 8 ++++---- .../settings/partials/views.searchAndCompare.html | 8 ++++---- .../apps/settings/partials/views.stashes.html | 8 ++++---- src/webviews/apps/settings/partials/views.tags.html | 8 ++++---- .../apps/settings/partials/views.worktrees.html | 8 ++++---- src/webviews/apps/settings/settings.html | 7 +++++-- src/webviews/apps/settings/settings.scss | 13 +++++++++++++ src/webviews/apps/shared/base.scss | 3 +-- 27 files changed, 124 insertions(+), 96 deletions(-) diff --git a/src/webviews/apps/settings/partials/autolinks.html b/src/webviews/apps/settings/partials/autolinks.html index e4c3c12a71df1..710f279cc37f0 100644 --- a/src/webviews/apps/settings/partials/autolinks.html +++ b/src/webviews/apps/settings/partials/autolinks.html @@ -36,12 +36,12 @@

Autolinks

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.autolinks

diff --git a/src/webviews/apps/settings/partials/blame.html b/src/webviews/apps/settings/partials/blame.html index 39ae2685f0161..1c67d783629fb 100644 --- a/src/webviews/apps/settings/partials/blame.html +++ b/src/webviews/apps/settings/partials/blame.html @@ -251,12 +251,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.blame

diff --git a/src/webviews/apps/settings/partials/changes.html b/src/webviews/apps/settings/partials/changes.html index 3d9b2d8543f32..d54d81c846bb9 100644 --- a/src/webviews/apps/settings/partials/changes.html +++ b/src/webviews/apps/settings/partials/changes.html @@ -127,12 +127,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.changes

diff --git a/src/webviews/apps/settings/partials/code-lens.html b/src/webviews/apps/settings/partials/code-lens.html index 2ba2ec80bb0b6..11db257966d17 100644 --- a/src/webviews/apps/settings/partials/code-lens.html +++ b/src/webviews/apps/settings/partials/code-lens.html @@ -340,12 +340,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.codeLens

diff --git a/src/webviews/apps/settings/partials/commit-graph.html b/src/webviews/apps/settings/partials/commit-graph.html index c5b1b0784b326..8756cb51af4df 100644 --- a/src/webviews/apps/settings/partials/commit-graph.html +++ b/src/webviews/apps/settings/partials/commit-graph.html @@ -285,5 +285,18 @@

/>

+ +
+

+ For more options, open the + Settings UI + and search for gitlens.graph +

+

diff --git a/src/webviews/apps/settings/partials/current-line.html b/src/webviews/apps/settings/partials/current-line.html index d9769b033bae8..4b9f42b9d87b9 100644 --- a/src/webviews/apps/settings/partials/current-line.html +++ b/src/webviews/apps/settings/partials/current-line.html @@ -209,12 +209,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.currentLine

diff --git a/src/webviews/apps/settings/partials/dates.html b/src/webviews/apps/settings/partials/dates.html index 182cea2acf1f6..b4fec993fd495 100644 --- a/src/webviews/apps/settings/partials/dates.html +++ b/src/webviews/apps/settings/partials/dates.html @@ -161,12 +161,12 @@

Dates & Times

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.default

diff --git a/src/webviews/apps/settings/partials/heatmap.html b/src/webviews/apps/settings/partials/heatmap.html index 3272e108a92c8..3c4497b912880 100644 --- a/src/webviews/apps/settings/partials/heatmap.html +++ b/src/webviews/apps/settings/partials/heatmap.html @@ -154,12 +154,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.heatmap

diff --git a/src/webviews/apps/settings/partials/hovers.html b/src/webviews/apps/settings/partials/hovers.html index a100c79f942b5..688d20c245ae8 100644 --- a/src/webviews/apps/settings/partials/hovers.html +++ b/src/webviews/apps/settings/partials/hovers.html @@ -399,12 +399,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.hovers

diff --git a/src/webviews/apps/settings/partials/menus.html b/src/webviews/apps/settings/partials/menus.html index e26db70d9a968..dbd006c269bd6 100644 --- a/src/webviews/apps/settings/partials/menus.html +++ b/src/webviews/apps/settings/partials/menus.html @@ -759,12 +759,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.menus

diff --git a/src/webviews/apps/settings/partials/modes.html b/src/webviews/apps/settings/partials/modes.html index ffe593252163e..1c593c8d0b8f6 100644 --- a/src/webviews/apps/settings/partials/modes.html +++ b/src/webviews/apps/settings/partials/modes.html @@ -97,12 +97,12 @@

- For more options or to add your own custom modes, open + For more options or to add your own custom modes, open the SettingsSettings UI and search for gitlens.modes

diff --git a/src/webviews/apps/settings/partials/status-bar.html b/src/webviews/apps/settings/partials/status-bar.html index c1eb759a287dc..0af0dab8476f8 100644 --- a/src/webviews/apps/settings/partials/status-bar.html +++ b/src/webviews/apps/settings/partials/status-bar.html @@ -195,12 +195,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.statusBar

diff --git a/src/webviews/apps/settings/partials/views.branches.html b/src/webviews/apps/settings/partials/views.branches.html index 04e6a38ae55cc..e0be980958ad4 100644 --- a/src/webviews/apps/settings/partials/views.branches.html +++ b/src/webviews/apps/settings/partials/views.branches.html @@ -223,12 +223,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.views.branches or gitlens.views diff --git a/src/webviews/apps/settings/partials/views.commitDetails.html b/src/webviews/apps/settings/partials/views.commitDetails.html index 37b236dbcb6d7..ddc0283c59b9f 100644 --- a/src/webviews/apps/settings/partials/views.commitDetails.html +++ b/src/webviews/apps/settings/partials/views.commitDetails.html @@ -145,12 +145,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.views.commitDetails or gitlens.views diff --git a/src/webviews/apps/settings/partials/views.commits.html b/src/webviews/apps/settings/partials/views.commits.html index f0c685ae46cb3..bef95b567636e 100644 --- a/src/webviews/apps/settings/partials/views.commits.html +++ b/src/webviews/apps/settings/partials/views.commits.html @@ -384,12 +384,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.views.commits or gitlens.views diff --git a/src/webviews/apps/settings/partials/views.contributors.html b/src/webviews/apps/settings/partials/views.contributors.html index b1c553a300b3a..3e6a5b8e9b0d2 100644 --- a/src/webviews/apps/settings/partials/views.contributors.html +++ b/src/webviews/apps/settings/partials/views.contributors.html @@ -154,12 +154,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.views.contributors or gitlens.views diff --git a/src/webviews/apps/settings/partials/views.file-history.html b/src/webviews/apps/settings/partials/views.file-history.html index 4bd5ce217b106..e05448e994cd6 100644 --- a/src/webviews/apps/settings/partials/views.file-history.html +++ b/src/webviews/apps/settings/partials/views.file-history.html @@ -162,12 +162,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.views.fileHistory or gitlens.views diff --git a/src/webviews/apps/settings/partials/views.line-history.html b/src/webviews/apps/settings/partials/views.line-history.html index c94c9cad84f7b..c04588da02862 100644 --- a/src/webviews/apps/settings/partials/views.line-history.html +++ b/src/webviews/apps/settings/partials/views.line-history.html @@ -62,12 +62,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.views.lineHistory or gitlens.views diff --git a/src/webviews/apps/settings/partials/views.remotes.html b/src/webviews/apps/settings/partials/views.remotes.html index 77d41fd348a53..35d04d493d7a8 100644 --- a/src/webviews/apps/settings/partials/views.remotes.html +++ b/src/webviews/apps/settings/partials/views.remotes.html @@ -180,12 +180,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.views.remotes or gitlens.views diff --git a/src/webviews/apps/settings/partials/views.repositories.html b/src/webviews/apps/settings/partials/views.repositories.html index 87e9efb0b266c..baa500f95ccc5 100644 --- a/src/webviews/apps/settings/partials/views.repositories.html +++ b/src/webviews/apps/settings/partials/views.repositories.html @@ -346,12 +346,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.views.repositories or gitlens.views diff --git a/src/webviews/apps/settings/partials/views.searchAndCompare.html b/src/webviews/apps/settings/partials/views.searchAndCompare.html index 5504198cd0587..5574ae12d5f11 100644 --- a/src/webviews/apps/settings/partials/views.searchAndCompare.html +++ b/src/webviews/apps/settings/partials/views.searchAndCompare.html @@ -141,12 +141,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.views.searchAndCompare or gitlens.views

diff --git a/src/webviews/apps/settings/partials/views.stashes.html b/src/webviews/apps/settings/partials/views.stashes.html index e5e18085fa8a0..fcc49baa2c5f3 100644 --- a/src/webviews/apps/settings/partials/views.stashes.html +++ b/src/webviews/apps/settings/partials/views.stashes.html @@ -145,12 +145,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.views.stashes or gitlens.views diff --git a/src/webviews/apps/settings/partials/views.tags.html b/src/webviews/apps/settings/partials/views.tags.html index c8dd864181fc1..7c7553a011e2a 100644 --- a/src/webviews/apps/settings/partials/views.tags.html +++ b/src/webviews/apps/settings/partials/views.tags.html @@ -108,12 +108,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.views.tags or gitlens.views diff --git a/src/webviews/apps/settings/partials/views.worktrees.html b/src/webviews/apps/settings/partials/views.worktrees.html index 90fa184d070ed..e27b0c03e8a0e 100644 --- a/src/webviews/apps/settings/partials/views.worktrees.html +++ b/src/webviews/apps/settings/partials/views.worktrees.html @@ -236,12 +236,12 @@

- For more options, open + For more options, open the SettingsSettings UI and search for gitlens.views.worktrees or gitlens.views diff --git a/src/webviews/apps/settings/settings.html b/src/webviews/apps/settings/settings.html index ef25aaece12ed..7c573e10fcbd9 100644 --- a/src/webviews/apps/settings/settings.html +++ b/src/webviews/apps/settings/settings.html @@ -64,11 +64,14 @@

Settings

For advanced customizations, refer to the - GitLens docs and edit your - User Settings

diff --git a/src/webviews/apps/settings/settings.scss b/src/webviews/apps/settings/settings.scss index 103dd8a1e3228..3540c00fda87e 100644 --- a/src/webviews/apps/settings/settings.scss +++ b/src/webviews/apps/settings/settings.scss @@ -58,6 +58,15 @@ header { } } +a.secondary { + color: var(--color-foreground--75); + font-weight: 400; + + &:hover { + color: var(--color-foreground); + } +} + .blurb { font-size: 1.5rem; font-weight: 200; @@ -476,6 +485,10 @@ section { color: var(--color-foreground--75); font-weight: 200; margin: 0; + + b { + font-weight: 400; + } } .section__preview { diff --git a/src/webviews/apps/shared/base.scss b/src/webviews/apps/shared/base.scss index be9c56881dc18..e575c8bb345e2 100644 --- a/src/webviews/apps/shared/base.scss +++ b/src/webviews/apps/shared/base.scss @@ -292,6 +292,5 @@ code { background: rgba(255, 255, 255, 0.05); color: var(--color-foreground--75); border-radius: 3px; - padding: 2px 4px; - vertical-align: middle; + padding: 0px 4px 2px 4px; } From 483fed27ebe843dc358139c26dab9485ee02596d Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 5 Feb 2024 22:37:20 -0500 Subject: [PATCH 0493/1012] Adds File Annotations section to Settings UI Renames `experimental.allowAnnotationsWhenDirty` to `fileAnnotations.preserveWhileEditing` --- CHANGELOG.md | 9 +- package.json | 119 +++++++++--------- src/annotations/fileAnnotationController.ts | 6 +- src/config.ts | 2 +- src/constants.ts | 2 +- src/statusbar/statusBarController.ts | 13 +- .../settings/partials/file-annotations.html | 111 ++++++++++++++++ src/webviews/apps/settings/settings.html | 10 ++ 8 files changed, 205 insertions(+), 67 deletions(-) create mode 100644 src/webviews/apps/settings/partials/file-annotations.html diff --git a/CHANGELOG.md b/CHANGELOG.md index c9adc741cee3c..df45e53b75236 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds an inline _Open All Changes_ command to commits, stashes, and comparisons in the views - Changes _Open All Changes_ & _Open All Changes with Working Tree_ commands to use the new multi-diff editor when enabled - Adds _Open All Changes, Individually_ & _Open All Changes with Working Tree, Individually_ commands to provide access to the previous behavior - - Adds a `gitlens.views.openChangesInMultiDiffEditor` setting, which is enabled by default, to specify whether to open changes in the multi-diff editor (single tab) or in individual diff editors (multiple tabs) + - Renames the `gitlens.experimental.openChangesInMultiDiffEditor` setting to `gitlens.views.openChangesInMultiDiffEditor`, which is enabled by default, to specify whether to open changes in the multi-diff editor (single tab) or in individual diff editors (multiple tabs) - Requires VS Code `1.86` or later, or VS Code `1.85` with `multiDiffEditor.experimental.enabled` enabled - Adds new comparison features to pull requests in GitLens views - Adds an _Open Pull Request Changes_ context menu command on pull requests in the _Commit Graph_ and other GitLens views to view pull request changes in a multi-diff editor (single tab) @@ -25,9 +25,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds a _Apply Copied Patch_ command in the command palette to apply a patch from the clipboard - Adds an _Open All Changes_ inline button to branch status (upstream) and branch status files in GitLens views - Adds an _Open Changes_ submenu to branch status (upstream) and branch status files in GitLens views -- Adds an alternate flow (pick another file) when using the _Open File at Revision..._ and _Open Changes with Revision..._ commands to open a file that has been renamed and the rename is currently unstaged — closes [#3109](https://github.com/gitkraken/vscode-gitlens/issues/3109) +- Adds ability to preserve inline and file annotations while editing, previously experimental and now enabled by default + - Renames the `gitlens.experimental.allowAnnotationsWhenDirty` setting to `gitlens.fileAnnotations.preserveWhileEditing`, which is enabled by default, to specify whether file annotations will be preserved while editing — closes [#1988](https://github.com/gitkraken/vscode-gitlens/issues/1988), [#3016](https://github.com/gitkraken/vscode-gitlens/issues/3016) + - Use the existing `gitlens.advanced.blame.delayAfterEdit` setting to control how long to wait (defaults to 5s) before the annotation will update while the file is still dirty, which only applies if the file is under the `gitlens.advanced.sizeThresholdAfterEdit` setting threshold (defaults to 5000 lines) - Adds an _Open File Annotation Settings_ command to the _File Annotations_ submenu in the editor toolbar to open the GitLens Settings editor to the file annotations sections -- Adds new font settings to control the font family, size, and weight of the _File Blame_ annotations — closes [#3134](https://github.com/gitkraken/vscode-gitlens/issues/3134) +- Adds `gitlens.blame.fontFamily`, `gitlens.blame.fontSize`, `gitlens.blame.fontWeight` settings to specify the font (family, size, and weight respectively) of the _File Blame_ annotations — closes [#3134](https://github.com/gitkraken/vscode-gitlens/issues/3134) +- Adds an alternate flow (pick another file) when using the _Open File at Revision..._ and _Open Changes with Revision..._ commands to open a file that has been renamed and the rename is currently unstaged — closes [#3109](https://github.com/gitkraken/vscode-gitlens/issues/3109) ### Changed diff --git a/package.json b/package.json index c9d985412d52f..55bcc21d844b4 100644 --- a/package.json +++ b/package.json @@ -2182,10 +2182,67 @@ } } }, + { + "id": "file-annotations", + "title": "File Annotations", + "order": 14, + "properties": { + "gitlens.fileAnnotations.dismissOnEscape": { + "type": "boolean", + "default": true, + "markdownDescription": "Specifies whether pressing the `ESC` key dismisses the active file annotations", + "scope": "window", + "order": 10 + }, + "gitlens.fileAnnotations.command": { + "type": [ + "string", + "null" + ], + "default": null, + "enum": [ + null, + "blame", + "heatmap", + "changes" + ], + "enumDescriptions": [ + "Shows a menu to choose which file annotations to toggle", + "Toggles file blame annotations", + "Toggles file heatmap annotations", + "Toggles file changes annotations" + ], + "markdownDescription": "Specifies whether the file annotations button in the editor title shows a menu or immediately toggles the specified file annotations", + "scope": "window", + "order": 20 + }, + "gitlens.fileAnnotations.preserveWhileEditing": { + "type": "boolean", + "default": true, + "markdownDescription": "Specifies whether file annotations will be preserved while editing. Use `#gitlens.advanced.blame.delayAfterEdit#` to control how long to wait before the annotation will update while the file is still dirty", + "scope": "window", + "order": 30 + }, + "gitlens.advanced.blame.delayAfterEdit": { + "type": "number", + "default": 5000, + "markdownDescription": "Specifies the time (in milliseconds) to wait before re-blaming an unsaved document after an edit but before it is saved. Use 0 to specify an infinite wait. Only applies if the file is under the `#gitlens.advanced.sizeThresholdAfterEdit#`", + "scope": "window", + "order": 90 + }, + "gitlens.advanced.blame.sizeThresholdAfterEdit": { + "type": "number", + "default": 5000, + "markdownDescription": "Specifies the maximum document size (in lines) allowed to be re-blamed after an edit while still unsaved. Use 0 to specify no maximum", + "scope": "window", + "order": 91 + } + } + }, { "id": "file-blame", "title": "File Blame", - "order": 100, + "order": 15, "properties": { "gitlens.blame.toggleMode": { "type": "string", @@ -2322,7 +2379,7 @@ { "id": "file-changes", "title": "File Changes", - "order": 101, + "order": 16, "properties": { "gitlens.changes.toggleMode": { "type": "string", @@ -2371,7 +2428,7 @@ { "id": "file-heatmap", "title": "File Heatmap", - "order": 102, + "order": 17, "properties": { "gitlens.heatmap.toggleMode": { "type": "string", @@ -4041,13 +4098,6 @@ "title": "Experimental", "order": 9500, "properties": { - "gitlens.experimental.allowAnnotationsWhenDirty": { - "type": "boolean", - "default": false, - "markdownDescription": "(Experimental) Specifies whether file annotations are allowed on files with unsaved changes (dirty). Use `#gitlens.advanced.blame.delayAfterEdit#` to control how long to wait before the annotation will update while the file is still dirty", - "scope": "window", - "order": 10 - }, "gitlens.cloudPatches.experimental.layout": { "type": "string", "default": "view", @@ -4264,20 +4314,6 @@ "scope": "resource", "order": 41 }, - "gitlens.advanced.blame.delayAfterEdit": { - "type": "number", - "default": 5000, - "markdownDescription": "Specifies the time (in milliseconds) to wait before re-blaming an unsaved document after an edit but before it is saved. Use 0 to specify an infinite wait. Only applies if the file is under the `#gitlens.advanced.sizeThresholdAfterEdit#`", - "scope": "window", - "order": 42 - }, - "gitlens.advanced.blame.sizeThresholdAfterEdit": { - "type": "number", - "default": 5000, - "markdownDescription": "Specifies the maximum document size (in lines) allowed to be re-blamed after an edit while still unsaved. Use 0 to specify no maximum", - "scope": "window", - "order": 43 - }, "gitlens.advanced.similarityThreshold": { "type": [ "number", @@ -4422,35 +4458,6 @@ "scope": "window", "order": 40 }, - "gitlens.fileAnnotations.dismissOnEscape": { - "type": "boolean", - "default": true, - "markdownDescription": "Specifies whether pressing the `ESC` key dismisses the active file annotations", - "scope": "window", - "order": 45 - }, - "gitlens.fileAnnotations.command": { - "type": [ - "string", - "null" - ], - "default": null, - "enum": [ - null, - "blame", - "heatmap", - "changes" - ], - "enumDescriptions": [ - "Shows a menu to choose which file annotations to toggle", - "Toggles file blame annotations", - "Toggles file heatmap annotations", - "Toggles file changes annotations" - ], - "markdownDescription": "Specifies whether the file annotations button in the editor title shows a menu or immediately toggles the specified file annotations", - "scope": "window", - "order": 50 - }, "gitlens.proxy": { "type": [ "object", @@ -5340,7 +5347,7 @@ "icon": "$(gear)" }, { - "command": "gitlens.showSettingsPage!blame", + "command": "gitlens.showSettingsPage!file-annotations", "title": "Open File Annotation Settings", "category": "GitLens", "icon": "$(gear)" @@ -9069,7 +9076,7 @@ "when": "false" }, { - "command": "gitlens.showSettingsPage!blame", + "command": "gitlens.showSettingsPage!file-annotations", "when": "false" }, { @@ -15022,7 +15029,7 @@ "group": "2_gitlens@3" }, { - "command": "gitlens.showSettingsPage!blame", + "command": "gitlens.showSettingsPage!file-annotations", "when": "gitlens:activeFileStatus =~ /blameable/", "group": "8_gitlens@1" } diff --git a/src/annotations/fileAnnotationController.ts b/src/annotations/fileAnnotationController.ts index 3ec3d1e26bcea..ac87e1eaa2267 100644 --- a/src/annotations/fileAnnotationController.ts +++ b/src/annotations/fileAnnotationController.ts @@ -191,7 +191,7 @@ export class FileAnnotationController implements Disposable { // Only care if we are becoming un-blameable if (e.blameable) { - if (configuration.get('experimental.allowAnnotationsWhenDirty')) { + if (configuration.get('fileAnnotations.preserveWhileEditing')) { this.restore(editor); } @@ -202,7 +202,7 @@ export class FileAnnotationController implements Disposable { } private onDirtyIdleTriggered(e: DocumentDirtyIdleTriggerEvent) { - if (!e.document.isBlameable || !configuration.get('experimental.allowAnnotationsWhenDirty')) return; + if (!e.document.isBlameable || !configuration.get('fileAnnotations.preserveWhileEditing')) return; const editor = window.activeTextEditor; if (editor == null) return; @@ -214,7 +214,7 @@ export class FileAnnotationController implements Disposable { for (const [key, p] of this._annotationProviders) { if (!e.document.is(p.editor.document)) continue; - if (configuration.get('experimental.allowAnnotationsWhenDirty')) { + if (configuration.get('fileAnnotations.preserveWhileEditing')) { if (!e.dirty) { this.restore(e.editor); } diff --git a/src/config.ts b/src/config.ts index 4fb49f11e38a6..797f100b14f06 100644 --- a/src/config.ts +++ b/src/config.ts @@ -75,10 +75,10 @@ export interface Config { readonly defaultTimeFormat: DateTimeFormat | (string & object) | null; readonly detectNestedRepositories: boolean; readonly experimental: { - readonly allowAnnotationsWhenDirty: boolean; readonly generateCommitMessagePrompt: string; }; readonly fileAnnotations: { + readonly preserveWhileEditing: boolean; readonly command: string | null; readonly dismissOnEscape: boolean; }; diff --git a/src/constants.ts b/src/constants.ts index 0ea56451a0dd4..7bc3610ae4db4 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -307,7 +307,7 @@ export const enum Commands { ShowRepositoriesView = 'gitlens.showRepositoriesView', ShowSearchAndCompareView = 'gitlens.showSearchAndCompareView', ShowSettingsPage = 'gitlens.showSettingsPage', - ShowSettingsPageAndJumpToFileAnnotations = 'gitlens.showSettingsPage!blame', + ShowSettingsPageAndJumpToFileAnnotations = 'gitlens.showSettingsPage!file-annotations', ShowSettingsPageAndJumpToBranchesView = 'gitlens.showSettingsPage!branches-view', ShowSettingsPageAndJumpToCommitsView = 'gitlens.showSettingsPage!commits-view', ShowSettingsPageAndJumpToContributorsView = 'gitlens.showSettingsPage!contributors-view', diff --git a/src/statusbar/statusBarController.ts b/src/statusbar/statusBarController.ts index d187c4eebc34e..2e3558200edf4 100644 --- a/src/statusbar/statusBarController.ts +++ b/src/statusbar/statusBarController.ts @@ -1,5 +1,6 @@ import type { ConfigurationChangeEvent, StatusBarItem, TextEditor, Uri } from 'vscode'; import { CancellationTokenSource, Disposable, MarkdownString, StatusBarAlignment, window } from 'vscode'; +import { Command } from '../commands/base'; import type { ToggleFileChangesAnnotationCommandArgs } from '../commands/toggleFileAnnotations'; import { StatusBarCommand } from '../config'; import { Commands, GlyphChars } from '../constants'; @@ -163,21 +164,27 @@ export class StatusBarController implements Disposable { if (doc == null || !doc.isBlameable) return; statusBarItem.tooltip = new MarkdownString(); - statusBarItem.tooltip.isTrusted = { enabledCommands: ['workbench.action.openSettings'] }; + statusBarItem.tooltip.isTrusted = { enabledCommands: [Commands.ShowSettingsPage] }; if (doc.canDirtyIdle) { statusBarItem.text = '$(watch) Blame Paused'; statusBarItem.tooltip.appendMarkdown( `Blame will resume after a [${configuration.get( 'advanced.blame.delayAfterEdit', - )} ms delay](command:workbench.action.openSettings?%22gitlens.advanced.blame.delayAfterEdit%22 'Change the after edit delay') to limit the performance impact because there are unsaved changes`, + )} ms delay](${Command.getMarkdownCommandArgsCore<[undefined, string]>( + Commands.ShowSettingsPage, + [undefined, 'advanced.blame.delayAfterEdit'], + )} 'Change the after edit delay') to limit the performance impact because there are unsaved changes`, ); } else { statusBarItem.text = '$(debug-pause) Blame Paused'; statusBarItem.tooltip.appendMarkdown( `Blame will resume after saving because there are unsaved changes and the file is over the [${configuration.get( 'advanced.blame.sizeThresholdAfterEdit', - )} line threshold](command:workbench.action.openSettings?%22gitlens.advanced.blame.sizeThresholdAfterEdit%22 'Change the after edit line threshold') to limit the performance impact`, + )} line threshold](${Command.getMarkdownCommandArgsCore<[undefined, string]>( + Commands.ShowSettingsPage, + [undefined, 'advanced.blame.sizeThresholdAfterEdit'], + )} 'Change the after edit line threshold') to limit the performance impact`, ); } diff --git a/src/webviews/apps/settings/partials/file-annotations.html b/src/webviews/apps/settings/partials/file-annotations.html new file mode 100644 index 0000000000000..4da5f2b27e64b --- /dev/null +++ b/src/webviews/apps/settings/partials/file-annotations.html @@ -0,0 +1,111 @@ +
+
+

+ File Annotations + + + +

+ +

+ Customize on-demand blame, changes, or heatmap annotations for the whole file +

+
+ +
+
+
+
+
+ + +
+

+
+ +
+
+ + +
+

+ Annotations will be shown from the last saved version +

+
+ +
+
+ + + +
+

+ Smaller delays will provide a better experience but will have a greater performance impact
Also + applies to inline blame annotations +

+
+ +
+
+ + + +
+

+ Files larger than the threshold will only be recomputed when saved
Also applies to inline + blame annotations +

+
+
+
+ +
+

+ For more options, open the + Settings UI + and search for gitlens.fileAnnotations +

+
+
+
diff --git a/src/webviews/apps/settings/settings.html b/src/webviews/apps/settings/settings.html index 7c573e10fcbd9..412227a08f4ae 100644 --- a/src/webviews/apps/settings/settings.html +++ b/src/webviews/apps/settings/settings.html @@ -83,6 +83,7 @@

Settings

<%= require('html-loader?{"esModule":false}!./partials/code-lens.html') %> <%= require('html-loader?{"esModule":false}!./partials/status-bar.html') %> <%= require('html-loader?{"esModule":false}!./partials/hovers.html') %> + <%= require('html-loader?{"esModule":false}!./partials/file-annotations.html') %> <%= require('html-loader?{"esModule":false}!./partials/blame.html') %> <%= require('html-loader?{"esModule":false}!./partials/changes.html') %> <%= require('html-loader?{"esModule":false}!./partials/heatmap.html') %> @@ -151,6 +152,15 @@

Jump to

  • + File Annotations +
    • +
  • Date: Mon, 5 Feb 2024 23:07:54 -0500 Subject: [PATCH 0494/1012] Updates CHANGELOG --- CHANGELOG.md | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df45e53b75236..c64526a959b61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Added +- Improves worktree usage, discoverability, and accessibility + - Simplifies the create worktree and open worktree flows — reduces number of steps and options presented + - Adds _Create Branch in New Worktree_ confirmation option when creating branches, e.g. via the _GitLens: Git Create Branch..._ command + - Adds _Create Worktree for Branch_, _Create Worktree for Local Branch_, and _Create Worktree for New Local Branch_ confirmation options when switching branches, e.g. via the _GitLens: Git Switch to..._ command + - Avoids prompt to add a (required) remote and instead auto-adds the remote during worktree creation from a pull request - Adds ability to open multiple changes in VS Code's new multi-diff editor, previously experimental and now enabled by default - Adds an inline _Open All Changes_ command to commits, stashes, and comparisons in the views - Changes _Open All Changes_ & _Open All Changes with Working Tree_ commands to use the new multi-diff editor when enabled @@ -30,12 +35,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Use the existing `gitlens.advanced.blame.delayAfterEdit` setting to control how long to wait (defaults to 5s) before the annotation will update while the file is still dirty, which only applies if the file is under the `gitlens.advanced.sizeThresholdAfterEdit` setting threshold (defaults to 5000 lines) - Adds an _Open File Annotation Settings_ command to the _File Annotations_ submenu in the editor toolbar to open the GitLens Settings editor to the file annotations sections - Adds `gitlens.blame.fontFamily`, `gitlens.blame.fontSize`, `gitlens.blame.fontWeight` settings to specify the font (family, size, and weight respectively) of the _File Blame_ annotations — closes [#3134](https://github.com/gitkraken/vscode-gitlens/issues/3134) +- Adds _Copy Link to Code_, _Copy Link to File_, and _Copy Link to File at Revision..._ commands to the _Share_ submenu in the editor line number (gutter) context menu - Adds an alternate flow (pick another file) when using the _Open File at Revision..._ and _Open Changes with Revision..._ commands to open a file that has been renamed and the rename is currently unstaged — closes [#3109](https://github.com/gitkraken/vscode-gitlens/issues/3109) +- Adds access to most _Git Command Palette_ commands directly to the command palette +- Adds _Rename Stash..._ options to stash quick pick menus +- Adds support for the latest GPT-4 Turbo models ### Changed -- Moves the pull request to be first item in the _Commits_ view, when applicable -- Moves the branch comparison to be below the branch status in the _Commits_ view to keep top focus on the status over the comparison +- Changes adds avatars to commits in quick pick menus +- Changes the pull request to be first item in the _Commits_ view, when applicable +- Changes the branch comparison to be below the branch status in the _Commits_ view to keep top focus on the status over the comparison +- Renames "Open Worktree for Pull Request via GitLens..." to "Checkout Pull Request in Worktree (GitLens)..." - Renames the `gitlens.experimental.openChangesInMultiDiffEditor` setting to `gitlens.views.openChangesInMultiDiffEditor` as it is no longer experimental and enabled by default ### Fixed @@ -69,7 +80,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Changes the commit search by file to allow some fuzziness by default — closes [#3086](https://github.com/gitkraken/vscode-gitlens/issues/3086) - For example, if you enter `file:readme.txt`, we will treat it as `file:**/readme.txt`, or if you enter `file:readme` it will be treated as `file:*readme*` - Improves the _Switch_ command to no longer fail when trying to switch to a branch that is linked to another worktree and instead offers to open the worktree -- Changes branch/tag "tips" that are show on commits in many GitLens views to be truncated to 11 characters by default to avoid stealing to much real estate +- Changes branch/tag "tips" that are shown on commits in many GitLens views to be truncated to 11 characters by default to avoid stealing to much real estate ### Fixed From 812ceb11068d31112ed66f4346d181369eaddb5f Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 6 Feb 2024 02:02:57 -0500 Subject: [PATCH 0495/1012] Changes to return underlying items --- src/commands/copyDeepLink.ts | 6 ++++-- src/quickpicks/branchPicker.ts | 8 ++++---- src/quickpicks/remotePicker.ts | 7 +++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/commands/copyDeepLink.ts b/src/commands/copyDeepLink.ts index 0db750d958c9b..b8ed4b45c91a2 100644 --- a/src/commands/copyDeepLink.ts +++ b/src/commands/copyDeepLink.ts @@ -146,7 +146,8 @@ export class CopyDeepLinkCommand extends ActiveEditorCommand { }, ); if (pick == null) return; - chosenRemote = pick.item; + + chosenRemote = pick; } if (chosenRemote == null) return; @@ -308,7 +309,8 @@ export class CopyFileDeepLinkCommand extends ActiveEditorCommand { }, ); if (pick == null) return; - chosenRemote = pick.item; + + chosenRemote = pick; } if (chosenRemote == null) return; diff --git a/src/quickpicks/branchPicker.ts b/src/quickpicks/branchPicker.ts index b098dc2c985ff..df461a69edb7b 100644 --- a/src/quickpicks/branchPicker.ts +++ b/src/quickpicks/branchPicker.ts @@ -1,6 +1,7 @@ import type { Disposable, QuickPickItem } from 'vscode'; import { window } from 'vscode'; import { getBranches } from '../commands/quickCommand.steps'; +import type { GitBranch } from '../git/models/branch'; import type { Repository } from '../git/models/repository'; import { getQuickPickIgnoreFocusOut } from '../system/utils'; import type { BranchQuickPickItem } from './items/gitCommands'; @@ -9,7 +10,7 @@ export async function showBranchPicker( title: string | undefined, placeholder?: string, repository?: Repository, -): Promise { +): Promise { if (repository == null) { return undefined; } @@ -41,9 +42,8 @@ export async function showBranchPicker( quickpick.show(); }); - if (pick == null) return undefined; - return pick; + return pick?.item; } finally { quickpick.dispose(); disposables.forEach(d => void d.dispose()); @@ -93,7 +93,7 @@ export async function showNewBranchPicker( export async function showNewOrSelectBranchPicker( title: string | undefined, repository?: Repository, -): Promise { +): Promise { if (repository == null) { return undefined; } diff --git a/src/quickpicks/remotePicker.ts b/src/quickpicks/remotePicker.ts index 1644433b21a17..2fbc318da1e5f 100644 --- a/src/quickpicks/remotePicker.ts +++ b/src/quickpicks/remotePicker.ts @@ -15,7 +15,7 @@ export async function showRemotePicker( picked?: string; setDefault?: boolean; }, -): Promise { +): Promise { const items: RemoteQuickPickItem[] = []; let picked: RemoteQuickPickItem | undefined; @@ -43,7 +43,7 @@ export async function showRemotePicker( } } - if (options?.autoPick && remotes.length === 1) return items[0]; + if (options?.autoPick && remotes.length === 1) return items[0].item; const quickpick = window.createQuickPick(); quickpick.ignoreFocusOut = getQuickPickIgnoreFocusOut(); @@ -77,9 +77,8 @@ export async function showRemotePicker( quickpick.show(); }); - if (pick == null) return undefined; - return pick; + return pick?.item; } finally { quickpick.dispose(); disposables.forEach(d => void d.dispose()); From e2a892cf3454250e85d16b5cffcf020d82272ef3 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 6 Feb 2024 02:05:32 -0500 Subject: [PATCH 0496/1012] Adds deferred loading support for quick commands --- src/commands/gitCommands.ts | 38 +++- src/commands/quickCommand.steps.ts | 306 ++++++++++++++++------------- src/commands/quickCommand.ts | 4 +- 3 files changed, 199 insertions(+), 149 deletions(-) diff --git a/src/commands/gitCommands.ts b/src/commands/gitCommands.ts index a89843874bb98..86a01ff70ae7d 100644 --- a/src/commands/gitCommands.ts +++ b/src/commands/gitCommands.ts @@ -564,7 +564,8 @@ export class GitCommandsCommand extends Command { const disposables: Disposable[] = []; try { - return await new Promise(resolve => { + // eslint-disable-next-line no-async-promise-executor + return await new Promise(async resolve => { async function goBack() { if (step.disallowBack === true) return; @@ -740,7 +741,7 @@ export class GitCommandsCommand extends Command { commandsStep.setCommand(command, this.startedWith); } else { const cmd = quickpick.value.trim().toLowerCase(); - const item = step.items.find( + const item = (await step.items).find( i => i.label.replace(sanitizeLabel, '').toLowerCase() === cmd, ); if (item == null) return; @@ -762,14 +763,17 @@ export class GitCommandsCommand extends Command { ) { if (step.onValidateValue == null) return; - overrideItems = await step.onValidateValue(quickpick, e.trim(), step.items); + overrideItems = await step.onValidateValue(quickpick, e.trim(), await step.items); } else { overrideItems = false; } // If we are no longer overriding the items, put them back (only if we need to) - if (!overrideItems && quickpick.items.length !== step.items.length) { - quickpick.items = step.items; + if (!overrideItems) { + step.items = await step.items; + if (quickpick.items.length !== step.items.length) { + quickpick.items = step.items; + } } }), quickpick.onDidChangeActive(() => { @@ -893,12 +897,30 @@ export class GitCommandsCommand extends Command { ); quickpick.title = step.title; - quickpick.placeholder = step.placeholder; quickpick.matchOnDescription = Boolean(step.matchOnDescription); quickpick.matchOnDetail = Boolean(step.matchOnDetail); - quickpick.canSelectMany = Boolean(step.multiselect); - quickpick.items = step.items; + if (isPromise(step.items)) { + quickpick.placeholder = 'Loading...'; + + quickpick.busy = true; + quickpick.show(); + + quickpick.items = await step.items; + quickpick.placeholder = + typeof step.placeholder === 'function' + ? step.placeholder(quickpick.items.length) + : step.placeholder; + quickpick.busy = false; + } else { + quickpick.placeholder = + typeof step.placeholder === 'function' + ? step.placeholder(quickpick.items.length) + : step.placeholder; + quickpick.items = step.items; + } + + quickpick.canSelectMany = Boolean(step.multiselect) && quickpick.items.length > 1; if (quickpick.canSelectMany) { quickpick.selectedItems = step.selectedItems ?? quickpick.items.filter(i => i.picked); diff --git a/src/commands/quickCommand.steps.ts b/src/commands/quickCommand.steps.ts index 3d2054f920ed9..904babb87ed5f 100644 --- a/src/commands/quickCommand.steps.ts +++ b/src/commands/quickCommand.steps.ts @@ -219,44 +219,52 @@ export async function getWorktrees( repoOrWorktrees: Repository | GitWorktree[], { buttons, + excludeOpened, filter, includeStatus, picked, }: { buttons?: QuickInputButton[]; + excludeOpened?: boolean; filter?: (t: GitWorktree) => boolean; includeStatus?: boolean; picked?: string | string[]; }, ): Promise { const worktrees = repoOrWorktrees instanceof Repository ? await repoOrWorktrees.getWorktrees() : repoOrWorktrees; - return Promise.all( - worktrees - .filter(w => filter == null || filter(w)) - .map(async w => { - let missing = false; - let status; - if (includeStatus) { - try { - status = await w.getStatus(); - } catch { - missing = true; - } - } - return createWorktreeQuickPickItem( - w, - picked != null && - (typeof picked === 'string' ? w.uri.toString() === picked : picked.includes(w.uri.toString())), - missing, - { - buttons: buttons, - path: true, - status: status, - }, - ); - }), - ); + const items: WorktreeQuickPickItem[] = []; + + for (const w of worktrees) { + if (excludeOpened && w.opened) continue; + if (filter != null && !filter(w)) continue; + + let missing = false; + let status; + if (includeStatus) { + try { + status = await w.getStatus(); + } catch { + missing = true; + } + } + + items.push( + createWorktreeQuickPickItem( + w, + picked != null && + (typeof picked === 'string' ? w.uri.toString() === picked : picked.includes(w.uri.toString())), + missing, + { + buttons: buttons, + path: true, + status: status, + }, + ), + ); + } + + return items; } export async function getBranchesAndOrTags( @@ -695,7 +703,7 @@ export async function* inputTagNameStep< return value; } -export async function* pickBranchStep< +export function* pickBranchStep< State extends PartialStepState & { repo: Repository }, Context extends { repos: Repository[]; showTags?: boolean; title: string }, >( @@ -712,21 +720,22 @@ export async function* pickBranchStep< placeholder: string; titleContext?: string; }, -): AsyncStepResultGenerator { - const branches = await getBranches(state.repo, { +): StepResultGenerator { + const items = getBranches(state.repo, { buttons: [RevealInSideBarQuickInputButton], filter: filter, picked: picked, - }); + }).then(branches => + branches.length === 0 + ? [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)] + : branches, + ); const step = createPickStep({ title: appendReposToTitle(`${context.title}${titleContext ?? ''}`, state, context), - placeholder: branches.length === 0 ? `No branches found in ${state.repo.formattedName}` : placeholder, + placeholder: count => (!count ? `No branches found in ${state.repo.formattedName}` : placeholder), matchOnDetail: true, - items: - branches.length === 0 - ? [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)] - : branches, + items: items, onDidClickItemButton: (quickpick, button, { item }) => { if (button === RevealInSideBarQuickInputButton) { void BranchActions.reveal(item, { select: true, focus: false, expand: true }); @@ -746,7 +755,7 @@ export async function* pickBranchStep< return canPickStepContinue(step, state, selection) ? selection[0].item : StepResultBreak; } -export async function* pickBranchesStep< +export function* pickBranchesStep< State extends PartialStepState & { repo: Repository }, Context extends { repos: Repository[]; showTags?: boolean; title: string }, >( @@ -767,24 +776,25 @@ export async function* pickBranchesStep< sort?: BranchSortOptions; titleContext?: string; }, -): AsyncStepResultGenerator { - const branches = await getBranches(state.repo, { +): StepResultGenerator { + const items = getBranches(state.repo, { buttons: [RevealInSideBarQuickInputButton], filter: filter, picked: picked, sort: sort, - }); + }).then(branches => + !branches.length + ? [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)] + : branches, + ); const step = createPickStep({ - multiselect: Boolean(branches.length), + multiselect: true, title: appendReposToTitle(`${context.title}${titleContext ?? ''}`, state, context), - placeholder: !branches.length - ? emptyPlaceholder ?? `No branches found in ${state.repo.formattedName}` - : placeholder, + placeholder: count => + !count ? emptyPlaceholder ?? `No branches found in ${state.repo.formattedName}` : placeholder, matchOnDetail: true, - items: !branches.length - ? [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)] - : branches, + items: items, onDidClickItemButton: (quickpick, button, { item }) => { if (button === RevealInSideBarQuickInputButton) { void BranchActions.reveal(item, { select: true, focus: false, expand: true }); @@ -804,7 +814,7 @@ export async function* pickBranchesStep< return canPickStepContinue(step, state, selection) ? selection.map(i => i.item) : StepResultBreak; } -export async function* pickBranchOrTagStep< +export function* pickBranchOrTagStep< State extends PartialStepState & { repo: Repository }, Context extends { repos: Repository[]; pickCommitForItem?: boolean; showTags?: boolean; title: string }, >( @@ -827,7 +837,7 @@ export async function* pickBranchOrTagStep< additionalButtons?: QuickInputButton[]; ranges?: boolean; }, -): AsyncStepResultGenerator { +): StepResultGenerator { context.showTags = true; const showTagsButton = new ShowTagsToggleQuickInputButton(context.showTags); @@ -843,12 +853,16 @@ export async function* pickBranchOrTagStep< sort: true, }); }; - const branchesAndOrTags = await getBranchesAndOrTagsFn(); + const items = getBranchesAndOrTagsFn().then(branchesAndOrTags => + branchesAndOrTags.length === 0 + ? [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)] + : branchesAndOrTags, + ); const step = createPickStep({ title: appendReposToTitle(`${context.title}${titleContext ?? ''}`, state, context), - placeholder: - branchesAndOrTags.length === 0 + placeholder: count => + !count ? `No branches${context.showTags ? ' or tags' : ''} found in ${state.repo.formattedName}` : `${ typeof placeholder === 'string' ? placeholder : placeholder(context) @@ -857,10 +871,7 @@ export async function* pickBranchOrTagStep< matchOnDetail: true, value: value, selectValueWhenShown: true, - items: - branchesAndOrTags.length === 0 - ? [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)] - : branchesAndOrTags, + items: items, additionalButtons: [...(additionalButtons ?? []), showTagsButton], onDidClickItemButton: (quickpick, button, { item }) => { if (button === PickCommitQuickInputButton) { @@ -917,7 +928,7 @@ export async function* pickBranchOrTagStep< return canPickStepContinue(step, state, selection) ? selection[0].item : StepResultBreak; } -export async function* pickBranchOrTagStepMultiRepo< +export function* pickBranchOrTagStepMultiRepo< State extends StepState & { repos: Repository[]; reference?: GitReference }, Context extends { repos: Repository[]; showTags?: boolean; title: string }, >( @@ -936,7 +947,7 @@ export async function* pickBranchOrTagStepMultiRepo< titleContext?: string; value?: string; }, -): AsyncStepResultGenerator { +): StepResultGenerator { context.showTags = state.repos.length === 1; const showTagsButton = new ShowTagsToggleQuickInputButton(context.showTags); @@ -950,12 +961,16 @@ export async function* pickBranchOrTagStepMultiRepo< sort: { branches: { orderBy: 'date:desc' }, tags: { orderBy: 'date:desc' } }, }); }; - const branchesAndOrTags = await getBranchesAndOrTagsFn(); + const items = getBranchesAndOrTagsFn().then(branchesAndOrTags => + branchesAndOrTags.length === 0 + ? [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)] + : branchesAndOrTags, + ); const step = createPickStep({ title: appendReposToTitle(`${context.title}${titleContext ?? ''}`, state, context), - placeholder: - branchesAndOrTags.length === 0 + placeholder: count => + !count ? `No ${state.repos.length === 1 ? '' : 'common '}branches${ context.showTags ? ' or tags' : '' } found in ${state.repos.length === 1 ? state.repos[0].formattedName : `${state.repos.length} repos`}` @@ -966,10 +981,7 @@ export async function* pickBranchOrTagStepMultiRepo< matchOnDetail: true, value: value ?? (isRevisionReference(state.reference) ? state.reference.ref : undefined), selectValueWhenShown: true, - items: - branchesAndOrTags.length === 0 - ? [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)] - : branchesAndOrTags, + items: items, additionalButtons: [showTagsButton], onDidClickItemButton: (quickpick, button, { item }) => { if (button === RevealInSideBarQuickInputButton) { @@ -1090,6 +1102,10 @@ export async function* pickCommitStep< return items; } + const items = getItems(log).then(items => + showInSideBarCommand != null ? [showInSideBarCommand, ...items] : items, + ); + const step = createPickStep({ title: appendReposToTitle(`${context.title}${titleContext ?? ''}`, state, context), placeholder: typeof placeholder === 'string' ? placeholder : placeholder(context, log), @@ -1098,7 +1114,7 @@ export async function* pickCommitStep< matchOnDetail: true, value: typeof picked === 'string' && log?.count === 0 ? picked : undefined, selectValueWhenShown: true, - items: showInSideBarCommand != null ? [showInSideBarCommand, ...(await getItems(log))] : await getItems(log), + items: items, onDidLoadMore: async quickpick => { quickpick.keepScrollPosition = true; log = await log?.more?.(configuration.get('advanced.maxListItems')); @@ -1181,7 +1197,7 @@ export async function* pickCommitStep< return selection[0].item; } -export async function* pickCommitsStep< +export function* pickCommitsStep< State extends PartialStepState & { repo: Repository }, Context extends { repos: Repository[]; title: string }, >( @@ -1200,7 +1216,7 @@ export async function* pickCommitsStep< placeholder: string | ((context: Context, log: GitLog | undefined) => string); titleContext?: string; }, -): AsyncStepResultGenerator { +): StepResultGenerator { async function getItems(log: GitLog | undefined) { if (log == null) return [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)]; @@ -1235,7 +1251,7 @@ export async function* pickCommitsStep< placeholder: typeof placeholder === 'string' ? placeholder : placeholder(context, log), matchOnDescription: true, matchOnDetail: true, - items: await getItems(log), + items: getItems(log), onDidLoadMore: async quickpick => { quickpick.keepScrollPosition = true; log = await log?.more?.(configuration.get('advanced.maxListItems')); @@ -1282,30 +1298,33 @@ export async function* pickCommitsStep< return canPickStepContinue(step, state, selection) ? selection.map(i => i.item) : StepResultBreak; } -export async function* pickContributorsStep< +export function* pickContributorsStep< State extends PartialStepState & { repo: Repository }, Context extends { repos: Repository[]; title: string }, ->( - state: State, - context: Context, - placeholder: string = 'Choose contributors', -): AsyncStepResultGenerator { - const message = (await Container.instance.git.getOrOpenScmRepository(state.repo.path))?.inputBox.value; +>(state: State, context: Context, placeholder: string = 'Choose contributors'): StepResultGenerator { + async function getItems() { + const message = (await Container.instance.git.getOrOpenScmRepository(state.repo.path))?.inputBox.value; + + const items = []; + + for (const c of await Container.instance.git.getContributors(state.repo.path)) { + items.push( + await createContributorQuickPickItem(c, message?.includes(c.getCoauthor()), { + buttons: [RevealInSideBarQuickInputButton], + }), + ); + } + + return items; + } - const contributors = await Container.instance.git.getContributors(state.repo.path); const step = createPickStep({ title: appendReposToTitle(context.title, state, context), allowEmpty: true, multiselect: true, placeholder: placeholder, matchOnDescription: true, - items: await Promise.all( - contributors.map(c => - createContributorQuickPickItem(c, message?.includes(c.getCoauthor()), { - buttons: [RevealInSideBarQuickInputButton], - }), - ), - ), + items: getItems(), onDidClickItemButton: (quickpick, button, { item }) => { if (button === RevealInSideBarQuickInputButton) { void ContributorActions.reveal(item, { select: true, focus: false, expand: true }); @@ -1325,7 +1344,7 @@ export async function* pickContributorsStep< return canPickStepContinue(step, state, selection) ? selection.map(i => i.item) : StepResultBreak; } -export async function* pickRemoteStep< +export function* pickRemoteStep< State extends PartialStepState & { repo: Repository }, Context extends { repos: Repository[]; title: string }, >( @@ -1342,21 +1361,22 @@ export async function* pickRemoteStep< placeholder: string; titleContext?: string; }, -): AsyncStepResultGenerator { - const remotes = await getRemotes(state.repo, { +): StepResultGenerator { + const items = getRemotes(state.repo, { buttons: [RevealInSideBarQuickInputButton], filter: filter, picked: picked, - }); + }).then(remotes => + remotes.length === 0 + ? [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)] + : remotes, + ); const step = createPickStep({ title: appendReposToTitle(`${context.title}${titleContext ?? ''}`, state, context), - placeholder: remotes.length === 0 ? `No remotes found in ${state.repo.formattedName}` : placeholder, + placeholder: count => (!count ? `No remotes found in ${state.repo.formattedName}` : placeholder), matchOnDetail: true, - items: - remotes.length === 0 - ? [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)] - : remotes, + items: items, onDidClickItemButton: (quickpick, button, { item }) => { if (button === RevealInSideBarQuickInputButton) { void RemoteActions.reveal(item, { select: true, focus: false, expand: true }); @@ -1376,7 +1396,7 @@ export async function* pickRemoteStep< return canPickStepContinue(step, state, selection) ? selection[0].item : StepResultBreak; } -export async function* pickRemotesStep< +export function* pickRemotesStep< State extends PartialStepState & { repo: Repository }, Context extends { repos: Repository[]; title: string }, >( @@ -1393,22 +1413,24 @@ export async function* pickRemotesStep< placeholder: string; titleContext?: string; }, -): AsyncStepResultGenerator { - const remotes = await getRemotes(state.repo, { +): StepResultGenerator { + const items = getRemotes(state.repo, { buttons: [RevealInSideBarQuickInputButton], filter: filter, picked: picked, - }); + }).then(remotes => + remotes.length === 0 + ? [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)] + : remotes, + ); const step = createPickStep({ - multiselect: remotes.length !== 0, + multiselect: true, title: appendReposToTitle(`${context.title}${titleContext ?? ''}`, state, context), - placeholder: remotes.length === 0 ? `No remotes found in ${state.repo.formattedName}` : placeholder, + placeholder: count => (!count ? `No remotes found in ${state.repo.formattedName}` : placeholder), matchOnDetail: true, - items: - remotes.length === 0 - ? [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)] - : remotes, + items: items, + onDidClickItemButton: (quickpick, button, { item }) => { if (button === RevealInSideBarQuickInputButton) { void RemoteActions.reveal(item, { select: true, focus: false, expand: true }); @@ -1444,7 +1466,7 @@ export async function* pickRepositoryStep< items: context.repos.length === 0 ? [createDirectiveQuickPickItem(Directive.Cancel)] - : await Promise.all( + : Promise.all( context.repos.map(r => createRepositoryQuickPickItem(r, r.id === active?.id, { branch: true, @@ -1509,7 +1531,7 @@ export async function* pickRepositoriesStep< items: context.repos.length === 0 ? [createDirectiveQuickPickItem(Directive.Cancel)] - : await Promise.all( + : Promise.all( context.repos.map(repo => createRepositoryQuickPickItem( repo, @@ -1663,7 +1685,7 @@ export function* pickStashesStep< return canPickStepContinue(step, state, selection) ? selection.map(i => i.item) : StepResultBreak; } -export async function* pickTagsStep< +export function* pickTagsStep< State extends PartialStepState & { repo: Repository }, Context extends { repos: Repository[]; showTags?: boolean; title: string }, >( @@ -1680,22 +1702,23 @@ export async function* pickTagsStep< placeholder: string; titleContext?: string; }, -): AsyncStepResultGenerator { - const tags = await getTags(state.repo, { +): StepResultGenerator { + const items = getTags(state.repo, { buttons: [RevealInSideBarQuickInputButton], filter: filter, picked: picked, - }); + }).then(tags => + tags.length === 0 + ? [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)] + : tags, + ); const step = createPickStep({ - multiselect: tags.length !== 0, + multiselect: true, title: appendReposToTitle(`${context.title}${titleContext ?? ''}`, state, context), - placeholder: tags.length === 0 ? `No tags found in ${state.repo.formattedName}` : placeholder, + placeholder: count => (!count ? `No tags found in ${state.repo.formattedName}` : placeholder), matchOnDetail: true, - items: - tags.length === 0 - ? [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)] - : tags, + items: items, onDidClickItemButton: (quickpick, button, { item }) => { if (button === RevealInSideBarQuickInputButton) { void TagActions.reveal(item, { @@ -1719,41 +1742,45 @@ export async function* pickTagsStep< return canPickStepContinue(step, state, selection) ? selection.map(i => i.item) : StepResultBreak; } -export async function* pickWorktreeStep< +export function* pickWorktreeStep< State extends PartialStepState & { repo: Repository }, Context extends { repos: Repository[]; title: string; worktrees?: GitWorktree[] }, >( state: State, context: Context, { + excludeOpened, filter, includeStatus, picked, placeholder, titleContext, }: { + excludeOpened?: boolean; filter?: (b: GitWorktree) => boolean; includeStatus?: boolean; picked?: string | string[]; placeholder: string; titleContext?: string; }, -): AsyncStepResultGenerator { - const worktrees = await getWorktrees(context.worktrees ?? state.repo, { +): StepResultGenerator { + const items = getWorktrees(context.worktrees ?? state.repo, { buttons: [OpenInNewWindowQuickInputButton, RevealInSideBarQuickInputButton], + excludeOpened: excludeOpened, filter: filter, includeStatus: includeStatus, picked: picked, - }); + }).then(worktrees => + worktrees.length === 0 + ? [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)] + : worktrees, + ); const step = createPickStep({ title: appendReposToTitle(`${context.title}${titleContext ?? ''}`, state, context), - placeholder: worktrees.length === 0 ? `No worktrees found in ${state.repo.formattedName}` : placeholder, + placeholder: count => (!count ? `No worktrees found in ${state.repo.formattedName}` : placeholder), matchOnDetail: true, - items: - worktrees.length === 0 - ? [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)] - : worktrees, + items: items, onDidClickItemButton: (quickpick, button, { item }) => { switch (button) { case OpenInNewWindowQuickInputButton: @@ -1778,7 +1805,7 @@ export async function* pickWorktreeStep< return canPickStepContinue(step, state, selection) ? selection[0].item : StepResultBreak; } -export async function* pickWorktreesStep< +export function* pickWorktreesStep< State extends PartialStepState & { repo: Repository }, Context extends { repos: Repository[]; title: string; worktrees?: GitWorktree[] }, >( @@ -1797,23 +1824,24 @@ export async function* pickWorktreesStep< placeholder: string; titleContext?: string; }, -): AsyncStepResultGenerator { - const worktrees = await getWorktrees(context.worktrees ?? state.repo, { +): StepResultGenerator { + const items = getWorktrees(context.worktrees ?? state.repo, { buttons: [OpenInNewWindowQuickInputButton, RevealInSideBarQuickInputButton], filter: filter, includeStatus: includeStatus, picked: picked, - }); + }).then(worktrees => + worktrees.length === 0 + ? [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)] + : worktrees, + ); const step = createPickStep({ - multiselect: worktrees.length !== 0, + multiselect: true, title: appendReposToTitle(`${context.title}${titleContext ?? ''}`, state, context), - placeholder: worktrees.length === 0 ? `No worktrees found in ${state.repo.formattedName}` : placeholder, + placeholder: count => (!count ? `No worktrees found in ${state.repo.formattedName}` : placeholder), matchOnDetail: true, - items: - worktrees.length === 0 - ? [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)] - : worktrees, + items: items, onDidClickItemButton: (quickpick, button, { item }) => { switch (button) { case OpenInNewWindowQuickInputButton: @@ -1838,13 +1866,13 @@ export async function* pickWorktreesStep< return canPickStepContinue(step, state, selection) ? selection.map(i => i.item) : StepResultBreak; } -export async function* showCommitOrStashStep< +export function* showCommitOrStashStep< State extends PartialStepState & { repo: Repository; reference: GitCommit | GitStashCommit }, Context extends { repos: Repository[]; title: string }, >( state: State, context: Context, -): AsyncStepResultGenerator { +): StepResultGenerator { const step: QuickPickStep = createPickStep({ title: appendReposToTitle( @@ -1857,7 +1885,7 @@ export async function* showCommitOrStashStep< ), placeholder: getReferenceLabel(state.reference, { capitalize: true, icon: false }), ignoreFocusOut: true, - items: await getShowCommitOrStashStepItems(state), + items: getShowCommitOrStashStepItems(state), // additionalButtons: [ShowDetailsView, RevealInSideBar], onDidClickItemButton: (quickpick, button, _item) => { switch (button) { @@ -2186,14 +2214,14 @@ export function* showCommitOrStashFilesStep< return canPickStepContinue(step, state, selection) ? selection[0] : StepResultBreak; } -export async function* showCommitOrStashFileStep< +export function* showCommitOrStashFileStep< State extends PartialStepState & { repo: Repository; reference: GitCommit | GitStashCommit; fileName: string; }, Context extends { repos: Repository[]; title: string }, ->(state: State, context: Context): AsyncStepResultGenerator { +>(state: State, context: Context): StepResultGenerator { const step: QuickPickStep = createPickStep({ title: appendReposToTitle( getReferenceLabel(state.reference, { @@ -2210,7 +2238,7 @@ export async function* showCommitOrStashFileStep< icon: false, })}`, ignoreFocusOut: true, - items: await getShowCommitOrStashFileStepItems(state), + items: getShowCommitOrStashFileStepItems(state), matchOnDescription: true, // additionalButtons: [ShowDetailsView, RevealInSideBar], onDidClickItemButton: (quickpick, button, _item) => { diff --git a/src/commands/quickCommand.ts b/src/commands/quickCommand.ts index 9ab2978560617..899a12d3fb098 100644 --- a/src/commands/quickCommand.ts +++ b/src/commands/quickCommand.ts @@ -54,12 +54,12 @@ export interface QuickPickStep { disallowBack?: boolean; ignoreFocusOut?: boolean; isConfirmationStep?: boolean; - items: (DirectiveQuickPickItem | T)[]; + items: (DirectiveQuickPickItem | T)[] | Promise<(DirectiveQuickPickItem | T)[]>; keys?: StepNavigationKeys[]; matchOnDescription?: boolean; matchOnDetail?: boolean; multiselect?: boolean; - placeholder?: string; + placeholder?: string | ((count: number) => string); selectedItems?: QuickPickItem[]; title?: string; value?: string; From 067f400e7ccd0bbfcf726ff328bacfb2914df112 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 6 Feb 2024 02:06:26 -0500 Subject: [PATCH 0497/1012] Fixes highlander to exclude closed repos --- src/git/gitProviderService.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/git/gitProviderService.ts b/src/git/gitProviderService.ts index 7c8c522da97ab..83d3584706b3b 100644 --- a/src/git/gitProviderService.ts +++ b/src/git/gitProviderService.ts @@ -376,7 +376,9 @@ export class GitProviderService implements Disposable { } get highlander(): Repository | undefined { - return this.repositoryCount === 1 ? first(this._repositories.values()) : undefined; + return this.repositoryCount === 1 || this.openRepositoryCount === 1 + ? first(this._repositories.values()) + : undefined; } // get readonly() { From ae8df95950adab2dec2639ab479643ce57ec05bb Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 6 Feb 2024 03:05:54 -0500 Subject: [PATCH 0498/1012] Adds copy changes to worktree command --- CHANGELOG.md | 1 + package.json | 9 ++ src/commands/git/switch.ts | 17 ++- src/commands/git/worktree.ts | 220 +++++++++++++++++++++++++++++++---- src/commands/gitCommands.ts | 8 ++ src/constants.ts | 1 + 6 files changed, 227 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c64526a959b61..259f4037dc1a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Simplifies the create worktree and open worktree flows — reduces number of steps and options presented - Adds _Create Branch in New Worktree_ confirmation option when creating branches, e.g. via the _GitLens: Git Create Branch..._ command - Adds _Create Worktree for Branch_, _Create Worktree for Local Branch_, and _Create Worktree for New Local Branch_ confirmation options when switching branches, e.g. via the _GitLens: Git Switch to..._ command + - Adds a _Copy Working Changes to Worktree..._ command to the command palette to copy the current working changes to an existing worktree - Avoids prompt to add a (required) remote and instead auto-adds the remote during worktree creation from a pull request - Adds ability to open multiple changes in VS Code's new multi-diff editor, previously experimental and now enabled by default - Adds an inline _Open All Changes_ command to commits, stashes, and comparisons in the views diff --git a/package.json b/package.json index 55bcc21d844b4..e23375df0449c 100644 --- a/package.json +++ b/package.json @@ -5183,6 +5183,11 @@ "title": "Copy as Patch", "category": "GitLens" }, + { + "command": "gitlens.copyWorkingChangesToWorktree", + "title": "Copy Working Changes to Worktree...", + "category": "GitLens" + }, { "command": "gitlens.createPatch", "title": "Create Patch...", @@ -8959,6 +8964,10 @@ "command": "gitlens.copyPatchToClipboard", "when": "gitlens:enabled && !gitlens:untrusted && !gitlens:hasVirtualFolders" }, + { + "command": "gitlens.copyWorkingChangesToWorktree", + "when": "gitlens:enabled && !gitlens:untrusted && !gitlens:hasVirtualFolders" + }, { "command": "gitlens.createPatch", "when": "false && gitlens:enabled && !gitlens:untrusted && !gitlens:hasVirtualFolders" diff --git a/src/commands/git/switch.ts b/src/commands/git/switch.ts index ad32f350ea9fb..996de6c4dfafe 100644 --- a/src/commands/git/switch.ts +++ b/src/commands/git/switch.ts @@ -188,17 +188,16 @@ export class SwitchGitCommand extends QuickCommand { openOnly: true, overrides: { disallowBack: true, - confirmTitle: `Confirm Switch to Worktree \u2022 ${getReferenceLabel( - state.reference, - { + confirmation: { + title: `Confirm Switch to Worktree \u2022 ${getReferenceLabel(state.reference, { icon: false, label: false, - }, - )}`, - confirmPlaceholder: `${getReferenceLabel(state.reference, { - capitalize: true, - icon: false, - })} is linked to a worktree`, + })}`, + placeholder: `${getReferenceLabel(state.reference, { + capitalize: true, + icon: false, + })} is linked to a worktree`, + }, }, }, }, diff --git a/src/commands/git/worktree.ts b/src/commands/git/worktree.ts index 51ba59b777190..86a878b389639 100644 --- a/src/commands/git/worktree.ts +++ b/src/commands/git/worktree.ts @@ -5,11 +5,14 @@ import type { Container } from '../../container'; import { PlusFeatures } from '../../features'; import { convertLocationToOpenFlags, convertOpenFlagsToLocation, reveal } from '../../git/actions/worktree'; import { + ApplyPatchCommitError, + ApplyPatchCommitErrorReason, WorktreeCreateError, WorktreeCreateErrorReason, WorktreeDeleteError, WorktreeDeleteErrorReason, } from '../../git/errors'; +import { uncommitted, uncommittedStaged } from '../../git/models/constants'; import type { GitReference } from '../../git/models/reference'; import { getNameWithoutRemote, @@ -86,6 +89,10 @@ interface CreateState { result?: Deferred; reveal?: boolean; + + overrides?: { + title?: string; + }; } type DeleteFlags = '--force'; @@ -95,6 +102,10 @@ interface DeleteState { repo: string | Repository; uris: Uri[]; flags: DeleteFlags[]; + + overrides?: { + title?: string; + }; } type OpenFlags = '--add-to-workspace' | '--new-window' | '--reveal-explorer'; @@ -108,16 +119,34 @@ interface OpenState { openOnly?: boolean; overrides?: { disallowBack?: boolean; - confirmTitle?: string; - confirmPlaceholder?: string; + title?: string; + + confirmation?: { + title?: string; + placeholder?: string; + }; }; } -type State = CreateState | DeleteState | OpenState; +interface CopyChangesState { + subcommand: 'copy-changes'; + repo: string | Repository; + worktree: GitWorktree; + changes: { contents?: string; type: 'index' | 'working-tree' } | { contents: string; type?: never }; + + overrides?: { + title?: string; + }; +} + +type State = CreateState | DeleteState | OpenState | CopyChangesState; type WorktreeStepState = SomeNonNullable, 'subcommand'>; type CreateStepState = WorktreeStepState>; type DeleteStepState = WorktreeStepState>; type OpenStepState = WorktreeStepState>; +type CopyChangesStepState = WorktreeStepState< + ExcludeSome +>; function assertStateStepRepository( state: PartialStepState, @@ -132,6 +161,7 @@ const subcommandToTitleMap = new Map([ ['create', 'Create'], ['delete', 'Delete'], ['open', 'Open'], + ['copy-changes', 'Copy Changes to'], ]); function getTitle(title: string, subcommand: State['subcommand'] | undefined) { return subcommand == null ? title : `${subcommandToTitleMap.get(subcommand)} ${title}`; @@ -177,6 +207,12 @@ export class WorktreeGitCommand extends QuickCommand { counter++; } + break; + case 'copy-changes': + if (args.state.worktree != null) { + counter++; + } + break; } } @@ -216,7 +252,7 @@ export class WorktreeGitCommand extends QuickCommand { let skippedStepTwo = false; while (this.canStepsContinue(state)) { - context.title = this.title; + context.title = state.overrides?.title ?? this.title; if (state.counter < 1 || state.subcommand == null) { this.subcommand = undefined; @@ -229,6 +265,9 @@ export class WorktreeGitCommand extends QuickCommand { } this.subcommand = state.subcommand; + context.title = + state.overrides?.title ?? + getTitle(state.subcommand === 'delete' ? 'Worktrees' : this.title, state.subcommand); if (state.counter < 2 || state.repo == null || typeof state.repo === 'string') { skippedStepTwo = false; @@ -247,15 +286,15 @@ export class WorktreeGitCommand extends QuickCommand { } } - // Ensure we use the "main" repository if we are in a worktree already - state.repo = (await state.repo.getMainRepository()) ?? state.repo; + if (state.subcommand !== 'copy-changes') { + // Ensure we use the "main" repository if we are in a worktree already + state.repo = (await state.repo.getMainRepository()) ?? state.repo; + } assertStateStepRepository(state); const result = yield* ensureAccessStep(state, context, PlusFeatures.Worktrees); if (result === StepResultBreak) break; - context.title = getTitle(state.subcommand === 'delete' ? 'Worktrees' : this.title, state.subcommand); - switch (state.subcommand) { case 'create': { yield* this.createCommandSteps(state as CreateStepState, context); @@ -275,6 +314,10 @@ export class WorktreeGitCommand extends QuickCommand { yield* this.openCommandSteps(state as OpenStepState, context); break; } + case 'copy-changes': { + yield* this.copyChangesCommandSteps(state as CopyChangesStepState, context); + break; + } default: endSteps(state); break; @@ -561,11 +604,7 @@ export class WorktreeGitCommand extends QuickCommand { counter: 3, confirm: action === 'prompt', openOnly: true, - overrides: { - disallowBack: true, - confirmTitle: 'Open Worktree', - confirmPlaceholder: 'Confirm Open Worktree', - }, + overrides: { disallowBack: true }, } satisfies OpenStepState, context, ); @@ -910,7 +949,7 @@ export class WorktreeGitCommand extends QuickCommand { const result = yield* pickWorktreeStep(state, context, { includeStatus: true, - picked: state.worktree.uri?.toString(), + picked: state.worktree?.uri?.toString(), placeholder: 'Choose worktree to open', }); // Always break on the first step (so we will go back) @@ -919,10 +958,7 @@ export class WorktreeGitCommand extends QuickCommand { state.worktree = result; } - context.title = getTitle( - `Worktree \u2022 ${truncateLeft(basename(state.worktree.uri.path), 40)}`, - state.subcommand, - ); + context.title = getTitle(`Worktree \u2022 ${state.worktree.name}`, state.subcommand); if (this.confirm(state.confirm)) { const result = yield* this.openCommandConfirmStep(state, context); @@ -970,17 +1006,161 @@ export class WorktreeGitCommand extends QuickCommand { } const step = createConfirmStep( - appendReposToTitle(state.overrides?.confirmTitle ?? `Confirm ${context.title}`, state, context), + appendReposToTitle(state.overrides?.confirmation?.title ?? `Confirm ${context.title}`, state, context), confirmations, context, undefined, { disallowBack: state.overrides?.disallowBack, - placeholder: state.overrides?.confirmPlaceholder ?? 'Confirm Open Worktree', + placeholder: state.overrides?.confirmation?.placeholder ?? 'Confirm Open Worktree', }, ); const selection: StepSelection = yield step; return canPickStepContinue(step, state, selection) ? selection[0].item : StepResultBreak; } + + private async *copyChangesCommandSteps(state: CopyChangesStepState, context: Context): StepGenerator { + while (this.canStepsContinue(state)) { + context.title = state?.overrides?.title ?? getTitle('Worktree', state.subcommand); + + if (state.counter < 3 || state.worktree == null) { + context.worktrees ??= await state.repo.getWorktrees(); + + let placeholder; + switch (state.changes.type) { + case 'index': + placeholder = 'Choose a worktree to copy your staged changes to'; + break; + case 'working-tree': + placeholder = 'Choose a worktree to copy your working changes to'; + break; + default: + placeholder = 'Choose a worktree to copy changes to'; + break; + } + + const result = yield* pickWorktreeStep(state, context, { + excludeOpened: true, + includeStatus: true, + picked: state.worktree?.uri?.toString(), + placeholder: placeholder, + }); + // Always break on the first step (so we will go back) + if (result === StepResultBreak) break; + + state.worktree = result; + } + + if (!state.changes.contents) { + const diff = await this.container.git.getDiff( + state.repo.uri, + state.changes.type === 'index' ? uncommittedStaged : uncommitted, + 'HEAD', + ); + if (!diff?.contents) { + void window.showErrorMessage(`No changes to copy`); + + endSteps(state); + break; + } + + state.changes.contents = diff.contents; + } + + if (this.confirm(state.confirm)) { + const result = yield* this.copyChangesCommandConfirmStep(state, context); + if (result === StepResultBreak) continue; + } + + endSteps(state); + + try { + const commit = await this.container.git.createUnreachableCommitForPatch( + state.worktree.uri, + state.changes.contents, + 'HEAD', + 'Copied Changes', + ); + if (commit == null) return; + + await this.container.git.applyUnreachableCommitForPatch(state.worktree.uri, commit.sha); + void window.showInformationMessage(`Changes copied successfully`); + } catch (ex) { + if (ex instanceof ApplyPatchCommitError) { + if (ex.reason === ApplyPatchCommitErrorReason.AppliedWithConflicts) { + void window.showWarningMessage('Changes copied with conflicts'); + } else { + void window.showErrorMessage(ex.message); + return; + } + } else { + void window.showErrorMessage(`Unable to copy changes: ${ex.message}`); + return; + } + } + + yield* this.openCommandSteps( + { + subcommand: 'open', + repo: state.repo, + worktree: state.worktree, + flags: [], + counter: 3, + confirm: true, + openOnly: true, + overrides: { disallowBack: true }, + } satisfies OpenStepState, + context, + ); + } + } + + private async *copyChangesCommandConfirmStep( + state: CopyChangesStepState, + context: Context, + ): AsyncStepResultGenerator { + const files = await this.container.git.getDiffFiles(state.repo.uri, state.changes.contents!); + const count = files?.files.length ?? 0; + + const confirmations = []; + switch (state.changes.type) { + case 'index': + confirmations.push({ + label: 'Copy Staged Changes to Worktree', + detail: `Will copy the staged changes${ + count > 0 ? ` (${pluralize('file', count)})` : '' + } to worktree '${state.worktree.name}'`, + }); + break; + case 'working-tree': + confirmations.push({ + label: 'Copy Working Changes to Worktree', + detail: `Will copy the working changes${ + count > 0 ? ` (${pluralize('file', count)})` : '' + } to worktree '${state.worktree.name}'`, + }); + break; + + default: + confirmations.push( + createFlagsQuickPickItem([], [], { + label: 'Copy Changes to Worktree', + detail: `Will copy the changes${ + count > 0 ? ` (${pluralize('file', count)})` : '' + } to worktree '${state.worktree.name}'`, + }), + ); + break; + } + + const step = createConfirmStep( + `Confirm ${context.title} \u2022 ${state.worktree.name}`, + confirmations, + context, + ); + + const selection: StepSelection = yield step; + return canPickStepContinue(step, state, selection) ? undefined : StepResultBreak; + } } diff --git a/src/commands/gitCommands.ts b/src/commands/gitCommands.ts index 86a01ff70ae7d..2f3811f2f1616 100644 --- a/src/commands/gitCommands.ts +++ b/src/commands/gitCommands.ts @@ -105,6 +105,8 @@ export class GitCommandsCommand extends Command { Commands.GitCommandsWorktreeCreate, Commands.GitCommandsWorktreeDelete, Commands.GitCommandsWorktreeOpen, + + Commands.CopyWorkingChangesToWorktree, ]); } @@ -204,6 +206,12 @@ export class GitCommandsCommand extends Command { case Commands.GitCommandsWorktreeOpen: args = { command: 'worktree', state: { subcommand: 'open' } }; break; + case Commands.CopyWorkingChangesToWorktree: + args = { + command: 'worktree', + state: { subcommand: 'copy-changes', changes: { type: 'working-tree' } }, + }; + break; } return this.execute(args); diff --git a/src/constants.ts b/src/constants.ts index 7bc3610ae4db4..68ef8aac7c652 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -148,6 +148,7 @@ export const enum Commands { CopyRelativePathToClipboard = 'gitlens.copyRelativePathToClipboard', ApplyPatchFromClipboard = 'gitlens.applyPatchFromClipboard', CopyPatchToClipboard = 'gitlens.copyPatchToClipboard', + CopyWorkingChangesToWorktree = 'gitlens.copyWorkingChangesToWorktree', CreatePatch = 'gitlens.createPatch', CreateCloudPatch = 'gitlens.createCloudPatch', CreatePullRequestOnRemote = 'gitlens.createPullRequestOnRemote', From 8974c3b25eae5789526d201bcd056d345adfa5a6 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 6 Feb 2024 10:15:16 -0500 Subject: [PATCH 0499/1012] Fixes build issues --- src/commands/git/branch.ts | 5 +---- src/commands/git/tag.ts | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/commands/git/branch.ts b/src/commands/git/branch.ts index 4e2c64e2dd803..21f7de1e4dc1d 100644 --- a/src/commands/git/branch.ts +++ b/src/commands/git/branch.ts @@ -419,10 +419,7 @@ export class BranchGitCommand extends QuickCommand { return canPickStepContinue(step, state, selection) ? selection[0].item : StepResultBreak; } - private async *deleteCommandSteps( - state: DeleteStepState | PruneStepState, - context: Context, - ): AsyncStepResultGenerator { + private *deleteCommandSteps(state: DeleteStepState | PruneStepState, context: Context): StepResultGenerator { const prune = state.subcommand === 'prune'; if (state.flags == null) { state.flags = []; diff --git a/src/commands/git/tag.ts b/src/commands/git/tag.ts index 3e45da570ce3a..bc8ef75e08e61 100644 --- a/src/commands/git/tag.ts +++ b/src/commands/git/tag.ts @@ -349,7 +349,7 @@ export class TagGitCommand extends QuickCommand { return canPickStepContinue(step, state, selection) ? selection[0].item : StepResultBreak; } - private async *deleteCommandSteps(state: DeleteStepState, context: Context): StepGenerator { + private *deleteCommandSteps(state: DeleteStepState, context: Context): StepGenerator { while (this.canStepsContinue(state)) { if (state.references != null && !Array.isArray(state.references)) { state.references = [state.references]; From 407b9077cff60f7b5fcb36beff42e2552a3e8756 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Fri, 2 Feb 2024 17:05:52 -0500 Subject: [PATCH 0500/1012] Fixes compact button --- src/webviews/apps/shared/components/button.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webviews/apps/shared/components/button.ts b/src/webviews/apps/shared/components/button.ts index 86b41c7e5fe24..bac81c52e38e2 100644 --- a/src/webviews/apps/shared/components/button.ts +++ b/src/webviews/apps/shared/components/button.ts @@ -111,7 +111,7 @@ export class GlButton extends LitElement { width: max-content; } - :host([density='compact']) { + :host([density='compact']) .control { padding: var(--button-compact-padding); } From 07e6200f140194d4ddc8666675b75241fe9ee68a Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 6 Feb 2024 13:56:40 -0500 Subject: [PATCH 0501/1012] Fixes switch to local branch on a worktree --- src/commands/git/switch.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/commands/git/switch.ts b/src/commands/git/switch.ts index 996de6c4dfafe..8528af2c18602 100644 --- a/src/commands/git/switch.ts +++ b/src/commands/git/switch.ts @@ -127,7 +127,7 @@ export class SwitchGitCommand extends QuickCommand { let skippedStepOne = false; - while (this.canStepsContinue(state)) { + outer: while (this.canStepsContinue(state)) { context.title = this.title; if (state.counter < 1 || state.repos == null || state.repos.length === 0 || isStringArray(state.repos)) { @@ -178,6 +178,10 @@ export class SwitchGitCommand extends QuickCommand { w => w.branch === state.reference!.name, ); if (worktree != null) { + if (state.fastForwardTo != null) { + state.repos[0].merge('--ff-only', state.fastForwardTo.ref); + } + const worktreeResult = yield* getSteps( this.container, { @@ -232,12 +236,12 @@ export class SwitchGitCommand extends QuickCommand { switch (result) { case 'switchToLocalBranch': state.reference = context.canSwitchToLocalBranch!; - break; + continue outer; case 'switchToLocalBranchAndFastForward': state.fastForwardTo = state.reference; state.reference = context.canSwitchToLocalBranch!; - break; + continue outer; case 'switchToNewBranch': { context.title = `Switch to New Branch`; @@ -254,7 +258,7 @@ export class SwitchGitCommand extends QuickCommand { this._canConfirmOverride = undefined; - if (result === StepResultBreak) continue; + if (result === StepResultBreak) continue outer; state.createBranch = result; break; @@ -278,7 +282,7 @@ export class SwitchGitCommand extends QuickCommand { }, this.pickedVia, ); - if (worktreeResult === StepResultBreak) continue; + if (worktreeResult === StepResultBreak) continue outer; endSteps(state); return; From 6a9f2c22d284952f50cf560e50fc3a5988256004 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 6 Feb 2024 14:00:45 -0500 Subject: [PATCH 0502/1012] Avoids stashing working changes on copy/paste patch --- src/commands/git/worktree.ts | 2 +- src/commands/patches.ts | 2 +- src/env/node/git/localGitProvider.ts | 34 ++++++++++--------- src/git/gitProvider.ts | 2 +- src/git/gitProviderService.ts | 2 +- .../patchDetails/patchDetailsWebview.ts | 5 ++- 6 files changed, 26 insertions(+), 21 deletions(-) diff --git a/src/commands/git/worktree.ts b/src/commands/git/worktree.ts index 86a878b389639..bf6462c3c9ce4 100644 --- a/src/commands/git/worktree.ts +++ b/src/commands/git/worktree.ts @@ -1084,7 +1084,7 @@ export class WorktreeGitCommand extends QuickCommand { ); if (commit == null) return; - await this.container.git.applyUnreachableCommitForPatch(state.worktree.uri, commit.sha); + await this.container.git.applyUnreachableCommitForPatch(state.worktree.uri, commit.sha, { stash: false }); void window.showInformationMessage(`Changes copied successfully`); } catch (ex) { if (ex instanceof ApplyPatchCommitError) { diff --git a/src/commands/patches.ts b/src/commands/patches.ts index 4a1b764ba90a0..3783b40fa3f7d 100644 --- a/src/commands/patches.ts +++ b/src/commands/patches.ts @@ -192,7 +192,7 @@ export class ApplyPatchFromClipboardCommand extends Command { ); if (commit == null) return; - await this.container.git.applyUnreachableCommitForPatch(repo.uri, commit.sha); + await this.container.git.applyUnreachableCommitForPatch(repo.uri, commit.sha, { stash: false }); void window.showInformationMessage(`Patch applied successfully`); } catch (ex) { if (ex instanceof ApplyPatchCommitError) { diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts index 7b24b0e462bec..3282fb5f7899f 100644 --- a/src/env/node/git/localGitProvider.ts +++ b/src/env/node/git/localGitProvider.ts @@ -1081,25 +1081,27 @@ export class LocalGitProvider implements GitProvider, Disposable { async applyUnreachableCommitForPatch( repoPath: string, ref: string, - options?: { branchName?: string; createBranchIfNeeded?: boolean; createWorktreePath?: string }, + options?: { branchName?: string; createBranchIfNeeded?: boolean; createWorktreePath?: string; stash?: boolean }, ): Promise { const scope = getLogScope(); - // Stash any changes first - const status = await this.getStatusForRepo(repoPath); - if (status?.files?.length) { - // TODO@eamodio we should probably prompt the user or provide a flag to prompt or not /cc @axosoft-ramint - try { - await this.git.stash__push(repoPath, undefined, { includeUntracked: true }); - } catch (ex) { - Logger.error(ex, scope); - throw new ApplyPatchCommitError( - ApplyPatchCommitErrorReason.StashFailed, - `Unable to apply patch; failed stashing working changes changes${ - ex instanceof StashPushError ? `: ${ex.message}` : '' - }`, - ex, - ); + if (options?.stash) { + // Stash any changes first + const status = await this.getStatusForRepo(repoPath); + if (status?.files?.length) { + // TODO@eamodio we should probably prompt the user or provide a flag to prompt or not /cc @axosoft-ramint + try { + await this.git.stash__push(repoPath, undefined, { includeUntracked: true }); + } catch (ex) { + Logger.error(ex, scope); + throw new ApplyPatchCommitError( + ApplyPatchCommitErrorReason.StashFailed, + `Unable to apply patch; failed stashing working changes changes${ + ex instanceof StashPushError ? `: ${ex.message}` : '' + }`, + ex, + ); + } } } diff --git a/src/git/gitProvider.ts b/src/git/gitProvider.ts index d9f01394d7411..64cdbe537fe3e 100644 --- a/src/git/gitProvider.ts +++ b/src/git/gitProvider.ts @@ -141,7 +141,7 @@ export interface GitProvider extends Disposable { applyUnreachableCommitForPatch?( repoPath: string, ref: string, - options?: { branchName?: string; createBranchIfNeeded?: boolean; createWorktreePath?: string }, + options?: { branchName?: string; createBranchIfNeeded?: boolean; createWorktreePath?: string; stash?: boolean }, ): Promise; checkout( repoPath: string, diff --git a/src/git/gitProviderService.ts b/src/git/gitProviderService.ts index 83d3584706b3b..2631fa071f684 100644 --- a/src/git/gitProviderService.ts +++ b/src/git/gitProviderService.ts @@ -1285,7 +1285,7 @@ export class GitProviderService implements Disposable { async applyUnreachableCommitForPatch( repoPath: string | Uri, ref: string, - options?: { branchName?: string; createBranchIfNeeded?: boolean; createWorktreePath?: string }, + options?: { branchName?: string; createBranchIfNeeded?: boolean; createWorktreePath?: string; stash?: boolean }, ): Promise { const { provider, path } = this.getProvider(repoPath); return provider.applyUnreachableCommitForPatch?.(path, ref, options); diff --git a/src/plus/webviews/patchDetails/patchDetailsWebview.ts b/src/plus/webviews/patchDetails/patchDetailsWebview.ts index a209375159771..371d2b1169c33 100644 --- a/src/plus/webviews/patchDetails/patchDetailsWebview.ts +++ b/src/plus/webviews/patchDetails/patchDetailsWebview.ts @@ -446,7 +446,10 @@ export class PatchDetailsWebviewProvider }; } - await this.container.git.applyUnreachableCommitForPatch(commit.repoPath, commit.ref, options); + await this.container.git.applyUnreachableCommitForPatch(commit.repoPath, commit.ref, { + stash: true, + ...options, + }); void window.showInformationMessage(`Patch applied successfully`); } catch (ex) { if (ex instanceof ApplyPatchCommitError) { From 5caca104a38e4b3cf4b54999f79c1791f57eb052 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 6 Feb 2024 15:35:30 -0500 Subject: [PATCH 0503/1012] Adds copy changes to worktree to graph --- CHANGELOG.md | 2 +- package.json | 14 ++++++++++++++ src/git/actions/worktree.ts | 18 ++++++++++++++++++ src/plus/webviews/graph/graphWebview.ts | 12 ++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 259f4037dc1a8..1d273245562a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Simplifies the create worktree and open worktree flows — reduces number of steps and options presented - Adds _Create Branch in New Worktree_ confirmation option when creating branches, e.g. via the _GitLens: Git Create Branch..._ command - Adds _Create Worktree for Branch_, _Create Worktree for Local Branch_, and _Create Worktree for New Local Branch_ confirmation options when switching branches, e.g. via the _GitLens: Git Switch to..._ command - - Adds a _Copy Working Changes to Worktree..._ command to the command palette to copy the current working changes to an existing worktree + - Adds a _Copy Working Changes to Worktree..._ command to the _Commit Graph_ and command palette to copy the current working changes to an existing worktree - Avoids prompt to add a (required) remote and instead auto-adds the remote during worktree creation from a pull request - Adds ability to open multiple changes in VS Code's new multi-diff editor, previously experimental and now enabled by default - Adds an inline _Open All Changes_ command to commits, stashes, and comparisons in the views diff --git a/package.json b/package.json index e23375df0449c..3913cfeff6ca7 100644 --- a/package.json +++ b/package.json @@ -5188,6 +5188,11 @@ "title": "Copy Working Changes to Worktree...", "category": "GitLens" }, + { + "command": "gitlens.graph.copyWorkingChangesToWorktree", + "title": "Copy Working Changes to Worktree...", + "category": "GitLens" + }, { "command": "gitlens.createPatch", "title": "Create Patch...", @@ -8968,6 +8973,10 @@ "command": "gitlens.copyWorkingChangesToWorktree", "when": "gitlens:enabled && !gitlens:untrusted && !gitlens:hasVirtualFolders" }, + { + "command": "gitlens.graph.copyWorkingChangesToWorktree", + "when": "false" + }, { "command": "gitlens.createPatch", "when": "false && gitlens:enabled && !gitlens:untrusted && !gitlens:hasVirtualFolders" @@ -14470,6 +14479,11 @@ "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && webviewItem == gitlens:wip", "group": "1_gitlens_actions@3" }, + { + "command": "gitlens.graph.copyWorkingChangesToWorktree", + "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && webviewItem == gitlens:wip", + "group": "1_gitlens_actions@4" + }, { "command": "gitlens.graph.switchToTag", "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && webviewItem =~ /gitlens:tag\\b/", diff --git a/src/git/actions/worktree.ts b/src/git/actions/worktree.ts index 967c2853baf1a..a3887cdbf11cc 100644 --- a/src/git/actions/worktree.ts +++ b/src/git/actions/worktree.ts @@ -39,6 +39,24 @@ export async function create( return undefined; } +export function copyChangesToWorktree( + type: 'working-tree' | 'index', + repo?: string | Repository, + worktree?: GitWorktree, +) { + return executeGitCommand({ + command: 'worktree', + state: { + subcommand: 'copy-changes', + repo: repo, + worktree: worktree, + changes: { + type: type, + }, + }, + }); +} + export function open(worktree: GitWorktree, options?: { location?: OpenWorkspaceLocation; openOnly?: boolean }) { return executeGitCommand({ command: 'worktree', diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts index 7573efe4b4a55..6ebaafb8ab0b8 100644 --- a/src/plus/webviews/graph/graphWebview.ts +++ b/src/plus/webviews/graph/graphWebview.ts @@ -555,6 +555,11 @@ export class GraphWebviewProvider implements WebviewProvider this.updateColumns(compactGraphColumnsSettings), ), + + this.host.registerWebviewCommand( + 'gitlens.graph.copyWorkingChangesToWorktree', + this.copyWorkingChangesToWorktree, + ), ]; } @@ -2771,6 +2776,13 @@ export class GraphWebviewProvider implements WebviewProvider Date: Tue, 6 Feb 2024 19:21:35 -0500 Subject: [PATCH 0504/1012] Fixes issues w/ copying changes to worktree --- src/commands/git/worktree.ts | 28 +++++++++++++++++++++++----- src/env/node/git/git.ts | 4 ++-- src/env/node/git/localGitProvider.ts | 22 ++++++++++++++++------ src/git/errors.ts | 19 ++++++++++--------- 4 files changed, 51 insertions(+), 22 deletions(-) diff --git a/src/commands/git/worktree.ts b/src/commands/git/worktree.ts index bf6462c3c9ce4..992ce1d766c12 100644 --- a/src/commands/git/worktree.ts +++ b/src/commands/git/worktree.ts @@ -19,6 +19,7 @@ import { getReferenceLabel, isBranchReference, isRevisionReference, + isSha, } from '../../git/models/reference'; import type { Repository } from '../../git/models/repository'; import { GitWorktree } from '../../git/models/worktree'; @@ -132,7 +133,9 @@ interface CopyChangesState { subcommand: 'copy-changes'; repo: string | Repository; worktree: GitWorktree; - changes: { contents?: string; type: 'index' | 'working-tree' } | { contents: string; type?: never }; + changes: + | { baseSha?: string; contents?: string; type: 'index' | 'working-tree' } + | { baseSha: string; contents: string; type?: 'index' | 'working-tree' }; overrides?: { title?: string; @@ -1052,7 +1055,7 @@ export class WorktreeGitCommand extends QuickCommand { state.worktree = result; } - if (!state.changes.contents) { + if (!state.changes.contents || !state.changes.baseSha) { const diff = await this.container.git.getDiff( state.repo.uri, state.changes.type === 'index' ? uncommittedStaged : uncommitted, @@ -1066,6 +1069,14 @@ export class WorktreeGitCommand extends QuickCommand { } state.changes.contents = diff.contents; + state.changes.baseSha = diff.from; + } + + if (!isSha(state.changes.baseSha)) { + const commit = await this.container.git.getCommit(state.repo.uri, state.changes.baseSha); + if (commit != null) { + state.changes.baseSha = commit.sha; + } } if (this.confirm(state.confirm)) { @@ -1079,19 +1090,26 @@ export class WorktreeGitCommand extends QuickCommand { const commit = await this.container.git.createUnreachableCommitForPatch( state.worktree.uri, state.changes.contents, - 'HEAD', + state.changes.baseSha, 'Copied Changes', ); if (commit == null) return; - await this.container.git.applyUnreachableCommitForPatch(state.worktree.uri, commit.sha, { stash: false }); + await this.container.git.applyUnreachableCommitForPatch(state.worktree.uri, commit.sha, { + stash: false, + }); void window.showInformationMessage(`Changes copied successfully`); } catch (ex) { if (ex instanceof ApplyPatchCommitError) { if (ex.reason === ApplyPatchCommitErrorReason.AppliedWithConflicts) { void window.showWarningMessage('Changes copied with conflicts'); + } else if (ex.reason === ApplyPatchCommitErrorReason.ApplyAbortedWouldOverwrite) { + void window.showErrorMessage( + 'Unable to copy changes as some local changes would be overwritten', + ); + return; } else { - void window.showErrorMessage(ex.message); + void window.showErrorMessage(`Unable to copy changes: ${ex.message}`); return; } } else { diff --git a/src/env/node/git/git.ts b/src/env/node/git/git.ts index 50672d0ad5185..76e405a0348b9 100644 --- a/src/env/node/git/git.ts +++ b/src/env/node/git/git.ts @@ -611,9 +611,9 @@ export class Git { GitErrors.changesWouldBeOverwritten.test(msg) || GitErrors.changesWouldBeOverwritten.test(ex.stderr ?? '') ) { - reason = CherryPickErrorReason.OverwrittenChanges; + reason = CherryPickErrorReason.AbortedWouldOverwrite; } else if (GitErrors.conflict.test(msg) || GitErrors.conflict.test(ex.stdout ?? '')) { - reason = CherryPickErrorReason.Conflict; + reason = CherryPickErrorReason.Conflicts; } throw new CherryPickError(reason, ex, sha); diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts index 3282fb5f7899f..321933cb7f5f2 100644 --- a/src/env/node/git/localGitProvider.ts +++ b/src/env/node/git/localGitProvider.ts @@ -1166,12 +1166,22 @@ export class LocalGitProvider implements GitProvider, Disposable { await this.git.cherrypick(targetPath, ref, { noCommit: true, errors: GitErrorHandling.Throw }); } catch (ex) { Logger.error(ex, scope); - if (ex instanceof CherryPickError && ex.reason === CherryPickErrorReason.Conflict) { - throw new ApplyPatchCommitError( - ApplyPatchCommitErrorReason.AppliedWithConflicts, - `Patch applied with conflicts`, - ex, - ); + if (ex instanceof CherryPickError) { + if (ex.reason === CherryPickErrorReason.Conflicts) { + throw new ApplyPatchCommitError( + ApplyPatchCommitErrorReason.AppliedWithConflicts, + `Patch applied with conflicts`, + ex, + ); + } + + if (ex.reason === CherryPickErrorReason.AbortedWouldOverwrite) { + throw new ApplyPatchCommitError( + ApplyPatchCommitErrorReason.ApplyAbortedWouldOverwrite, + `Unable to apply patch as some local changes would be overwritten`, + ex, + ); + } } throw new ApplyPatchCommitError( diff --git a/src/git/errors.ts b/src/git/errors.ts index 806c97c855039..4e551c5daed94 100644 --- a/src/git/errors.ts +++ b/src/git/errors.ts @@ -7,10 +7,11 @@ export class GitSearchError extends Error { } export const enum ApplyPatchCommitErrorReason { - StashFailed = 1, - CreateWorktreeFailed = 2, - ApplyFailed = 3, - AppliedWithConflicts = 4, + StashFailed, + CreateWorktreeFailed, + ApplyFailed, + ApplyAbortedWouldOverwrite, + AppliedWithConflicts, } export class ApplyPatchCommitError extends Error { @@ -352,8 +353,8 @@ export class FetchError extends Error { } export const enum CherryPickErrorReason { - Conflict, - OverwrittenChanges, + Conflicts, + AbortedWouldOverwrite, Other, } @@ -379,10 +380,10 @@ export class CherryPickError extends Error { } else { reason = messageOrReason; switch (reason) { - case CherryPickErrorReason.OverwrittenChanges: - message = `${baseMessage} because local changes to some files would be overwritten.`; + case CherryPickErrorReason.AbortedWouldOverwrite: + message = `${baseMessage} as some local changes would be overwritten.`; break; - case CherryPickErrorReason.Conflict: + case CherryPickErrorReason.Conflicts: message = `${baseMessage} due to conflicts.`; break; default: From b4b939e14d7fdafeef293c4bebb13320502ecf01 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Wed, 7 Feb 2024 17:08:47 -0500 Subject: [PATCH 0505/1012] Fixes checkbox color and focus state --- src/webviews/apps/shared/base.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/webviews/apps/shared/base.scss b/src/webviews/apps/shared/base.scss index e575c8bb345e2..dc9186123ef9d 100644 --- a/src/webviews/apps/shared/base.scss +++ b/src/webviews/apps/shared/base.scss @@ -127,12 +127,13 @@ input[type='checkbox'] { cursor: pointer; margin: 0; padding: 0 10px; - mix-blend-mode: luminosity; + accent-color: var(--color-background--lighten-30); &:focus { background: rgba(0, 0, 0, 0.1); border-radius: 5px; - outline: none; + outline: 1px solid var(--vscode-focusBorder); + outline-offset: -1px; } &[disabled] { From f32adcffeef48e6f33511402d7a1bd8734aa881c Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Wed, 7 Feb 2024 17:22:13 -0500 Subject: [PATCH 0506/1012] Updates checkbox color for light themes --- src/webviews/apps/shared/base.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/webviews/apps/shared/base.scss b/src/webviews/apps/shared/base.scss index dc9186123ef9d..3a055a1145edc 100644 --- a/src/webviews/apps/shared/base.scss +++ b/src/webviews/apps/shared/base.scss @@ -140,6 +140,11 @@ input[type='checkbox'] { color: var(--color-foreground--75); cursor: default; } + + .vscode-high-contrast-light &, + .vscode-light & { + accent-color: var(--color-background--darken-50); + } } input[type='number'], From 0cae13f14bb91f3ff1806c35d068ff1c34cc46fa Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 7 Feb 2024 22:55:53 -0500 Subject: [PATCH 0507/1012] Moves GitRemote static methods to functions --- src/commands/base.ts | 5 +- src/commands/openOnRemote.ts | 5 +- src/commands/quickCommand.steps.ts | 7 +- src/commands/remoteProviders.ts | 7 +- src/env/node/git/localGitProvider.ts | 5 +- src/git/formatters/commitFormatter.ts | 5 +- src/git/models/remote.ts | 104 +++++++++--------- src/quickpicks/remoteProviderPicker.ts | 7 +- .../nodes/abstract/repositoryFolderNode.ts | 4 +- src/views/nodes/branchNode.ts | 4 +- src/views/nodes/branchTrackingStatusNode.ts | 4 +- src/views/nodes/repositoryNode.ts | 4 +- src/views/nodes/worktreeNode.ts | 4 +- 13 files changed, 86 insertions(+), 79 deletions(-) diff --git a/src/commands/base.ts b/src/commands/base.ts index b60d1aede3952..5a7e95152c8f6 100644 --- a/src/commands/base.ts +++ b/src/commands/base.ts @@ -17,7 +17,8 @@ import { isCommit } from '../git/models/commit'; import { GitContributor } from '../git/models/contributor'; import type { GitFile } from '../git/models/file'; import type { GitReference } from '../git/models/reference'; -import { GitRemote } from '../git/models/remote'; +import type { GitRemote } from '../git/models/remote'; +import { isRemote } from '../git/models/remote'; import { Repository } from '../git/models/repository'; import type { GitTag } from '../git/models/tag'; import { isTag } from '../git/models/tag'; @@ -187,7 +188,7 @@ export function isCommandContextViewNodeHasRemote( ): context is CommandViewNodeContext & { node: ViewNode & { remote: GitRemote } } { if (context.type !== 'viewItem') return false; - return GitRemote.is((context.node as ViewNode & { remote: GitRemote }).remote); + return isRemote((context.node as ViewNode & { remote: GitRemote }).remote); } export function isCommandContextViewNodeHasRepository( diff --git a/src/commands/openOnRemote.ts b/src/commands/openOnRemote.ts index 21d39adc3f3a5..4bcca08fbb28f 100644 --- a/src/commands/openOnRemote.ts +++ b/src/commands/openOnRemote.ts @@ -1,7 +1,8 @@ import { Commands, GlyphChars } from '../constants'; import type { Container } from '../container'; import { createRevisionRange, shortenRevision } from '../git/models/reference'; -import { GitRemote } from '../git/models/remote'; +import type { GitRemote } from '../git/models/remote'; +import { getHighlanderProviders } from '../git/models/remote'; import type { RemoteResource } from '../git/models/remoteResource'; import { RemoteResourceType } from '../git/models/remoteResource'; import type { RemoteProvider } from '../git/remotes/remoteProvider'; @@ -76,7 +77,7 @@ export class OpenOnRemoteCommand extends Command { } } - const providers = GitRemote.getHighlanderProviders(remotes); + const providers = getHighlanderProviders(remotes); const provider = providers?.length ? providers[0].name : 'Remote'; const options: Parameters[4] = { diff --git a/src/commands/quickCommand.steps.ts b/src/commands/quickCommand.steps.ts index 904babb87ed5f..f240f8c8e7f35 100644 --- a/src/commands/quickCommand.steps.ts +++ b/src/commands/quickCommand.steps.ts @@ -29,7 +29,8 @@ import { isStashReference, isTagReference, } from '../git/models/reference'; -import { GitRemote } from '../git/models/remote'; +import type { GitRemote } from '../git/models/remote'; +import { getHighlanderProviderName } from '../git/models/remote'; import { RemoteResourceType } from '../git/models/remoteResource'; import { Repository } from '../git/models/repository'; import type { GitStash } from '../git/models/stash'; @@ -1971,7 +1972,7 @@ async function getShowCommitOrStashStepItems< const remotes = await Container.instance.git.getRemotesWithProviders(state.repo.path, { sort: true }); if (remotes?.length) { items.push( - createQuickPickSeparator(GitRemote.getHighlanderProviderName(remotes) ?? 'Remote'), + createQuickPickSeparator(getHighlanderProviderName(remotes) ?? 'Remote'), new OpenRemoteResourceCommandQuickPickItem(remotes, { type: RemoteResourceType.Commit, sha: state.reference.sha, @@ -2309,7 +2310,7 @@ async function getShowCommitOrStashFileStepItems< const remotes = await Container.instance.git.getRemotesWithProviders(state.repo.path, { sort: true }); if (remotes?.length) { items.push( - createQuickPickSeparator(GitRemote.getHighlanderProviderName(remotes) ?? 'Remote'), + createQuickPickSeparator(getHighlanderProviderName(remotes) ?? 'Remote'), new OpenRemoteResourceCommandQuickPickItem(remotes, { type: RemoteResourceType.Revision, fileName: state.fileName, diff --git a/src/commands/remoteProviders.ts b/src/commands/remoteProviders.ts index 3cbe959f6591d..e61782e050e46 100644 --- a/src/commands/remoteProviders.ts +++ b/src/commands/remoteProviders.ts @@ -1,7 +1,8 @@ import { Commands } from '../constants'; import type { Container } from '../container'; import type { GitCommit } from '../git/models/commit'; -import { GitRemote } from '../git/models/remote'; +import type { GitRemote } from '../git/models/remote'; +import { isRemote } from '../git/models/remote'; import type { Repository } from '../git/models/repository'; import type { RemoteProvider } from '../git/remotes/remoteProvider'; import { showRepositoryPicker } from '../quickpicks/repositoryPicker'; @@ -21,7 +22,7 @@ export class ConnectRemoteProviderCommand extends Command { static getMarkdownCommandArgs(remote: GitRemote): string; static getMarkdownCommandArgs(argsOrRemote: ConnectRemoteProviderCommandArgs | GitRemote): string { let args: ConnectRemoteProviderCommandArgs | GitCommit; - if (GitRemote.is(argsOrRemote)) { + if (isRemote(argsOrRemote)) { args = { remote: argsOrRemote.name, repoPath: argsOrRemote.repoPath, @@ -113,7 +114,7 @@ export class DisconnectRemoteProviderCommand extends Command { static getMarkdownCommandArgs(remote: GitRemote): string; static getMarkdownCommandArgs(argsOrRemote: DisconnectRemoteProviderCommandArgs | GitRemote): string { let args: DisconnectRemoteProviderCommandArgs | GitCommit; - if (GitRemote.is(argsOrRemote)) { + if (isRemote(argsOrRemote)) { args = { remote: argsOrRemote.name, repoPath: argsOrRemote.repoPath, diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts index 321933cb7f5f2..61df031e9b93b 100644 --- a/src/env/node/git/localGitProvider.ts +++ b/src/env/node/git/localGitProvider.ts @@ -105,7 +105,8 @@ import { shortenRevision, } from '../../../git/models/reference'; import type { GitReflog } from '../../../git/models/reflog'; -import { getRemoteIconUri, getVisibilityCacheKey, GitRemote } from '../../../git/models/remote'; +import type { GitRemote } from '../../../git/models/remote'; +import { getRemoteIconUri, getVisibilityCacheKey, sortRemotes } from '../../../git/models/remote'; import { RemoteResourceType } from '../../../git/models/remoteResource'; import type { RepositoryChangeEvent } from '../../../git/models/repository'; import { Repository, RepositoryChange, RepositoryChangeComparisonMode } from '../../../git/models/repository'; @@ -4678,7 +4679,7 @@ export class LocalGitProvider implements GitProvider, Disposable { const remotes = await remotesPromise; if (options?.sort) { - GitRemote.sort(remotes); + sortRemotes(remotes); } return remotes; diff --git a/src/git/formatters/commitFormatter.ts b/src/git/formatters/commitFormatter.ts index a88b06d66648e..df4f697a8f9a6 100644 --- a/src/git/formatters/commitFormatter.ts +++ b/src/git/formatters/commitFormatter.ts @@ -34,7 +34,8 @@ import { uncommitted, uncommittedStaged } from '../models/constants'; import { getIssueOrPullRequestMarkdownIcon } from '../models/issue'; import { PullRequest } from '../models/pullRequest'; import { getReferenceFromRevision, isUncommittedStaged, shortenRevision } from '../models/reference'; -import { GitRemote } from '../models/remote'; +import type { GitRemote } from '../models/remote'; +import { getHighlanderProviders } from '../models/remote'; import type { RemoteProvider } from '../remotes/remoteProvider'; import type { FormatOptions, RequiredTokenOptions } from './formatter'; import { Formatter } from './formatter'; @@ -446,7 +447,7 @@ export class CommitFormatter extends Formatter { const { pullRequest: pr, remotes } = this._options; if (remotes?.length) { - const providers = GitRemote.getHighlanderProviders(remotes); + const providers = getHighlanderProviders(remotes); commands += `  [$(globe)](${OpenCommitOnRemoteCommand.getMarkdownCommandArgs( this._item.sha, diff --git a/src/git/models/remote.ts b/src/git/models/remote.ts index bc5eff3920ffd..25b6dead7f9f9 100644 --- a/src/git/models/remote.ts +++ b/src/git/models/remote.ts @@ -12,45 +12,6 @@ import type { RemoteProvider } from '../remotes/remoteProvider'; export type GitRemoteType = 'fetch' | 'push'; export class GitRemote { - static getHighlanderProviders(remotes: GitRemote[]) { - if (remotes.length === 0) return undefined; - - const remote = remotes.length === 1 ? remotes[0] : remotes.find(r => r.default); - if (remote != null) return [remote.provider]; - - const providerName = remotes[0].provider.name; - if (remotes.every(r => r.provider.name === providerName)) return remotes.map(r => r.provider); - - return undefined; - } - - static getHighlanderProviderName(remotes: GitRemote[]) { - if (remotes.length === 0) return undefined; - - const remote = remotes.length === 1 ? remotes[0] : remotes.find(r => r.default); - if (remote != null) return remote.provider.name; - - const providerName = remotes[0].provider.name; - // Only use the real provider name if there is only 1 type of provider - if (remotes.every(r => r.provider.name === providerName)) return providerName; - - return undefined; - } - - static is(remote: any): remote is GitRemote { - return remote instanceof GitRemote; - } - - static sort(remotes: GitRemote[]) { - return remotes.sort( - (a, b) => - (a.default ? -1 : 1) - (b.default ? -1 : 1) || - (a.name === 'origin' ? -1 : 1) - (b.name === 'origin' ? -1 : 1) || - (a.name === 'upstream' ? -1 : 1) - (b.name === 'upstream' ? -1 : 1) || - sortCompare(a.name, b.name), - ); - } - constructor( private readonly container: Container, public readonly repoPath: string, @@ -135,6 +96,31 @@ export class GitRemote[]) { + if (remotes.length === 0) return undefined; + + const remote = remotes.length === 1 ? remotes[0] : remotes.find(r => r.default); + if (remote != null) return [remote.provider]; + + const providerName = remotes[0].provider.name; + if (remotes.every(r => r.provider.name === providerName)) return remotes.map(r => r.provider); + + return undefined; +} + +export function getHighlanderProviderName(remotes: GitRemote[]) { + if (remotes.length === 0) return undefined; + + const remote = remotes.length === 1 ? remotes[0] : remotes.find(r => r.default); + if (remote != null) return remote.provider.name; + + const providerName = remotes[0].provider.name; + // Only use the real provider name if there is only 1 type of provider + if (remotes.every(r => r.provider.name === providerName)) return providerName; + + return undefined; +} + export function getRemoteArrowsGlyph(remote: GitRemote): GlyphChars { let arrows; let left; @@ -164,19 +150,6 @@ export function getRemoteArrowsGlyph(remote: GitRemote): GlyphChars { return arrows; } -export function getRemoteUpstreamDescription(remote: GitRemote): string { - const arrows = getRemoteArrowsGlyph(remote); - - const { provider } = remote; - if (provider != null) { - return `${arrows}${GlyphChars.Space} ${provider.name} ${GlyphChars.Space}${GlyphChars.Dot}${GlyphChars.Space} ${provider.displayPath}`; - } - - return `${arrows}${GlyphChars.Space} ${ - remote.domain ? `${remote.domain} ${GlyphChars.Space}${GlyphChars.Dot}${GlyphChars.Space} ` : '' - }${remote.path}`; -} - export function getRemoteIconUri( container: Container, remote: GitRemote, @@ -192,6 +165,19 @@ export function getRemoteIconUri( return asWebviewUri != null ? asWebviewUri(uri) : uri; } +export function getRemoteUpstreamDescription(remote: GitRemote): string { + const arrows = getRemoteArrowsGlyph(remote); + + const { provider } = remote; + if (provider != null) { + return `${arrows}${GlyphChars.Space} ${provider.name} ${GlyphChars.Space}${GlyphChars.Dot}${GlyphChars.Space} ${provider.displayPath}`; + } + + return `${arrows}${GlyphChars.Space} ${ + remote.domain ? `${remote.domain} ${GlyphChars.Space}${GlyphChars.Dot}${GlyphChars.Space} ` : '' + }${remote.path}`; +} + export function getVisibilityCacheKey(remote: GitRemote): string; export function getVisibilityCacheKey(remotes: GitRemote[]): string; export function getVisibilityCacheKey(remotes: GitRemote | GitRemote[]): string { @@ -201,3 +187,17 @@ export function getVisibilityCacheKey(remotes: GitRemote | GitRemote[]): string .sort() .join(','); } + +export function isRemote(remote: any): remote is GitRemote { + return remote instanceof GitRemote; +} + +export function sortRemotes(remotes: T[]) { + return remotes.sort( + (a, b) => + (a.default ? -1 : 1) - (b.default ? -1 : 1) || + (a.name === 'origin' ? -1 : 1) - (b.name === 'origin' ? -1 : 1) || + (a.name === 'upstream' ? -1 : 1) - (b.name === 'upstream' ? -1 : 1) || + sortCompare(a.name, b.name), + ); +} diff --git a/src/quickpicks/remoteProviderPicker.ts b/src/quickpicks/remoteProviderPicker.ts index 5d244aa3fd902..0e24b853f6587 100644 --- a/src/quickpicks/remoteProviderPicker.ts +++ b/src/quickpicks/remoteProviderPicker.ts @@ -6,7 +6,8 @@ import type { Keys } from '../constants'; import { Commands, GlyphChars } from '../constants'; import { Container } from '../container'; import { getBranchNameWithoutRemote, getRemoteNameFromBranchName } from '../git/models/branch'; -import { GitRemote } from '../git/models/remote'; +import type { GitRemote } from '../git/models/remote'; +import { getHighlanderProviders } from '../git/models/remote'; import type { RemoteResource } from '../git/models/remoteResource'; import { getNameFromRemoteResource, RemoteResourceType } from '../git/models/remoteResource'; import type { RemoteProvider } from '../git/remotes/remoteProvider'; @@ -97,7 +98,7 @@ export class CopyOrOpenRemoteCommandQuickPickItem extends CommandQuickPickItem { export class CopyRemoteResourceCommandQuickPickItem extends CommandQuickPickItem { constructor(remotes: GitRemote[], resource: RemoteResource) { - const providers = GitRemote.getHighlanderProviders(remotes); + const providers = getHighlanderProviders(remotes); const commandArgs: OpenOnRemoteCommandArgs = { resource: resource, remotes: remotes, @@ -117,7 +118,7 @@ export class CopyRemoteResourceCommandQuickPickItem extends CommandQuickPickItem export class OpenRemoteResourceCommandQuickPickItem extends CommandQuickPickItem { constructor(remotes: GitRemote[], resource: RemoteResource) { - const providers = GitRemote.getHighlanderProviders(remotes); + const providers = getHighlanderProviders(remotes); const commandArgs: OpenOnRemoteCommandArgs = { resource: resource, remotes: remotes, diff --git a/src/views/nodes/abstract/repositoryFolderNode.ts b/src/views/nodes/abstract/repositoryFolderNode.ts index 264713348805a..904467b208807 100644 --- a/src/views/nodes/abstract/repositoryFolderNode.ts +++ b/src/views/nodes/abstract/repositoryFolderNode.ts @@ -2,7 +2,7 @@ import type { Disposable } from 'vscode'; import { MarkdownString, TreeItem, TreeItemCollapsibleState } from 'vscode'; import { GlyphChars } from '../../../constants'; import type { GitUri } from '../../../git/gitUri'; -import { GitRemote } from '../../../git/models/remote'; +import { getHighlanderProviders } from '../../../git/models/remote'; import type { RepositoryChangeEvent } from '../../../git/models/repository'; import { Repository, RepositoryChange, RepositoryChangeComparisonMode } from '../../../git/models/repository'; import { gate } from '../../../system/decorators/gate'; @@ -100,7 +100,7 @@ export abstract class RepositoryFolderNode< let providerName; if (branch.upstream != null) { - const providers = GitRemote.getHighlanderProviders( + const providers = getHighlanderProviders( await this.view.container.git.getRemotesWithProviders(branch.repoPath), ); providerName = providers?.length ? providers[0].name : undefined; diff --git a/src/views/nodes/branchNode.ts b/src/views/nodes/branchNode.ts index c5e00345bf9de..6aa10bf44235a 100644 --- a/src/views/nodes/branchNode.ts +++ b/src/views/nodes/branchNode.ts @@ -7,7 +7,7 @@ import type { GitBranch } from '../../git/models/branch'; import type { GitLog } from '../../git/models/log'; import type { PullRequest, PullRequestState } from '../../git/models/pullRequest'; import type { GitBranchReference } from '../../git/models/reference'; -import { GitRemote } from '../../git/models/remote'; +import { getHighlanderProviders } from '../../git/models/remote'; import type { Repository } from '../../git/models/repository'; import type { GitUser } from '../../git/models/user'; import { getContext } from '../../system/context'; @@ -465,7 +465,7 @@ export class BranchNode } } } else { - const providers = GitRemote.getHighlanderProviders( + const providers = getHighlanderProviders( await this.view.container.git.getRemotesWithProviders(this.branch.repoPath), ); const providerName = providers?.length ? providers[0].name : undefined; diff --git a/src/views/nodes/branchTrackingStatusNode.ts b/src/views/nodes/branchTrackingStatusNode.ts index 7d48f12cee397..05a0398a90040 100644 --- a/src/views/nodes/branchTrackingStatusNode.ts +++ b/src/views/nodes/branchTrackingStatusNode.ts @@ -6,7 +6,7 @@ import type { GitBranch, GitTrackingState } from '../../git/models/branch'; import { getRemoteNameFromBranchName } from '../../git/models/branch'; import type { GitLog } from '../../git/models/log'; import { createRevisionRange } from '../../git/models/reference'; -import { GitRemote } from '../../git/models/remote'; +import { getHighlanderProviders } from '../../git/models/remote'; import { fromNow } from '../../system/date'; import { gate } from '../../system/decorators/gate'; import { debug } from '../../system/decorators/log'; @@ -284,7 +284,7 @@ export class BranchTrackingStatusNode } case 'none': { const remotes = await this.view.container.git.getRemotesWithProviders(this.branch.repoPath); - const providers = GitRemote.getHighlanderProviders(remotes); + const providers = getHighlanderProviders(remotes); const providerName = providers?.length ? providers[0].name : undefined; label = `Publish ${this.branch.name} to ${providerName ?? 'a remote'}`; diff --git a/src/views/nodes/repositoryNode.ts b/src/views/nodes/repositoryNode.ts index 38fe4f8d1be98..ad12e95d0884a 100644 --- a/src/views/nodes/repositoryNode.ts +++ b/src/views/nodes/repositoryNode.ts @@ -3,7 +3,7 @@ import { GlyphChars } from '../../constants'; import { Features } from '../../features'; import type { GitUri } from '../../git/gitUri'; import { GitBranch } from '../../git/models/branch'; -import { GitRemote } from '../../git/models/remote'; +import { getHighlanderProviders } from '../../git/models/remote'; import type { RepositoryChangeEvent, RepositoryFileSystemChangeEvent } from '../../git/models/repository'; import { Repository, RepositoryChange, RepositoryChangeComparisonMode } from '../../git/models/repository'; import type { GitStatus } from '../../git/models/status'; @@ -261,7 +261,7 @@ export class RepositoryNode extends SubscribeableViewNode<'repository', ViewsWit let providerName; if (status.upstream != null) { - const providers = GitRemote.getHighlanderProviders( + const providers = getHighlanderProviders( await this.view.container.git.getRemotesWithProviders(status.repoPath), ); providerName = providers?.length ? providers[0].name : undefined; diff --git a/src/views/nodes/worktreeNode.ts b/src/views/nodes/worktreeNode.ts index 80b9fb81ae6bf..eb28e66ae1273 100644 --- a/src/views/nodes/worktreeNode.ts +++ b/src/views/nodes/worktreeNode.ts @@ -5,7 +5,7 @@ import type { GitBranch } from '../../git/models/branch'; import type { GitLog } from '../../git/models/log'; import type { PullRequest, PullRequestState } from '../../git/models/pullRequest'; import { shortenRevision } from '../../git/models/reference'; -import { GitRemote } from '../../git/models/remote'; +import { getHighlanderProviderName } from '../../git/models/remote'; import type { GitWorktree } from '../../git/models/worktree'; import { getContext } from '../../system/context'; import { gate } from '../../system/decorators/gate'; @@ -307,7 +307,7 @@ export class WorktreeNode extends CacheableChildrenViewNode<'worktree', ViewsWit })}`, ); } else { - const providerName = GitRemote.getHighlanderProviderName( + const providerName = getHighlanderProviderName( await this.view.container.git.getRemotesWithProviders(branch.repoPath), ); From a12b16fa3d687874cc3ec469c2a3370d2b8a4eca Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 7 Feb 2024 23:09:32 -0500 Subject: [PATCH 0508/1012] Ensures proper remote sorting --- src/commands/createPullRequestOnRemote.ts | 1 + src/commands/openFileOnRemote.ts | 2 +- src/commands/openOnRemote.ts | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/commands/createPullRequestOnRemote.ts b/src/commands/createPullRequestOnRemote.ts index eb4341b709d30..a7bc786593f91 100644 --- a/src/commands/createPullRequestOnRemote.ts +++ b/src/commands/createPullRequestOnRemote.ts @@ -35,6 +35,7 @@ export class CreatePullRequestOnRemoteCommand extends Command { const providerId = compareRemote.provider.id; const remotes = (await repo.getRemotes({ filter: r => r.provider?.id === providerId, + sort: true, })) as GitRemote[]; const resource: RemoteResource = { diff --git a/src/commands/openFileOnRemote.ts b/src/commands/openFileOnRemote.ts index dee88b53d4efe..9c92e2de57dc9 100644 --- a/src/commands/openFileOnRemote.ts +++ b/src/commands/openFileOnRemote.ts @@ -120,7 +120,7 @@ export class OpenFileOnRemoteCommand extends ActiveEditorCommand { args = { range: true, ...args }; try { - let remotes = await this.container.git.getRemotesWithProviders(gitUri.repoPath); + let remotes = await this.container.git.getRemotesWithProviders(gitUri.repoPath, { sort: true }); let range: Range | undefined; if (args.range) { diff --git a/src/commands/openOnRemote.ts b/src/commands/openOnRemote.ts index 4bcca08fbb28f..a2a1e080f0d51 100644 --- a/src/commands/openOnRemote.ts +++ b/src/commands/openOnRemote.ts @@ -39,7 +39,9 @@ export class OpenOnRemoteCommand extends Command { if (args?.resource == null) return; let remotes = - 'remotes' in args ? args.remotes : await this.container.git.getRemotesWithProviders(args.repoPath); + 'remotes' in args + ? args.remotes + : await this.container.git.getRemotesWithProviders(args.repoPath, { sort: true }); if (args.remote != null) { const filtered = remotes.filter(r => r.name === args.remote); From f863eaa73d8a4ff49798456eba21dff5f80de21e Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Thu, 8 Feb 2024 10:12:52 -0500 Subject: [PATCH 0509/1012] Updates CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d273245562a2..c2fb79228f584 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Added +- Adds support for Cloud Patches hosted on your own dedicated storage for the highest level of security (requires an Enterprise plan) - Improves worktree usage, discoverability, and accessibility - Simplifies the create worktree and open worktree flows — reduces number of steps and options presented - Adds _Create Branch in New Worktree_ confirmation option when creating branches, e.g. via the _GitLens: Git Create Branch..._ command @@ -55,6 +56,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Fixes [#3115](https://github.com/gitkraken/vscode-gitlens/issues/3115) - Always-on file annotations - Fixes ahead/behind diffs on files (root) in the _Commits_ view to correctly show the diff of the range rather than the base to the working tree - Fixes missing repository icons in the _Repositories_ view +- Fixes [#3116](https://github.com/gitkraken/vscode-gitlens/issues/3116) - Fix typos in README.md and package.json — thanks to [PR #3117](https://github.com/gitkraken/vscode-gitlens/pull/3117) by yutotnh ([@yutotnh](https://github.com/yutotnh)) ## [14.7.0] - 2024-01-17 From d3f264406edb05316ab110c39227967ffc6b0489 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Thu, 8 Feb 2024 16:11:26 -0500 Subject: [PATCH 0510/1012] Bumps to v14.8.0 --- CHANGELOG.md | 5 ++++- package.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2fb79228f584..6d37b3310cd23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] +## [14.8.0] - 2024-02-08 + ### Added - Adds support for Cloud Patches hosted on your own dedicated storage for the highest level of security (requires an Enterprise plan) @@ -5209,7 +5211,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Initial release but still heavily a work in progress. -[unreleased]: https://github.com/gitkraken/vscode-gitlens/compare/v14.7.0...HEAD +[unreleased]: https://github.com/gitkraken/vscode-gitlens/compare/v14.8.0...HEAD +[14.8.0]: https://github.com/gitkraken/vscode-gitlens/compare/v14.7.0...gitkraken:v14.8.0 [14.7.0]: https://github.com/gitkraken/vscode-gitlens/compare/v14.6.1...gitkraken:v14.7.0 [14.6.1]: https://github.com/gitkraken/vscode-gitlens/compare/v14.6.0...gitkraken:v14.6.1 [14.6.0]: https://github.com/gitkraken/vscode-gitlens/compare/v14.5.1...gitkraken:v14.6.0 diff --git a/package.json b/package.json index 3913cfeff6ca7..a1b4676ac189e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "gitlens", "displayName": "GitLens — Git supercharged", "description": "Supercharge Git within VS Code — Visualize code authorship at a glance via Git blame annotations and CodeLens, seamlessly navigate and explore Git repositories, gain valuable insights via rich visualizations and powerful comparison commands, and so much more", - "version": "14.7.0", + "version": "14.8.0", "engines": { "vscode": "^1.82.0" }, From 1abe67051be9d2d64418229976288682ef8216a6 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Thu, 8 Feb 2024 18:09:42 -0500 Subject: [PATCH 0511/1012] Closes #3138 adds create branch option to switch --- CHANGELOG.md | 4 ++++ src/commands/git/branch.ts | 4 +++- src/commands/git/switch.ts | 21 +++++++++++++++++++++ src/commands/quickCommand.steps.ts | 29 ++++++++++++++++++++++++----- 4 files changed, 52 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d37b3310cd23..65df11528e728 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] +### Added + +- Adds a _Create New Branch..._ option to the _Git Switch to..._ command to easily create a new branch to switch to — closes [#3138](https://github.com/gitkraken/vscode-gitlens/issues/3138) + ## [14.8.0] - 2024-02-08 ### Added diff --git a/src/commands/git/branch.ts b/src/commands/git/branch.ts index 21f7de1e4dc1d..3eb0f429013ab 100644 --- a/src/commands/git/branch.ts +++ b/src/commands/git/branch.ts @@ -50,6 +50,8 @@ interface CreateState { reference: GitReference; name: string; flags: CreateFlags[]; + + suggestNameOnly?: boolean; } type DeleteFlags = '--force' | '--remotes'; @@ -151,7 +153,7 @@ export class BranchGitCommand extends QuickCommand { counter++; } - if (args.state.name != null) { + if (!args.state.suggestNameOnly && args.state.name != null) { counter++; } diff --git a/src/commands/git/switch.ts b/src/commands/git/switch.ts index 8528af2c18602..d98ca4e562330 100644 --- a/src/commands/git/switch.ts +++ b/src/commands/git/switch.ts @@ -155,6 +155,7 @@ export class SwitchGitCommand extends QuickCommand { if (state.counter < 2 || state.reference == null) { const result = yield* pickBranchOrTagStepMultiRepo(state as SwitchStepState, context, { placeholder: context => `Choose a branch${context.showTags ? ' or tag' : ''} to switch to`, + allowCreate: state.repos.length === 1, }); if (result === StepResultBreak) { // If we skipped the previous step, make sure we back up past it @@ -165,6 +166,26 @@ export class SwitchGitCommand extends QuickCommand { continue; } + if (typeof result == 'string') { + yield* getSteps( + this.container, + { + command: 'branch', + state: { + subcommand: 'create', + repo: state.repos[0], + name: result, + suggestNameOnly: true, + flags: ['--switch'], + }, + }, + this.pickedVia, + ); + + endSteps(state); + return; + } + state.reference = result; } diff --git a/src/commands/quickCommand.steps.ts b/src/commands/quickCommand.steps.ts index f240f8c8e7f35..e5ca11324b40a 100644 --- a/src/commands/quickCommand.steps.ts +++ b/src/commands/quickCommand.steps.ts @@ -1,4 +1,4 @@ -import type { QuickInputButton, QuickPick } from 'vscode'; +import type { QuickInputButton, QuickPick, QuickPickItem } from 'vscode'; import { ThemeIcon } from 'vscode'; import { Commands, GlyphChars, quickPickTitleMaxChars } from '../constants'; import { Container } from '../container'; @@ -931,28 +931,37 @@ export function* pickBranchOrTagStep< export function* pickBranchOrTagStepMultiRepo< State extends StepState & { repos: Repository[]; reference?: GitReference }, - Context extends { repos: Repository[]; showTags?: boolean; title: string }, + Context extends { allowCreate?: boolean; repos: Repository[]; showTags?: boolean; title: string }, >( state: State, context: Context, { + allowCreate, filter, picked, placeholder, titleContext, value, }: { + allowCreate?: boolean; filter?: { branches?: (b: GitBranch) => boolean; tags?: (t: GitTag) => boolean }; picked?: string | string[]; placeholder: string | ((context: Context) => string); titleContext?: string; value?: string; }, -): StepResultGenerator { +): StepResultGenerator { context.showTags = state.repos.length === 1; const showTagsButton = new ShowTagsToggleQuickInputButton(context.showTags); + const createNewBranchItem: QuickPickItem & { item: string } = { + label: 'Create New Branch...', + iconPath: new ThemeIcon('plus'), + alwaysShow: true, + item: '', + }; + const getBranchesAndOrTagsFn = () => { return getBranchesAndOrTags(state.repos, context.showTags ? ['branches', 'tags'] : ['branches'], { buttons: [RevealInSideBarQuickInputButton], @@ -965,10 +974,12 @@ export function* pickBranchOrTagStepMultiRepo< const items = getBranchesAndOrTagsFn().then(branchesAndOrTags => branchesAndOrTags.length === 0 ? [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)] - : branchesAndOrTags, + : allowCreate + ? [createNewBranchItem, ...branchesAndOrTags] + : branchesAndOrTags, ); - const step = createPickStep({ + const step = createPickStep({ title: appendReposToTitle(`${context.title}${titleContext ?? ''}`, state, context), placeholder: count => !count @@ -984,7 +995,13 @@ export function* pickBranchOrTagStepMultiRepo< selectValueWhenShown: true, items: items, additionalButtons: [showTagsButton], + onDidChangeValue: quickpick => { + createNewBranchItem.item = quickpick.value; + return true; + }, onDidClickItemButton: (quickpick, button, { item }) => { + if (typeof item === 'string') return; + if (button === RevealInSideBarQuickInputButton) { if (isBranchReference(item)) { void BranchActions.reveal(item, { select: true, focus: false, expand: true }); @@ -1024,6 +1041,8 @@ export function* pickBranchOrTagStepMultiRepo< }, keys: ['right', 'alt+right', 'ctrl+right'], onDidPressKey: (_quickpick, _key, { item }) => { + if (typeof item === 'string') return; + if (isBranchReference(item)) { void BranchActions.reveal(item, { select: true, focus: false, expand: true }); } else if (isTagReference(item)) { From 1d85a8e777483a5d4165e083aacca787e1683aa0 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sat, 10 Feb 2024 18:12:04 -0500 Subject: [PATCH 0512/1012] Updates dependencies Turns off expensive lint rules --- .eslintrc.base.json | 12 +- package.json | 6 +- src/codelens/codeLensProvider.ts | 2 +- .../gk/account/authenticationConnection.ts | 2 +- src/system/event.ts | 1 - src/system/promise.ts | 1 - yarn.lock | 551 ++++++++++-------- 7 files changed, 330 insertions(+), 245 deletions(-) diff --git a/.eslintrc.base.json b/.eslintrc.base.json index c1509d5a8c98e..e28ab89c5af53 100644 --- a/.eslintrc.base.json +++ b/.eslintrc.base.json @@ -134,7 +134,7 @@ ], "prefer-numeric-literals": "error", "prefer-object-spread": "error", - "prefer-promise-reject-errors": ["error", { "allowEmptyReject": true }], + "prefer-promise-reject-errors": "off", "prefer-rest-params": "error", "prefer-spread": "error", "prefer-template": "error", @@ -150,15 +150,22 @@ ], "yoda": "error", "import/consistent-type-specifier-style": ["error", "prefer-top-level"], + "import/default": "off", "import/extensions": "off", + "import/named": "off", + "import/namespace": "off", "import/newline-after-import": "warn", "import/no-absolute-path": "error", "import/no-cycle": "off", + "import/no-deprecated": "off", "import/no-default-export": "error", "import/no-duplicates": ["error", { "prefer-inline": false }], "import/no-dynamic-require": "error", + "import/no-named-as-default": "off", + "import/no-named-as-default-member": "off", "import/no-self-import": "error", - "import/no-unresolved": ["warn", { "ignore": ["vscode", "@env"] }], + "import/no-unused-modules": "off", + "import/no-unresolved": "off", "import/no-useless-path-segments": "error", "import/order": [ "warn", @@ -295,6 +302,7 @@ "@typescript-eslint/prefer-includes": "warn", "@typescript-eslint/prefer-literal-enum-member": ["warn", { "allowBitwiseExpressions": true }], "@typescript-eslint/prefer-optional-chain": "warn", + "@typescript-eslint/prefer-promise-reject-errors": ["error", { "allowEmptyReject": true }], "@typescript-eslint/prefer-reduce-type-parameter": "warn", "@typescript-eslint/restrict-template-expressions": [ "error", diff --git a/package.json b/package.json index a1b4676ac189e..945ec0c167fdd 100644 --- a/package.json +++ b/package.json @@ -16553,7 +16553,7 @@ }, "devDependencies": { "@eamodio/eslint-lite-webpack-plugin": "0.0.8", - "@swc/core": "1.3.107", + "@swc/core": "1.4.0", "@twbs/fantasticon": "2.7.2", "@types/mocha": "10.0.6", "@types/node": "18.15.0", @@ -16561,8 +16561,8 @@ "@types/react-dom": "17.0.21", "@types/sortablejs": "1.15.7", "@types/vscode": "1.82.0", - "@typescript-eslint/eslint-plugin": "6.20.0", - "@typescript-eslint/parser": "6.20.0", + "@typescript-eslint/eslint-plugin": "6.21.0", + "@typescript-eslint/parser": "6.21.0", "@vscode/test-electron": "2.3.9", "@vscode/test-web": "0.0.51", "@vscode/vsce": "2.23.0", diff --git a/src/codelens/codeLensProvider.ts b/src/codelens/codeLensProvider.ts index 628b444779688..7d0bd4e1b8849 100644 --- a/src/codelens/codeLensProvider.ts +++ b/src/codelens/codeLensProvider.ts @@ -451,7 +451,7 @@ export class GitCodeLensProvider implements CodeLensProvider { resolveCodeLens(lens: CodeLens, token: CancellationToken): CodeLens | Promise { if (lens instanceof GitRecentChangeCodeLens) return this.resolveGitRecentChangeCodeLens(lens, token); if (lens instanceof GitAuthorsCodeLens) return this.resolveGitAuthorsCodeLens(lens, token); - // eslint-disable-next-line prefer-promise-reject-errors, @typescript-eslint/prefer-promise-reject-errors + // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors return Promise.reject(undefined); } diff --git a/src/plus/gk/account/authenticationConnection.ts b/src/plus/gk/account/authenticationConnection.ts index 4edd8d8f14830..6037795934841 100644 --- a/src/plus/gk/account/authenticationConnection.ts +++ b/src/plus/gk/account/authenticationConnection.ts @@ -107,7 +107,7 @@ export class AuthenticationConnection implements Disposable { ), new Promise( (_, reject) => - // eslint-disable-next-line prefer-promise-reject-errors, @typescript-eslint/prefer-promise-reject-errors + // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors this._cancellationSource?.token.onCancellationRequested(() => reject('Cancelled')), ), new Promise((_, reject) => setTimeout(reject, 120000, 'Cancelled')), diff --git a/src/system/event.ts b/src/system/event.ts index 55720c8a474d9..e6497b82f351e 100644 --- a/src/system/event.ts +++ b/src/system/event.ts @@ -65,7 +65,6 @@ export function promisifyDeferred( cancel = () => { pending = false; cancel = undefined; - // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors reject(); }; diff --git a/src/system/promise.ts b/src/system/promise.ts index b6ed22f89c839..091491f8a3a07 100644 --- a/src/system/promise.ts +++ b/src/system/promise.ts @@ -156,7 +156,6 @@ export function defer(): Deferred { }; deferred.cancel = function () { deferred.pending = false; - // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors reject(); }; }); diff --git a/yarn.lock b/yarn.lock index 00b533240a854..d8b35259eba11 100644 --- a/yarn.lock +++ b/yarn.lock @@ -622,7 +622,7 @@ deprecation "^2.0.0" once "^1.4.0" -"@octokit/request@8.1.6", "@octokit/request@^8.0.1": +"@octokit/request@8.1.6": version "8.1.6" resolved "https://registry.yarnpkg.com/@octokit/request/-/request-8.1.6.tgz#a76a859c30421737a3918b40973c2ff369009571" integrity sha512-YhPaGml3ncZC1NfXpP3WZ7iliL1ap6tLkAp6MvbK2fTTPytzVUyUesBBogcdMm86uRYO5rHaM1xIWxigWZ17MQ== @@ -632,6 +632,16 @@ "@octokit/types" "^12.0.0" universal-user-agent "^6.0.0" +"@octokit/request@^8.0.1": + version "8.2.0" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-8.2.0.tgz#125c547bc3f4c0e2dfa38c6829a1cf00027fbd98" + integrity sha512-exPif6x5uwLqv1N1irkLG1zZNJkOtj8bZxuVHd71U5Ftuxf2wGNvAJyNBcPbPC+EBzwYEbBDdSFb8EPcjpYxPQ== + dependencies: + "@octokit/endpoint" "^9.0.0" + "@octokit/request-error" "^5.0.0" + "@octokit/types" "^12.0.0" + universal-user-agent "^6.0.0" + "@octokit/types@^12.0.0": version "12.4.0" resolved "https://registry.yarnpkg.com/@octokit/types/-/types-12.4.0.tgz#8f97b601e91ce6b9776ed8152217e77a71be7aac" @@ -754,79 +764,79 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/merge-streams/-/merge-streams-1.0.0.tgz#9cd84cc15bc865a5ca35fcaae198eb899f7b5c90" integrity sha512-rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw== -"@swc/core-darwin-arm64@1.3.107": - version "1.3.107" - resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.107.tgz#abac4c19816751de1dcbaab456710ca55e580782" - integrity sha512-47tD/5vSXWxPd0j/ZllyQUg4bqalbQTsmqSw0J4dDdS82MWqCAwUErUrAZPRjBkjNQ6Kmrf5rpCWaGTtPw+ngw== - -"@swc/core-darwin-x64@1.3.107": - version "1.3.107" - resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.107.tgz#4c0df233ebf293429cd2f10224d6a870a5cc019e" - integrity sha512-hwiLJ2ulNkBGAh1m1eTfeY1417OAYbRGcb/iGsJ+LuVLvKAhU/itzsl535CvcwAlt2LayeCFfcI8gdeOLeZa9A== - -"@swc/core-linux-arm-gnueabihf@1.3.107": - version "1.3.107" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.107.tgz#81004cca4c7554007ea5ac51e276147e958e3e9f" - integrity sha512-I2wzcC0KXqh0OwymCmYwNRgZ9nxX7DWnOOStJXV3pS0uB83TXAkmqd7wvMBuIl9qu4Hfomi9aDM7IlEEn9tumQ== - -"@swc/core-linux-arm64-gnu@1.3.107": - version "1.3.107" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.107.tgz#c01d75df662067fb7805bfdfa66c2f17f2b3185f" - integrity sha512-HWgnn7JORYlOYnGsdunpSF8A+BCZKPLzLtEUA27/M/ZuANcMZabKL9Zurt7XQXq888uJFAt98Gy+59PU90aHKg== - -"@swc/core-linux-arm64-musl@1.3.107": - version "1.3.107" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.107.tgz#5e0c4fe3fcc49a7bb77ffafa680622e53c982e0a" - integrity sha512-vfPF74cWfAm8hyhS8yvYI94ucMHIo8xIYU+oFOW9uvDlGQRgnUf/6DEVbLyt/3yfX5723Ln57U8uiMALbX5Pyw== - -"@swc/core-linux-x64-gnu@1.3.107": - version "1.3.107" - resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.107.tgz#afb4a656a1717170b2c8b76c9b2349b5077630b4" - integrity sha512-uBVNhIg0ip8rH9OnOsCARUFZ3Mq3tbPHxtmWk9uAa5u8jQwGWeBx5+nTHpDOVd3YxKb6+5xDEI/edeeLpha/9g== - -"@swc/core-linux-x64-musl@1.3.107": - version "1.3.107" - resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.107.tgz#3f9bce2fe13691be39fddc39bba8558fe6308823" - integrity sha512-mvACkUvzSIB12q1H5JtabWATbk3AG+pQgXEN95AmEX2ZA5gbP9+B+mijsg7Sd/3tboHr7ZHLz/q3SHTvdFJrEw== - -"@swc/core-win32-arm64-msvc@1.3.107": - version "1.3.107" - resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.107.tgz#5b485e9ce2de6f27ce2fbc1ba8c0b4e98009318d" - integrity sha512-J3P14Ngy/1qtapzbguEH41kY109t6DFxfbK4Ntz9dOWNuVY3o9/RTB841ctnJk0ZHEG+BjfCJjsD2n8H5HcaOA== - -"@swc/core-win32-ia32-msvc@1.3.107": - version "1.3.107" - resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.107.tgz#1bbe3ce6784b3e4203bf89443c33411c27389b56" - integrity sha512-ZBUtgyjTHlz8TPJh7kfwwwFma+ktr6OccB1oXC8fMSopD0AxVnQasgun3l3099wIsAB9eEsJDQ/3lDkOLs1gBA== - -"@swc/core-win32-x64-msvc@1.3.107": - version "1.3.107" - resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.107.tgz#c89640b16504ddda1f1faf573a7ed7193dc87485" - integrity sha512-Eyzo2XRqWOxqhE1gk9h7LWmUf4Bp4Xn2Ttb0ayAXFp6YSTxQIThXcT9kipXZqcpxcmDwoq8iWbbf2P8XL743EA== - -"@swc/core@1.3.107": - version "1.3.107" - resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.107.tgz#081697224ec3bffa63c33209d242e4f0b2c49e78" - integrity sha512-zKhqDyFcTsyLIYK1iEmavljZnf4CCor5pF52UzLAz4B6Nu/4GLU+2LQVAf+oRHjusG39PTPjd2AlRT3f3QWfsQ== +"@swc/core-darwin-arm64@1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.4.0.tgz#11abf23b884929a467ba270cf6789b9c50c4248b" + integrity sha512-UTJ/Vz+s7Pagef6HmufWt6Rs0aUu+EJF4Pzuwvr7JQQ5b1DZeAAUeUtkUTFx/PvCbM8Xfw4XdKBUZfrIKCfW8A== + +"@swc/core-darwin-x64@1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.4.0.tgz#f044ddaca60c5081e907b148721ad7461f6f6dfe" + integrity sha512-f8v58u2GsGak8EtZFN9guXqE0Ep10Suny6xriaW2d8FGqESPyNrnBzli3aqkSeQk5gGqu2zJ7WiiKp3XoUOidA== + +"@swc/core-linux-arm-gnueabihf@1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.4.0.tgz#52ceea673fc76692c0bd6d58e1863125c3e6173b" + integrity sha512-q2KAkBzmPcTnRij/Y1fgHCKAGevUX/H4uUESrw1J5gmUg9Qip6onKV80lTumA1/aooGJ18LOsB31qdbwmZk9OA== + +"@swc/core-linux-arm64-gnu@1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.4.0.tgz#7f3ff1ab824ec48acdb39d231cbcb4096a4f9dd0" + integrity sha512-SknGu96W0mzHtLHWm+62fk5+Omp9fMPFO7AWyGFmz2tr8EgRRXtTSrBUnWhAbgcalnhen48GsvtMdxf1KNputg== + +"@swc/core-linux-arm64-musl@1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.4.0.tgz#26c3b1f7947c19ef725997af716f230957d586f8" + integrity sha512-/k3TDvpBRMDNskHooNN1KqwUhcwkfBlIYxRTnJvsfT2C7My4pffR+4KXmt0IKynlTTbCdlU/4jgX4801FSuliw== + +"@swc/core-linux-x64-gnu@1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.4.0.tgz#2c7d03a04a7d045394cfed7d46419ff8816ec22e" + integrity sha512-GYsTMvNt5+WTVlwwQzOOWsPMw6P/F41u5PGHWmfev8Nd4QJ1h3rWPySKk4mV42IJwH9MgQCVSl3ygwNqwl6kFg== + +"@swc/core-linux-x64-musl@1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.4.0.tgz#0e76442dfb6d5026d8d6e7db6b2f4922b7692d0f" + integrity sha512-jGVPdM/VwF7kK/uYRW5N6FwzKf/FnDjGIR3RPvQokjYJy7Auk+3Oj21C0Jev7sIT9RYnO/TrFEoEozKeD/z2Qw== + +"@swc/core-win32-arm64-msvc@1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.4.0.tgz#0177bebf312eb251d6749ab76259c0e08088e837" + integrity sha512-biHYm1AronEKlt47O/H8sSOBM2BKXMmWT+ApvlxUw50m1RGNnVnE0bgY7tylFuuSiWyXsQPJbmUV708JqORXVg== + +"@swc/core-win32-ia32-msvc@1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.4.0.tgz#27fa650280e5651aa42129eaf03e02787b866417" + integrity sha512-TL5L2tFQb19kJwv6+elToGBj74QXCn9j+hZfwQatvZEJRA5rDK16eH6oAE751dGUArhnWlW3Vj65hViPvTuycw== + +"@swc/core-win32-x64-msvc@1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.4.0.tgz#bd575c599bd6847bddc4863a3babd85e3db5e11e" + integrity sha512-e2xVezU7XZ2Stzn4i7TOQe2Kn84oYdG0M3A7XI7oTdcpsKCcKwgiMoroiAhqCv+iN20KNqhnWwJiUiTj/qN5AA== + +"@swc/core@1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.4.0.tgz#3a0ceeea5b889173f4592955fe1da4d071d86a76" + integrity sha512-wc5DMI5BJftnK0Fyx9SNJKkA0+BZSJQx8430yutWmsILkHMBD3Yd9GhlMaxasab9RhgKqZp7Ht30hUYO5ZDvQg== dependencies: "@swc/counter" "^0.1.1" "@swc/types" "^0.1.5" optionalDependencies: - "@swc/core-darwin-arm64" "1.3.107" - "@swc/core-darwin-x64" "1.3.107" - "@swc/core-linux-arm-gnueabihf" "1.3.107" - "@swc/core-linux-arm64-gnu" "1.3.107" - "@swc/core-linux-arm64-musl" "1.3.107" - "@swc/core-linux-x64-gnu" "1.3.107" - "@swc/core-linux-x64-musl" "1.3.107" - "@swc/core-win32-arm64-msvc" "1.3.107" - "@swc/core-win32-ia32-msvc" "1.3.107" - "@swc/core-win32-x64-msvc" "1.3.107" + "@swc/core-darwin-arm64" "1.4.0" + "@swc/core-darwin-x64" "1.4.0" + "@swc/core-linux-arm-gnueabihf" "1.4.0" + "@swc/core-linux-arm64-gnu" "1.4.0" + "@swc/core-linux-arm64-musl" "1.4.0" + "@swc/core-linux-x64-gnu" "1.4.0" + "@swc/core-linux-x64-musl" "1.4.0" + "@swc/core-win32-arm64-msvc" "1.4.0" + "@swc/core-win32-ia32-msvc" "1.4.0" + "@swc/core-win32-x64-msvc" "1.4.0" "@swc/counter@^0.1.1": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.2.tgz#bf06d0770e47c6f1102270b744e17b934586985e" - integrity sha512-9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw== + version "0.1.3" + resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.3.tgz#cc7463bd02949611c6329596fccd2b0ec782b0e9" + integrity sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ== "@swc/types@^0.1.5": version "0.1.5" @@ -957,9 +967,9 @@ integrity sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg== "@types/node@*": - version "20.11.16" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.16.tgz#4411f79411514eb8e2926f036c86c9f0e4ec6708" - integrity sha512-gKb0enTmRCzXSSUJDq6/sPcqrfCv2mkkG6Jt/clpn5eiCbKTY+SgZUxo+p8ZKMof5dCp9vHQUAB7wOUTod22wQ== + version "20.11.17" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.17.tgz#cdd642d0e62ef3a861f88ddbc2b61e32578a9292" + integrity sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw== dependencies: undici-types "~5.26.4" @@ -1054,16 +1064,16 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@6.20.0": - version "6.20.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.20.0.tgz#9cf31546d2d5e884602626d89b0e0d2168ac25ed" - integrity sha512-fTwGQUnjhoYHeSF6m5pWNkzmDDdsKELYrOBxhjMrofPqCkoC2k3B2wvGHFxa1CTIqkEn88nlW1HVMztjo2K8Hg== +"@typescript-eslint/eslint-plugin@6.21.0": + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz#30830c1ca81fd5f3c2714e524c4303e0194f9cd3" + integrity sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA== dependencies: "@eslint-community/regexpp" "^4.5.1" - "@typescript-eslint/scope-manager" "6.20.0" - "@typescript-eslint/type-utils" "6.20.0" - "@typescript-eslint/utils" "6.20.0" - "@typescript-eslint/visitor-keys" "6.20.0" + "@typescript-eslint/scope-manager" "6.21.0" + "@typescript-eslint/type-utils" "6.21.0" + "@typescript-eslint/utils" "6.21.0" + "@typescript-eslint/visitor-keys" "6.21.0" debug "^4.3.4" graphemer "^1.4.0" ignore "^5.2.4" @@ -1071,47 +1081,47 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/parser@6.20.0": - version "6.20.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.20.0.tgz#17e314177304bdf498527e3c4b112e41287b7416" - integrity sha512-bYerPDF/H5v6V76MdMYhjwmwgMA+jlPVqjSDq2cRqMi8bP5sR3Z+RLOiOMad3nsnmDVmn2gAFCyNgh/dIrfP/w== +"@typescript-eslint/parser@6.21.0": + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.21.0.tgz#af8fcf66feee2edc86bc5d1cf45e33b0630bf35b" + integrity sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ== dependencies: - "@typescript-eslint/scope-manager" "6.20.0" - "@typescript-eslint/types" "6.20.0" - "@typescript-eslint/typescript-estree" "6.20.0" - "@typescript-eslint/visitor-keys" "6.20.0" + "@typescript-eslint/scope-manager" "6.21.0" + "@typescript-eslint/types" "6.21.0" + "@typescript-eslint/typescript-estree" "6.21.0" + "@typescript-eslint/visitor-keys" "6.21.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@6.20.0": - version "6.20.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.20.0.tgz#8a926e60f6c47feb5bab878246dc2ae465730151" - integrity sha512-p4rvHQRDTI1tGGMDFQm+GtxP1ZHyAh64WANVoyEcNMpaTFn3ox/3CcgtIlELnRfKzSs/DwYlDccJEtr3O6qBvA== +"@typescript-eslint/scope-manager@6.21.0": + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1" + integrity sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg== dependencies: - "@typescript-eslint/types" "6.20.0" - "@typescript-eslint/visitor-keys" "6.20.0" + "@typescript-eslint/types" "6.21.0" + "@typescript-eslint/visitor-keys" "6.21.0" -"@typescript-eslint/type-utils@6.20.0": - version "6.20.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.20.0.tgz#d395475cd0f3610dd80c7d8716fa0db767da3831" - integrity sha512-qnSobiJQb1F5JjN0YDRPHruQTrX7ICsmltXhkV536mp4idGAYrIyr47zF/JmkJtEcAVnIz4gUYJ7gOZa6SmN4g== +"@typescript-eslint/type-utils@6.21.0": + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz#6473281cfed4dacabe8004e8521cee0bd9d4c01e" + integrity sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag== dependencies: - "@typescript-eslint/typescript-estree" "6.20.0" - "@typescript-eslint/utils" "6.20.0" + "@typescript-eslint/typescript-estree" "6.21.0" + "@typescript-eslint/utils" "6.21.0" debug "^4.3.4" ts-api-utils "^1.0.1" -"@typescript-eslint/types@6.20.0": - version "6.20.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.20.0.tgz#5ccd74c29011ae7714ae6973e4ec0c634708b448" - integrity sha512-MM9mfZMAhiN4cOEcUOEx+0HmuaW3WBfukBZPCfwSqFnQy0grXYtngKCqpQN339X3RrwtzspWJrpbrupKYUSBXQ== +"@typescript-eslint/types@6.21.0": + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d" + integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg== -"@typescript-eslint/typescript-estree@6.20.0": - version "6.20.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.20.0.tgz#5b2d0975949e6bdd8d45ee1471461ef5fadc5542" - integrity sha512-RnRya9q5m6YYSpBN7IzKu9FmLcYtErkDkc8/dKv81I9QiLLtVBHrjz+Ev/crAqgMNW2FCsoZF4g2QUylMnJz+g== +"@typescript-eslint/typescript-estree@6.21.0": + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46" + integrity sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ== dependencies: - "@typescript-eslint/types" "6.20.0" - "@typescript-eslint/visitor-keys" "6.20.0" + "@typescript-eslint/types" "6.21.0" + "@typescript-eslint/visitor-keys" "6.21.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -1119,25 +1129,25 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/utils@6.20.0": - version "6.20.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.20.0.tgz#0e52afcfaa51af5656490ba4b7437cc3aa28633d" - integrity sha512-/EKuw+kRu2vAqCoDwDCBtDRU6CTKbUmwwI7SH7AashZ+W+7o8eiyy6V2cdOqN49KsTcASWsC5QeghYuRDTyOOg== +"@typescript-eslint/utils@6.21.0": + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134" + integrity sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ== dependencies: "@eslint-community/eslint-utils" "^4.4.0" "@types/json-schema" "^7.0.12" "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "6.20.0" - "@typescript-eslint/types" "6.20.0" - "@typescript-eslint/typescript-estree" "6.20.0" + "@typescript-eslint/scope-manager" "6.21.0" + "@typescript-eslint/types" "6.21.0" + "@typescript-eslint/typescript-estree" "6.21.0" semver "^7.5.4" -"@typescript-eslint/visitor-keys@6.20.0": - version "6.20.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.20.0.tgz#f7ada27f2803de89df0edd9fd7be22c05ce6a498" - integrity sha512-E8Cp98kRe4gKHjJD4NExXKz/zOJ1A2hhZc+IMVD6i7w4yjIvh6VyuRI0gRtxAsXtoC35uGMaQ9rjI2zJaXDEAw== +"@typescript-eslint/visitor-keys@6.21.0": + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47" + integrity sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A== dependencies: - "@typescript-eslint/types" "6.20.0" + "@typescript-eslint/types" "6.21.0" eslint-visitor-keys "^3.4.1" "@ungap/structured-clone@^1.2.0": @@ -1543,7 +1553,7 @@ argparse@^2.0.1: resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== -array-buffer-byte-length@^1.0.0: +array-buffer-byte-length@^1.0.0, array-buffer-byte-length@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f" integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg== @@ -1589,16 +1599,27 @@ array-uniq@^1.0.1: resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" integrity sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q== -array.prototype.findlastindex@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz#b37598438f97b579166940814e2c0493a4f50207" - integrity sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA== +array.prototype.filter@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz#423771edeb417ff5914111fff4277ea0624c0d0e" + integrity sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw== dependencies: call-bind "^1.0.2" define-properties "^1.2.0" es-abstract "^1.22.1" - es-shim-unscopables "^1.0.0" - get-intrinsic "^1.2.1" + es-array-method-boxes-properly "^1.0.0" + is-string "^1.0.7" + +array.prototype.findlastindex@^1.2.3: + version "1.2.4" + resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz#d1c50f0b3a9da191981ff8942a0aedd82794404f" + integrity sha512-hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ== + dependencies: + call-bind "^1.0.5" + define-properties "^1.2.1" + es-abstract "^1.22.3" + es-errors "^1.3.0" + es-shim-unscopables "^1.0.2" array.prototype.flat@^1.3.2: version "1.3.2" @@ -1621,16 +1642,17 @@ array.prototype.flatmap@^1.3.2: es-shim-unscopables "^1.0.0" arraybuffer.prototype.slice@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12" - integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw== + version "1.0.3" + resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6" + integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A== dependencies: - array-buffer-byte-length "^1.0.0" - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" - is-array-buffer "^3.0.2" + array-buffer-byte-length "^1.0.1" + call-bind "^1.0.5" + define-properties "^1.2.1" + es-abstract "^1.22.3" + es-errors "^1.2.1" + get-intrinsic "^1.2.3" + is-array-buffer "^3.0.4" is-shared-array-buffer "^1.0.2" arrify@^1.0.1: @@ -1674,15 +1696,42 @@ azure-devops-node-api@^11.0.1: typed-rest-client "^1.8.4" b4a@^1.6.4: - version "1.6.4" - resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.4.tgz#ef1c1422cae5ce6535ec191baeed7567443f36c9" - integrity sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw== + version "1.6.6" + resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.6.tgz#a4cc349a3851987c3c4ac2d7785c18744f6da9ba" + integrity sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg== balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== +bare-events@^2.0.0, bare-events@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.2.0.tgz#a7a7263c107daf8b85adf0b64f908503454ab26e" + integrity sha512-Yyyqff4PIFfSuthCZqLlPISTWHmnQxoPuAvkmgzsJEmG3CesdIv6Xweayl0JkCZJSB2yYIdJyEz97tpxNhgjbg== + +bare-fs@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-2.1.3.tgz#92e9ed679af898b2e7a23523113f79113048d75b" + integrity sha512-Oa7F0QJV7We0mtKq7Tk246uiBrl7vun64cPEsJOEwv2vHjnVL9yO7aH3643aSrd4rXfVe7yhJ9LHZywQQAXKFQ== + dependencies: + bare-events "^2.0.0" + bare-os "^2.0.0" + bare-path "^2.0.0" + streamx "^2.13.0" + +bare-os@^2.0.0, bare-os@^2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/bare-os/-/bare-os-2.1.2.tgz#bdc8855062ea1c4bcb82fbb669d90be57462305d" + integrity sha512-slQjOn78Q8itnzomNAamiKo5MDpEpV3JnoNZ93lyynaFh6paWcU+5c0GVcZ7EYIJC2unN2JGdF1qupdscYl0Yg== + +bare-path@^2.0.0, bare-path@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/bare-path/-/bare-path-2.1.0.tgz#830f17fd39842813ca77d211ebbabe238a88cb4c" + integrity sha512-DIIg7ts8bdRKwJRJrUMy/PICEaQZaPGZ26lsSx9MJSwIhSrcdHn7/C8W+XmnG/rKi6BaRcz+JO00CjZteybDtw== + dependencies: + bare-os "^2.1.0" + base64-js@^1.3.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" @@ -1853,14 +1902,15 @@ cache-content-type@^1.0.0: mime-types "^2.1.18" ylru "^1.2.0" -call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513" - integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ== +call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.6.tgz#6c46675fc7a5e9de82d75a233d586c8b7ac0d931" + integrity sha512-Mj50FLHtlsoVfRfnHaZvyrooHcrlceNZdL/QBvJJVd9Ta55qCQK0gs4ss2oZDeV9zFCs6ewzYgVE5yfVmfFpVg== dependencies: + es-errors "^1.3.0" function-bind "^1.1.2" - get-intrinsic "^1.2.1" - set-function-length "^1.1.1" + get-intrinsic "^1.2.3" + set-function-length "^1.2.0" callsites@^3.0.0: version "3.1.0" @@ -1901,9 +1951,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001578, caniuse-lite@^1.0.30001580: - version "1.0.30001583" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001583.tgz#abb2970cc370801dc7e27bf290509dc132cfa390" - integrity sha512-acWTYaha8xfhA/Du/z4sNZjHUWjkiuoAi2LM+T/aL+kemKQgPT1xBb/YKjlQ0Qo8gvbHsGNplrEJ+9G3gL7i4Q== + version "1.0.30001585" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001585.tgz#0b4e848d84919c783b2a41c13f7de8ce96744401" + integrity sha512-yr2BWR1yLXQ8fMpdS/4ZZXpseBgE7o4g41x3a6AJOqZuOi+iE/WdJYAuZ6Y95i4Ohd2Y+9MzIWRR+uGABH4s3Q== capital-case@^1.0.4: version "1.0.4" @@ -1974,7 +2024,7 @@ cheerio@^1.0.0-rc.5, cheerio@^1.0.0-rc.9: parse5 "^7.0.0" parse5-htmlparser2-tree-adapter "^7.0.0" -chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.2, chokidar@^3.5.3: +chokidar@3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -1989,6 +2039,21 @@ chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.2, chokidar@^3.5.3: optionalDependencies: fsevents "~2.3.2" +"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.2, chokidar@^3.5.3: + version "3.6.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" + integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + chownr@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" @@ -2669,14 +2734,15 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== -define-data-property@^1.0.1, define-data-property@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3" - integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ== +define-data-property@^1.0.1, define-data-property@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.2.tgz#f3c33b4f0102360cd7c0f5f28700f5678510b63a" + integrity sha512-SRtsSqsDbgpJBbW3pABMCOt6rQyeM8s8RiyeSN8jYG8sYmt/kGJejbydttUsnDs1tadr19tvhT4ShwMyoqAm4g== dependencies: - get-intrinsic "^1.2.1" + es-errors "^1.3.0" + get-intrinsic "^1.2.2" gopd "^1.0.1" - has-property-descriptors "^1.0.0" + has-property-descriptors "^1.0.1" define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1: version "1.2.1" @@ -2875,9 +2941,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.4.648: - version "1.4.656" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.656.tgz#b374fb7cab9b782a5bc967c0ce0e19826186b9c9" - integrity sha512-9AQB5eFTHyR3Gvt2t/NwR0le2jBSUNwCnMbUCejFWHD+so4tH40/dRLgoE+jxlPeWS43XJewyvCv+I8LPMl49Q== + version "1.4.665" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.665.tgz#681700bd590b0e5a3be66e3e2874ce62abcf5da5" + integrity sha512-UpyCWObBoD+nSZgOC2ToaIdZB0r9GhqT2WahPKiSki6ckkSuKhQNso8V2PrFcHBMleI/eqbKgVQgVC4Wni4ilw== emoji-regex@^8.0.0: version "8.0.0" @@ -2958,7 +3024,7 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.22.1: +es-abstract@^1.22.1, es-abstract@^1.22.3: version "1.22.3" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32" integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA== @@ -3003,10 +3069,15 @@ es-abstract@^1.22.1: unbox-primitive "^1.0.2" which-typed-array "^1.1.13" -es-errors@^1.0.0: +es-array-method-boxes-properly@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.0.0.tgz#1936450fb8cff7bffb969335d0e55dfca7279aab" - integrity sha512-yHV74THqMJUyFKkHyN7hyENcEZM3Dj2a2IrdClY+IT4BFQHkIVwlh8s6uZfjsFydMdNHv0F5mWgAA3ajFbsvVQ== + resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e" + integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== + +es-errors@^1.0.0, es-errors@^1.2.1, es-errors@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" + integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== es-module-lexer@^1.2.1: version "1.4.1" @@ -3022,7 +3093,7 @@ es-set-tostringtag@^2.0.1: has-tostringtag "^1.0.0" hasown "^2.0.0" -es-shim-unscopables@^1.0.0: +es-shim-unscopables@^1.0.0, es-shim-unscopables@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763" integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw== @@ -3115,9 +3186,9 @@ esbuild@^0.19.0: "@esbuild/win32-x64" "0.19.12" escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + version "3.1.2" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27" + integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA== escape-html@^1.0.3: version "1.0.3" @@ -3384,9 +3455,9 @@ fastest-levenshtein@^1.0.12: integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== fastq@^1.6.0: - version "1.17.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.0.tgz#ca5e1a90b5e68f97fc8b61330d5819b82f5fab03" - integrity sha512-zGygtijUMT7jnk3h26kUms3BkSDp4IfIKjmnqI2tvx6nuBfiF1UqOxbnLfzdv+apBy+53oaImsKtMw/xYbW+1w== + version "1.17.1" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47" + integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w== dependencies: reusify "^1.0.4" @@ -3590,24 +3661,25 @@ get-caller-file@^2.0.5: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.3.tgz#9d2d284a238e62672f556361e7d4e1a4686ae50e" - integrity sha512-JIcZczvcMVE7AUOP+X72bh8HqHBRxFdz5PDHYtNG/lE3yk9b3KZBJlwFcTyPYjg3L4RLLmZJzvjxhaZVapxFrQ== +get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" + integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== dependencies: - es-errors "^1.0.0" + es-errors "^1.3.0" function-bind "^1.1.2" has-proto "^1.0.1" has-symbols "^1.0.3" hasown "^2.0.0" get-symbol-description@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" - integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== + version "1.0.2" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5" + integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg== dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" + call-bind "^1.0.5" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" get-tsconfig@^4.5.0, get-tsconfig@^4.7.0: version "4.7.2" @@ -4142,11 +4214,11 @@ ini@~1.3.0: integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== internal-slot@^1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930" - integrity sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg== + version "1.0.7" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802" + integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g== dependencies: - get-intrinsic "^1.2.2" + es-errors "^1.3.0" hasown "^2.0.0" side-channel "^1.0.4" @@ -4367,7 +4439,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" -is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9: +is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.13, is-typed-array@^1.1.9: version "1.1.13" resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229" integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw== @@ -5313,7 +5385,7 @@ object-assign@^4.0.1, object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== -object-inspect@^1.13.1, object-inspect@^1.9.0: +object-inspect@^1.13.1: version "1.13.1" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== @@ -5343,14 +5415,15 @@ object.fromentries@^2.0.7: es-abstract "^1.22.1" object.groupby@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.1.tgz#d41d9f3c8d6c778d9cbac86b4ee9f5af103152ee" - integrity sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ== + version "1.0.2" + resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.2.tgz#494800ff5bab78fd0eff2835ec859066e00192ec" + integrity sha512-bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" + array.prototype.filter "^1.0.3" + call-bind "^1.0.5" + define-properties "^1.2.1" + es-abstract "^1.22.3" + es-errors "^1.0.0" object.values@^1.1.7: version "1.1.7" @@ -5941,9 +6014,9 @@ postcss-zindex@^6.0.1: integrity sha512-wQF95TIerYvPlsjwldO7iGP3Z3arhuYRK/gndq4NAdZaEsdUkmQYtRqkrEPMzJOQFBk06wFtzkHZKJoQlqFgXQ== postcss@^8.4.33: - version "8.4.33" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.33.tgz#1378e859c9f69bf6f638b990a0212f43e2aaa742" - integrity sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg== + version "8.4.35" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.35.tgz#60997775689ce09011edf083a549cea44aabe2f7" + integrity sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA== dependencies: nanoid "^3.3.7" picocolors "^1.0.0" @@ -6432,12 +6505,12 @@ safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== safe-regex-test@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.2.tgz#3ba32bdb3ea35f940ee87e5087c60ee786c3f6c5" - integrity sha512-83S9w6eFq12BBIJYvjMux6/dkirb8+4zJRA9cxNBVb7Wq5fJBW+Xze48WqR8pxua7bDuAaaAxtVVd4Idjp1dBQ== + version "1.0.3" + resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377" + integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw== dependencies: - call-bind "^1.0.5" - get-intrinsic "^1.2.2" + call-bind "^1.0.6" + es-errors "^1.3.0" is-regex "^1.1.4" "safer-buffer@>= 2.1.2 < 3.0.0": @@ -6617,9 +6690,9 @@ semver-regex@4.0.5: integrity sha512-hunMQrEy1T6Jr2uEVjrAIqjwWcQTgOAcIM52C8MY1EZSD3DDNft04XzvYKPqjED65bNVVko0YI38nYeEHCX3yw== "semver@2 || 3 || 4 || 5 || 6 || 7", semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.5.2, semver@^7.5.4: - version "7.5.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" - integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + version "7.6.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d" + integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== dependencies: lru-cache "^6.0.0" @@ -6661,14 +6734,15 @@ set-blocking@^2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== -set-function-length@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.0.tgz#2f81dc6c16c7059bda5ab7c82c11f03a515ed8e1" - integrity sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w== +set-function-length@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.1.tgz#47cc5945f2c771e2cf261c6737cf9684a2a5e425" + integrity sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g== dependencies: - define-data-property "^1.1.1" + define-data-property "^1.1.2" + es-errors "^1.3.0" function-bind "^1.1.2" - get-intrinsic "^1.2.2" + get-intrinsic "^1.2.3" gopd "^1.0.1" has-property-descriptors "^1.0.1" @@ -6735,13 +6809,14 @@ shell-quote@^1.8.1: integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== side-channel@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" - integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== + version "1.0.5" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.5.tgz#9a84546599b48909fb6af1211708d23b1946221b" + integrity sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ== dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.2" - object-inspect "^1.9.0" + call-bind "^1.0.6" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + object-inspect "^1.13.1" signal-exit@^3.0.7: version "3.0.7" @@ -6907,9 +6982,9 @@ spdx-expression-parse@^3.0.0, spdx-expression-parse@^3.0.1: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.16" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f" - integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw== + version "3.0.17" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz#887da8aa73218e51a1d917502d79863161a93f9c" + integrity sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg== spdx-ranges@^2.0.0: version "2.1.1" @@ -6947,13 +7022,15 @@ stream-shift@^1.0.0: resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.3.tgz#85b8fab4d71010fc3ba8772e8046cc49b8a3864b" integrity sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ== -streamx@^2.15.0: - version "2.15.7" - resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.7.tgz#a12fe09faa3fda2483e8044c406b72286994a138" - integrity sha512-NPEKS5+yjyo597eafGbKW5ujh7Sm6lDLHZQd/lRSz6S0VarpADBJItqfB4PnwpS+472oob1GX5cCY9vzfJpHUA== +streamx@^2.13.0, streamx@^2.15.0: + version "2.15.8" + resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.8.tgz#5471145b54ee43b5088877023d8d0a2a77f95d8d" + integrity sha512-6pwMeMY/SuISiRsuS8TeIrAzyFbG5gGPHFQsYjUr/pbBadaL1PCWmzKw+CHZSwainfvcF6Si6cVLq4XTEwswFQ== dependencies: fast-fifo "^1.1.0" queue-tick "^1.0.1" + optionalDependencies: + bare-events "^2.2.0" "string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" @@ -7155,13 +7232,15 @@ tar-fs@^2.0.0: tar-stream "^2.1.4" tar-fs@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.0.4.tgz#a21dc60a2d5d9f55e0089ccd78124f1d3771dbbf" - integrity sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w== + version "3.0.5" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.0.5.tgz#f954d77767e4e6edf973384e1eb95f8f81d64ed9" + integrity sha512-JOgGAmZyMgbqpLwct7ZV8VzkEB6pxXFBVErLtb+XCOqzc6w1xiWKI9GVd6bwk68EX7eJ4DWmfXVmq8K2ziZTGg== dependencies: - mkdirp-classic "^0.5.2" pump "^3.0.0" tar-stream "^3.1.5" + optionalDependencies: + bare-fs "^2.1.1" + bare-path "^2.1.0" tar-stream@^2.1.4: version "2.2.0" @@ -7279,9 +7358,9 @@ trim-newlines@^4.0.2: integrity sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ== ts-api-utils@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331" - integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg== + version "1.2.1" + resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.2.1.tgz#f716c7e027494629485b21c0df6180f4d08f5e8b" + integrity sha512-RIYA36cJn2WiH9Hy77hdF9r7oEwxAtB/TS9/S4Qd90Ap4z5FSiin5zEiTL44OII1Y3IIlEvxwxFUVgrHSZ/UpA== ts-loader@9.5.1: version "9.5.1" @@ -7394,13 +7473,13 @@ type-is@^1.6.16: mime-types "~2.1.24" typed-array-buffer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60" - integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw== + version "1.0.1" + resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.1.tgz#0608ffe6bca71bf15a45bff0ca2604107a1325f5" + integrity sha512-RSqu1UEuSlrBhHTWC8O9FnPjOduNs4M7rJ4pRKoEjtx1zUNOPN2sSXHLDX+Y2WPbHIxbvg4JFo2DNAEfPIKWoQ== dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.2.1" - is-typed-array "^1.1.10" + call-bind "^1.0.6" + es-errors "^1.3.0" + is-typed-array "^1.1.13" typed-array-byte-length@^1.0.0: version "1.0.0" From bd2fa87c5d132dc20dbc1375f8287467d20c6f04 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 12 Feb 2024 14:48:13 -0500 Subject: [PATCH 0513/1012] Splits new WebviewHost interface from WebviewController --- src/plus/webviews/account/accountWebview.ts | 4 +- src/plus/webviews/focus/focusWebview.ts | 4 +- src/plus/webviews/graph/graphWebview.ts | 54 +++++++------ .../patchDetails/patchDetailsWebview.ts | 12 +-- src/plus/webviews/timeline/timelineWebview.ts | 14 ++-- .../commitDetails/commitDetailsWebview.ts | 4 +- src/webviews/home/homeWebview.ts | 4 +- src/webviews/settings/settingsWebview.ts | 4 +- src/webviews/webviewCommandRegistrar.ts | 2 +- src/webviews/webviewController.ts | 54 ++++--------- src/webviews/webviewProvider.ts | 78 +++++++++++++++++++ src/webviews/webviewsController.ts | 6 +- src/webviews/welcome/welcomeWebview.ts | 4 +- 13 files changed, 150 insertions(+), 94 deletions(-) create mode 100644 src/webviews/webviewProvider.ts diff --git a/src/plus/webviews/account/accountWebview.ts b/src/plus/webviews/account/accountWebview.ts index e04da0d47e9e8..5f83a07350830 100644 --- a/src/plus/webviews/account/accountWebview.ts +++ b/src/plus/webviews/account/accountWebview.ts @@ -4,7 +4,7 @@ import type { Container } from '../../../container'; import { registerCommand } from '../../../system/command'; import type { Deferrable } from '../../../system/function'; import { debounce } from '../../../system/function'; -import type { WebviewController, WebviewProvider } from '../../../webviews/webviewController'; +import type { WebviewHost, WebviewProvider } from '../../../webviews/webviewProvider'; import type { Subscription } from '../../gk/account/subscription'; import type { SubscriptionChangeEvent } from '../../gk/account/subscriptionService'; import type { State } from './protocol'; @@ -15,7 +15,7 @@ export class AccountWebviewProvider implements WebviewProvider { constructor( private readonly container: Container, - private readonly host: WebviewController, + private readonly host: WebviewHost, ) { this._disposable = Disposable.from(this.container.subscription.onDidChange(this.onSubscriptionChanged, this)); } diff --git a/src/plus/webviews/focus/focusWebview.ts b/src/plus/webviews/focus/focusWebview.ts index 0672dd3992dd3..b3ba56d8ba4e6 100644 --- a/src/plus/webviews/focus/focusWebview.ts +++ b/src/plus/webviews/focus/focusWebview.ts @@ -32,7 +32,7 @@ import { PageableResult } from '../../../system/paging'; import { getSettledValue } from '../../../system/promise'; import type { IpcMessage } from '../../../webviews/protocol'; import { onIpc } from '../../../webviews/protocol'; -import type { WebviewController, WebviewProvider } from '../../../webviews/webviewController'; +import type { WebviewHost, WebviewProvider } from '../../../webviews/webviewProvider'; import type { EnrichableItem, EnrichedItem } from '../../focus/enrichmentService'; import { convertRemoteProviderToEnrichProvider } from '../../focus/enrichmentService'; import type { SubscriptionChangeEvent } from '../../gk/account/subscriptionService'; @@ -95,7 +95,7 @@ export class FocusWebviewProvider implements WebviewProvider { constructor( private readonly container: Container, - private readonly host: WebviewController, + private readonly host: WebviewHost, ) { this._disposable = Disposable.from( this.container.subscription.onDidChange(this.onSubscriptionChanged, this), diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts index 6ebaafb8ab0b8..17a45f20832c9 100644 --- a/src/plus/webviews/graph/graphWebview.ts +++ b/src/plus/webviews/graph/graphWebview.ts @@ -80,7 +80,7 @@ import { isWebviewItemContext, isWebviewItemGroupContext, serializeWebviewItemCo import { RepositoryFolderNode } from '../../../views/nodes/abstract/repositoryFolderNode'; import type { IpcMessage, IpcNotificationType } from '../../../webviews/protocol'; import { onIpc } from '../../../webviews/protocol'; -import type { WebviewController, WebviewProvider, WebviewShowingArgs } from '../../../webviews/webviewController'; +import type { WebviewHost, WebviewProvider, WebviewShowingArgs } from '../../../webviews/webviewProvider'; import type { WebviewPanelShowCommandArgs, WebviewShowOptions } from '../../../webviews/webviewsController'; import { isSerializedState } from '../../../webviews/webviewsController'; import type { SubscriptionChangeEvent } from '../../gk/account/subscriptionService'; @@ -249,13 +249,13 @@ export class GraphWebviewProvider implements WebviewProvider, + private readonly host: WebviewHost, ) { this._showDetailsView = configuration.get('graph.showDetailsView'); this._theme = window.activeColorTheme; this.ensureRepositorySubscriptions(); - if (this.host.isView()) { + if (!this.host.isEditor()) { this.host.description = '✨'; } @@ -382,21 +382,24 @@ export class GraphWebviewProvider implements WebviewProvider this.host.refresh(true)), - registerCommand( - `${this.host.id}.openInTab`, - () => - void executeCommand( - Commands.ShowGraphPage, - undefined, - this.repository, - ), + let inViewCommands; + if (!this.host.isEditor()) { + inViewCommands = [ + registerCommand(`${this.host.id}.refresh`, () => this.host.refresh(true)), + registerCommand( + `${this.host.id}.openInTab`, + () => + void executeCommand( + Commands.ShowGraphPage, + undefined, + this.repository, ), - ] - : []), + ), + ]; + } + + return [ + ...(inViewCommands ?? []), this.host.registerWebviewCommand('gitlens.graph.push', this.push), this.host.registerWebviewCommand('gitlens.graph.pull', this.pull), @@ -654,6 +657,7 @@ export class GraphWebviewProvider implements WebviewProvider(Commands.ShowInDetailsView, { + repoPath: ref.repoPath, + refs: [ref.ref], + }); } - return executeCommand(Commands.ShowInDetailsView, { - repoPath: ref.repoPath, - refs: [ref.ref], - }); + return void showGraphDetailsView(ref, { preserveFocus: true, preserveVisibility: false }); } @debug() diff --git a/src/plus/webviews/patchDetails/patchDetailsWebview.ts b/src/plus/webviews/patchDetails/patchDetailsWebview.ts index 371d2b1169c33..fea4ab03b6ef5 100644 --- a/src/plus/webviews/patchDetails/patchDetailsWebview.ts +++ b/src/plus/webviews/patchDetails/patchDetailsWebview.ts @@ -40,7 +40,7 @@ import type { Serialized } from '../../../system/serialize'; import { serialize } from '../../../system/serialize'; import type { IpcMessage } from '../../../webviews/protocol'; import { onIpc } from '../../../webviews/protocol'; -import type { WebviewController, WebviewProvider } from '../../../webviews/webviewController'; +import type { WebviewHost, WebviewProvider } from '../../../webviews/webviewProvider'; import type { WebviewShowOptions } from '../../../webviews/webviewsController'; import { showPatchesView } from '../../drafts/actions'; import type { OrganizationMember } from '../../gk/account/organization'; @@ -125,7 +125,7 @@ export class PatchDetailsWebviewProvider constructor( private readonly container: Container, - private readonly host: WebviewController, PatchDetailsWebviewShowingArgs>, + private readonly host: WebviewHost, ) { this._context = { mode: 'create', @@ -199,12 +199,12 @@ export class PatchDetailsWebviewProvider } registerCommands(): Disposable[] { - return this.host.isView() - ? [ + return this.host.isEditor() + ? [] + : [ registerCommand(`${this.host.id}.refresh`, () => this.host.refresh(true)), registerCommand(`${this.host.id}.close`, () => this.closeView()), - ] - : []; + ]; } onMessageReceived(e: IpcMessage) { diff --git a/src/plus/webviews/timeline/timelineWebview.ts b/src/plus/webviews/timeline/timelineWebview.ts index c2cc24182e901..3e053b1ce1637 100644 --- a/src/plus/webviews/timeline/timelineWebview.ts +++ b/src/plus/webviews/timeline/timelineWebview.ts @@ -20,8 +20,8 @@ import { hasVisibleTextEditor, isTextEditor } from '../../../system/utils'; import { isViewFileNode } from '../../../views/nodes/abstract/viewFileNode'; import type { IpcMessage } from '../../../webviews/protocol'; import { onIpc } from '../../../webviews/protocol'; -import type { WebviewController, WebviewProvider, WebviewShowingArgs } from '../../../webviews/webviewController'; import { updatePendingContext } from '../../../webviews/webviewController'; +import type { WebviewHost, WebviewProvider, WebviewShowingArgs } from '../../../webviews/webviewProvider'; import type { WebviewShowOptions } from '../../../webviews/webviewsController'; import { isSerializedState } from '../../../webviews/webviewsController'; import type { SubscriptionChangeEvent } from '../../gk/account/subscriptionService'; @@ -49,7 +49,7 @@ export class TimelineWebviewProvider implements WebviewProvider, + private readonly host: WebviewHost, ) { this._context = { uri: undefined, @@ -151,8 +151,9 @@ export class TimelineWebviewProvider implements WebviewProvider this.host.refresh(true), this), registerCommand( `${this.host.id}.openInTab`, @@ -163,14 +164,13 @@ export class TimelineWebviewProvider implements WebviewProvider, CommitDetailsWebviewShowingArgs>, + private readonly host: WebviewHost, private readonly options: { attachedTo: 'default' | 'graph' }, ) { this._context = { diff --git a/src/webviews/home/homeWebview.ts b/src/webviews/home/homeWebview.ts index 8cfa28ec2bd5a..2f5f1896aac1b 100644 --- a/src/webviews/home/homeWebview.ts +++ b/src/webviews/home/homeWebview.ts @@ -6,7 +6,7 @@ import { isSubscriptionExpired, isSubscriptionPaid, isSubscriptionTrial } from ' import type { SubscriptionChangeEvent } from '../../plus/gk/account/subscriptionService'; import { registerCommand } from '../../system/command'; import { getContext, onDidChangeContext } from '../../system/context'; -import type { WebviewController, WebviewProvider } from '../webviewController'; +import type { WebviewHost, WebviewProvider } from '../webviewProvider'; import type { DidChangeRepositoriesParams, State } from './protocol'; import { DidChangeOrgSettingsType, DidChangeRepositoriesType, DidChangeSubscriptionType } from './protocol'; @@ -21,7 +21,7 @@ export class HomeWebviewProvider implements WebviewProvider { constructor( private readonly container: Container, - private readonly host: WebviewController, + private readonly host: WebviewHost, ) { this._disposable = Disposable.from( this.container.git.onDidChangeRepositories(this.onRepositoriesChanged, this), diff --git a/src/webviews/settings/settingsWebview.ts b/src/webviews/settings/settingsWebview.ts index 8476101754d3e..427a907158561 100644 --- a/src/webviews/settings/settingsWebview.ts +++ b/src/webviews/settings/settingsWebview.ts @@ -21,7 +21,7 @@ import { onIpc, UpdateConfigurationCommandType, } from '../protocol'; -import type { WebviewController, WebviewProvider } from '../webviewController'; +import type { WebviewHost, WebviewProvider } from '../webviewProvider'; import type { State } from './protocol'; import type { SettingsWebviewShowingArgs } from './registration'; @@ -31,7 +31,7 @@ export class SettingsWebviewProvider implements WebviewProvider, + protected readonly host: WebviewHost, ) { this._disposable = configuration.onDidChangeAny(this.onAnyConfigurationChanged, this); } diff --git a/src/webviews/webviewCommandRegistrar.ts b/src/webviews/webviewCommandRegistrar.ts index a7431b317b9bd..46fac93c17a51 100644 --- a/src/webviews/webviewCommandRegistrar.ts +++ b/src/webviews/webviewCommandRegistrar.ts @@ -3,7 +3,7 @@ import type { CommandCallback } from '../system/command'; import { registerWebviewCommand } from '../system/command'; import type { WebviewContext } from '../system/webview'; import { isWebviewContext } from '../system/webview'; -import type { WebviewProvider } from './webviewController'; +import type { WebviewProvider } from './webviewProvider'; export type WebviewCommandCallback> = (arg?: T | undefined) => any; export class WebviewCommandRegistrar implements Disposable { diff --git a/src/webviews/webviewController.ts b/src/webviews/webviewController.ts index 1b89a40cf494a..f85dce120cce9 100644 --- a/src/webviews/webviewController.ts +++ b/src/webviews/webviewController.ts @@ -22,6 +22,7 @@ import type { } from './protocol'; import { ExecuteCommandType, onIpc, WebviewFocusChangedCommandType, WebviewReadyCommandType } from './protocol'; import type { WebviewCommandCallback, WebviewCommandRegistrar } from './webviewCommandRegistrar'; +import type { WebviewHost, WebviewProvider, WebviewShowingArgs } from './webviewProvider'; import type { WebviewPanelDescriptor, WebviewShowOptions, WebviewViewDescriptor } from './webviewsController'; const maxSmallIntegerV8 = 2 ** 30; // Max number that can be stored in V8's smis (small integers) @@ -45,38 +46,6 @@ type GetParentType = T ? WebviewView : never; -export type WebviewShowingArgs = T | [{ state: Partial }] | []; - -export interface WebviewProvider - extends Disposable { - /** - * Determines whether the webview instance can be reused - * @returns `true` if the webview should be reused, `false` if it should NOT be reused, and `undefined` if it *could* be reused but not ideal - */ - canReuseInstance?(...args: WebviewShowingArgs): boolean | undefined; - getSplitArgs?(): WebviewShowingArgs; - onShowing?( - loading: boolean, - options: WebviewShowOptions, - ...args: WebviewShowingArgs - ): boolean | Promise; - registerCommands?(): Disposable[]; - - includeBootstrap?(): SerializedState | Promise; - includeHead?(): string | Promise; - includeBody?(): string | Promise; - includeEndOfBody?(): string | Promise; - - onReady?(): void; - onRefresh?(force?: boolean): void; - onReloaded?(): void; - onMessageReceived?(e: IpcMessage): void; - onActiveChanged?(active: boolean): void; - onFocusChanged?(focused: boolean): void; - onVisibilityChanged?(visible: boolean): void; - onWindowFocusChanged?(focused: boolean): void; -} - type WebviewPanelController< State, SerializedState = State, @@ -90,11 +59,14 @@ type WebviewViewController< @logName>(c => `WebviewController(${c.id}${c.instanceId != null ? `|${c.instanceId}` : ''})`) export class WebviewController< - State, - SerializedState = State, - ShowingArgs extends unknown[] = unknown[], - Descriptor extends WebviewPanelDescriptor | WebviewViewDescriptor = WebviewPanelDescriptor | WebviewViewDescriptor, -> implements Disposable + State, + SerializedState = State, + ShowingArgs extends unknown[] = unknown[], + Descriptor extends WebviewPanelDescriptor | WebviewViewDescriptor = + | WebviewPanelDescriptor + | WebviewViewDescriptor, + > + implements WebviewHost, Disposable { static async create( container: Container, @@ -104,7 +76,7 @@ export class WebviewController< parent: WebviewPanel, resolveProvider: ( container: Container, - controller: WebviewController, + host: WebviewHost, ) => Promise>, ): Promise>; static async create( @@ -115,7 +87,7 @@ export class WebviewController< parent: WebviewView, resolveProvider: ( container: Container, - controller: WebviewController, + host: WebviewHost, ) => Promise>, ): Promise>; static async create( @@ -126,7 +98,7 @@ export class WebviewController< parent: WebviewPanel | WebviewView, resolveProvider: ( container: Container, - controller: WebviewController, + host: WebviewHost, ) => Promise>, ): Promise> { const controller = new WebviewController( @@ -165,7 +137,7 @@ export class WebviewController< public readonly parent: GetParentType, resolveProvider: ( container: Container, - controller: WebviewController, + host: WebviewHost, ) => Promise>, ) { this.id = descriptor.id; diff --git a/src/webviews/webviewProvider.ts b/src/webviews/webviewProvider.ts new file mode 100644 index 0000000000000..cc8b5e38bf973 --- /dev/null +++ b/src/webviews/webviewProvider.ts @@ -0,0 +1,78 @@ +import type { Disposable, Uri, ViewBadge } from 'vscode'; +import type { WebviewContext } from '../system/webview'; +import type { IpcMessage, IpcMessageParams, IpcNotificationType, WebviewState } from './protocol'; +import type { WebviewCommandCallback } from './webviewCommandRegistrar'; +import type { WebviewPanelDescriptor, WebviewShowOptions, WebviewViewDescriptor } from './webviewsController'; + +export type WebviewShowingArgs = T | [{ state: Partial }] | []; + +export interface WebviewProvider + extends Disposable { + /** + * Determines whether the webview instance can be reused + * @returns `true` if the webview should be reused, `false` if it should NOT be reused, and `undefined` if it *could* be reused but not ideal + */ + canReuseInstance?(...args: WebviewShowingArgs): boolean | undefined; + getSplitArgs?(): WebviewShowingArgs; + onShowing?( + loading: boolean, + options: WebviewShowOptions, + ...args: WebviewShowingArgs + ): boolean | Promise; + registerCommands?(): Disposable[]; + + includeBootstrap?(): SerializedState | Promise; + includeHead?(): string | Promise; + includeBody?(): string | Promise; + includeEndOfBody?(): string | Promise; + + onReady?(): void; + onRefresh?(force?: boolean): void; + onReloaded?(): void; + onMessageReceived?(e: IpcMessage): void; + onActiveChanged?(active: boolean): void; + onFocusChanged?(focused: boolean): void; + onVisibilityChanged?(visible: boolean): void; + onWindowFocusChanged?(focused: boolean): void; +} + +export interface WebviewHost< + Descriptor extends WebviewPanelDescriptor | WebviewViewDescriptor = WebviewPanelDescriptor | WebviewViewDescriptor, +> { + readonly id: Descriptor['id']; + + readonly originalTitle: string; + title: string; + description: string | undefined; + badge: ViewBadge | undefined; + + readonly active: boolean | undefined; + readonly ready: boolean; + readonly visible: boolean; + readonly baseWebviewState: WebviewState; + readonly cspNonce: string; + + getWebRoot(): string; + asWebviewUri(uri: Uri): Uri; + + addPendingIpcNotification( + type: IpcNotificationType, + mapping: Map, () => Promise>, + thisArg: any, + ): void; + clearPendingIpcNotifications(): void; + sendPendingIpcNotifications(): void; + + isEditor(): boolean; + notify>( + type: T, + params: IpcMessageParams, + completionId?: string, + ): Promise; + refresh(force?: boolean): Promise; + registerWebviewCommand>( + command: string, + callback: WebviewCommandCallback, + ): Disposable; + show(loading: boolean, options?: WebviewShowOptions, ...args: unknown[]): Promise; +} diff --git a/src/webviews/webviewsController.ts b/src/webviews/webviewsController.ts index 4f0c7279031eb..70c4daaa85144 100644 --- a/src/webviews/webviewsController.ts +++ b/src/webviews/webviewsController.ts @@ -18,8 +18,8 @@ import { Logger } from '../system/logger'; import { getNewLogScope } from '../system/logger.scope'; import type { TrackedUsageFeatures } from '../telemetry/usageTracker'; import { WebviewCommandRegistrar } from './webviewCommandRegistrar'; -import type { WebviewProvider, WebviewShowingArgs } from './webviewController'; import { WebviewController } from './webviewController'; +import type { WebviewHost, WebviewProvider, WebviewShowingArgs } from './webviewProvider'; export interface WebviewPanelDescriptor { id: WebviewIds; @@ -127,7 +127,7 @@ export class WebviewsController implements Disposable { descriptor: WebviewViewDescriptor, resolveProvider: ( container: Container, - controller: WebviewController, + host: WebviewHost, ) => Promise>, onBeforeShow?: (...args: WebviewShowingArgs) => void | Promise, ): WebviewViewProxy { @@ -252,7 +252,7 @@ export class WebviewsController implements Disposable { descriptor: WebviewPanelDescriptor, resolveProvider: ( container: Container, - controller: WebviewController, + host: WebviewHost, ) => Promise>, ): WebviewPanelsProxy { const scope = getNewLogScope(`WebviewPanel(${descriptor.id})`); diff --git a/src/webviews/welcome/welcomeWebview.ts b/src/webviews/welcome/welcomeWebview.ts index a94b0f45e5edd..6977f4d199938 100644 --- a/src/webviews/welcome/welcomeWebview.ts +++ b/src/webviews/welcome/welcomeWebview.ts @@ -9,7 +9,7 @@ import { configuration } from '../../system/configuration'; import { getContext, onDidChangeContext } from '../../system/context'; import type { IpcMessage } from '../protocol'; import { onIpc } from '../protocol'; -import type { WebviewController, WebviewProvider } from '../webviewController'; +import type { WebviewHost, WebviewProvider } from '../webviewProvider'; import type { State, UpdateConfigurationParams } from './protocol'; import { DidChangeNotificationType, DidChangeOrgSettingsType, UpdateConfigurationCommandType } from './protocol'; @@ -24,7 +24,7 @@ export class WelcomeWebviewProvider implements WebviewProvider { constructor( private readonly container: Container, - private readonly host: WebviewController, + private readonly host: WebviewHost, ) { this._disposable = Disposable.from( configuration.onDidChange(this.onConfigurationChanged, this), From 44ec1cc2a625bbf72c6748f4b39ae288ab50035c Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 12 Feb 2024 15:26:12 -0500 Subject: [PATCH 0514/1012] Moves ipc out of AppBase --- src/webviews/apps/shared/appBase.ts | 105 +++------------------ src/webviews/apps/shared/ipc.ts | 137 ++++++++++++++++++++++++++++ 2 files changed, 151 insertions(+), 91 deletions(-) create mode 100644 src/webviews/apps/shared/ipc.ts diff --git a/src/webviews/apps/shared/appBase.ts b/src/webviews/apps/shared/appBase.ts index 90e8a7c5271fc..2945835e32dcd 100644 --- a/src/webviews/apps/shared/appBase.ts +++ b/src/webviews/apps/shared/appBase.ts @@ -1,11 +1,8 @@ /*global window document*/ import type { CustomEditorIds, WebviewIds, WebviewViewIds } from '../../../constants'; -import { debug } from '../../../system/decorators/log'; import { debounce } from '../../../system/function'; import { Logger } from '../../../system/logger'; import type { LogScope } from '../../../system/logger.scope'; -import { getLogScope, getNewLogScope } from '../../../system/logger.scope'; -import { maybeStopWatch } from '../../../system/stopwatch'; import type { IpcCommandType, IpcMessage, @@ -13,44 +10,25 @@ import type { IpcNotificationType, WebviewFocusChangedParams, } from '../../protocol'; -import { onIpc, WebviewFocusChangedCommandType, WebviewReadyCommandType } from '../../protocol'; +import { WebviewFocusChangedCommandType, WebviewReadyCommandType } from '../../protocol'; import { DOM } from './dom'; import type { Disposable } from './events'; +import type { HostIpcApi } from './ipc'; +import { getHostIpcApi, HostIpc } from './ipc'; import type { ThemeChangeEvent } from './theme'; import { computeThemeColors, onDidChangeTheme, watchThemeColors } from './theme'; declare const DEBUG: boolean; -interface VsCodeApi { - postMessage(msg: unknown): void; - setState(state: unknown): void; - getState(): unknown; -} - -declare function acquireVsCodeApi(): VsCodeApi; - -const maxSmallIntegerV8 = 2 ** 30; // Max number that can be stored in V8's smis (small integers) - -let ipcSequence = 0; -function nextIpcId() { - if (ipcSequence === maxSmallIntegerV8) { - ipcSequence = 1; - } else { - ipcSequence++; - } - - return `webview:${ipcSequence}`; -} - -const textDecoder = new TextDecoder(); - export abstract class App< State extends { webviewId: CustomEditorIds | WebviewIds | WebviewViewIds; timestamp: number } = { webviewId: CustomEditorIds | WebviewIds | WebviewViewIds; timestamp: number; }, > { - private readonly _api: VsCodeApi; + private readonly _api: HostIpcApi; + private readonly _hostIpc: HostIpc; + protected state: State; protected readonly placement: 'editor' | 'view'; @@ -86,7 +64,10 @@ export abstract class App< this.log(`${appName}()`); // this.log(`ctor(${this.state ? JSON.stringify(this.state) : ''})`); - this._api = acquireVsCodeApi(); + this._api = getHostIpcApi(); + this._hostIpc = new HostIpc(this.appName); + disposables.push(this._hostIpc); + if (this.state != null) { const state = this.getState(); if (this.state.timestamp >= (state?.timestamp ?? 0)) { @@ -106,7 +87,7 @@ export abstract class App< this.bind(); if (this.onMessageReceived != null) { - disposables.push(DOM.on(window, 'message', e => this.onMessageReceivedCore(e))); + disposables.push(this._hostIpc.onReceiveMessage(msg => this.onMessageReceived!(msg))); } this.sendCommand(WebviewReadyCommandType, undefined); @@ -136,23 +117,6 @@ export abstract class App< protected onMessageReceived?(msg: IpcMessage): void; protected onThemeUpdated?(e: ThemeChangeEvent): void; - @debug({ args: { 0: e => `${e.data.id}, method=${e.data.method}` } }) - private onMessageReceivedCore(e: MessageEvent) { - const scope = getLogScope(); - - const msg = e.data as IpcMessage; - if (msg.packed && msg.params instanceof Uint8Array) { - const sw = maybeStopWatch(getNewLogScope(` deserializing msg=${e.data.method}`, scope), { - log: false, - logLevel: 'debug', - }); - msg.params = JSON.parse(textDecoder.decode(msg.params)); - sw?.stop(); - } - - this.onMessageReceived!(msg); - } - private _focused?: boolean; private _inputFocused?: boolean; @@ -207,13 +171,10 @@ export abstract class App< command: TCommand, params: IpcMessageParams, ): void { - const id = nextIpcId(); - this.log(`${this.appName}.sendCommand(${id}): name=${command.method}`); - - this.postMessage({ id: id, method: command.method, params: params }); + this._hostIpc.sendCommand(command, params); } - protected async sendCommandWithCompletion< + protected sendCommandWithCompletion< TCommand extends IpcCommandType, TCompletion extends IpcNotificationType, >( @@ -221,48 +182,10 @@ export abstract class App< params: IpcMessageParams, completion: TCompletion, ): Promise> { - const id = nextIpcId(); - this.log(`${this.appName}.sendCommandWithCompletion(${id}): name=${command.method}`); - - const promise = new Promise>((resolve, reject) => { - let timeout: ReturnType | undefined; - - const disposables = [ - DOM.on(window, 'message', (e: MessageEvent) => { - onIpc(completion, e.data, params => { - if (e.data.completionId === id) { - disposables.forEach(d => d.dispose()); - queueMicrotask(() => resolve(params)); - } - }); - }), - { - dispose: function () { - if (timeout != null) { - clearTimeout(timeout); - timeout = undefined; - } - }, - }, - ]; - - timeout = setTimeout(() => { - timeout = undefined; - disposables.forEach(d => d.dispose()); - debugger; - reject(new Error(`Timed out waiting for completion of ${completion.method}`)); - }, 60000); - }); - - this.postMessage({ id: id, method: command.method, params: params, completionId: id }); - return promise; + return this._hostIpc.sendCommandWithCompletion(command, params, completion); } protected setState(state: Partial) { this._api.setState(state); } - - private postMessage(e: IpcMessage) { - this._api.postMessage(e); - } } diff --git a/src/webviews/apps/shared/ipc.ts b/src/webviews/apps/shared/ipc.ts new file mode 100644 index 0000000000000..3cae1631d4916 --- /dev/null +++ b/src/webviews/apps/shared/ipc.ts @@ -0,0 +1,137 @@ +/*global window */ +import { debug, logName } from '../../../system/decorators/log'; +import { getLogScope, getNewLogScope } from '../../../system/logger.scope'; +import type { Serialized } from '../../../system/serialize'; +import { maybeStopWatch } from '../../../system/stopwatch'; +import type { IpcCommandType, IpcMessage, IpcMessageParams, IpcNotificationType } from '../../protocol'; +import { onIpc } from '../../protocol'; +import { DOM } from './dom'; +import type { Disposable, Event } from './events'; +import { Emitter } from './events'; + +export interface HostIpcApi { + postMessage(msg: unknown): void; + setState(state: unknown): void; + getState(): unknown; +} + +declare function acquireVsCodeApi(): HostIpcApi; + +let _api: HostIpcApi | undefined; +export function getHostIpcApi() { + return (_api ??= acquireVsCodeApi()); +} + +const maxSmallIntegerV8 = 2 ** 30; // Max number that can be stored in V8's smis (small integers) + +let ipcSequence = 0; +export function nextIpcId() { + if (ipcSequence === maxSmallIntegerV8) { + ipcSequence = 1; + } else { + ipcSequence++; + } + + return `webview:${ipcSequence}`; +} + +@logName((c, name) => `${c.appName}(${name})`) +export class HostIpc implements Disposable { + private _onReceiveMessage = new Emitter(); + get onReceiveMessage(): Event { + return this._onReceiveMessage.event; + } + + private readonly _api: HostIpcApi; + private readonly _disposable: Disposable; + private _textDecoder: TextDecoder | undefined; + + constructor(private readonly appName: string) { + this._api = getHostIpcApi(); + this._disposable = DOM.on(window, 'message', e => this.onMessageReceived(e)); + } + + dispose() { + this._disposable.dispose(); + } + + @debug({ args: { 0: e => `${e.data.id}, method=${e.data.method}` } }) + private onMessageReceived(e: MessageEvent) { + const scope = getLogScope(); + + const msg = e.data as IpcMessage; + if (msg.packed && msg.params instanceof Uint8Array) { + const sw = maybeStopWatch(getNewLogScope(` deserializing msg=${e.data.method}`, scope), { + log: false, + logLevel: 'debug', + }); + this._textDecoder ??= new TextDecoder(); + msg.params = JSON.parse(this._textDecoder.decode(msg.params)); + sw?.stop(); + } + + this._onReceiveMessage.fire(msg); + } + + @debug({ args: { 0: c => c.method, 1: false } }) + sendCommand>(command: TCommand, params: IpcMessageParams): void { + const id = nextIpcId(); + // this.log(`${this.appName}.sendCommand(${id}): name=${command.method}`); + + this.postMessage({ id: id, method: command.method, params: params }); + } + + @debug({ args: { 0: c => c.method, 1: false, 2: false } }) + async sendCommandWithCompletion, TCompletion extends IpcNotificationType>( + command: TCommand, + params: IpcMessageParams, + completion: TCompletion, + ): Promise> { + const id = nextIpcId(); + // this.log(`${this.appName}.sendCommandWithCompletion(${id}): name=${command.method}`); + + const promise = new Promise>((resolve, reject) => { + let timeout: ReturnType | undefined; + + const disposables = [ + DOM.on(window, 'message', (e: MessageEvent) => { + onIpc(completion, e.data, params => { + if (e.data.completionId === id) { + disposables.forEach(d => d.dispose()); + queueMicrotask(() => resolve(params)); + } + }); + }), + { + dispose: function () { + if (timeout != null) { + clearTimeout(timeout); + timeout = undefined; + } + }, + }, + ]; + + timeout = setTimeout(() => { + timeout = undefined; + disposables.forEach(d => d.dispose()); + debugger; + reject(new Error(`Timed out waiting for completion of ${completion.method}`)); + }, 60000); + }); + + this.postMessage({ id: id, method: command.method, params: params, completionId: id }); + return promise; + } + + setState(state: Partial) { + this._api.setState(state); + } + + @debug({ args: { 0: e => `${e.id}, method=${e.method}` } }) + private postMessage(e: IpcMessage) { + this._api.postMessage(e); + } +} + +export function assertsSerialized(obj: unknown): asserts obj is Serialized {} From 2cdfe5059c5ad0871a1c844c8da2f2f20936fabc Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 12 Feb 2024 15:40:00 -0500 Subject: [PATCH 0515/1012] Moves logic from commit details app to component --- .../apps/commitDetails/commitDetails.ts | 286 +---------------- .../components/commit-details-app.ts | 292 +++++++++++++++++- .../components/gl-commit-details.ts | 2 +- src/webviews/apps/shared/dom.ts | 6 + 4 files changed, 304 insertions(+), 282 deletions(-) diff --git a/src/webviews/apps/commitDetails/commitDetails.ts b/src/webviews/apps/commitDetails/commitDetails.ts index 73412dba22ccd..2a021f7883e40 100644 --- a/src/webviews/apps/commitDetails/commitDetails.ts +++ b/src/webviews/apps/commitDetails/commitDetails.ts @@ -1,50 +1,12 @@ /*global*/ -import type { ViewFilesLayout } from '../../../config'; import type { Serialized } from '../../../system/serialize'; -import type { CommitActionsParams, Mode, State } from '../../commitDetails/protocol'; -import { - AutolinkSettingsCommandType, - CommitActionsCommandType, - CreatePatchFromWipCommandType, - DidChangeNotificationType, - DidChangeWipStateNotificationType, - DidExplainCommandType, - ExplainCommandType, - FileActionsCommandType, - NavigateCommitCommandType, - OpenFileCommandType, - OpenFileComparePreviousCommandType, - OpenFileCompareWorkingCommandType, - OpenFileOnRemoteCommandType, - PickCommitCommandType, - PinCommitCommandType, - SearchCommitCommandType, - StageFileCommandType, - SwitchModeCommandType, - UnstageFileCommandType, - UpdatePreferencesCommandType, -} from '../../commitDetails/protocol'; -import type { IpcMessage } from '../../protocol'; -import { ExecuteCommandType, onIpc } from '../../protocol'; +import type { State } from '../../commitDetails/protocol'; import { App } from '../shared/appBase'; -import type { WebviewPane, WebviewPaneExpandedChangeEventDetail } from '../shared/components/webview-pane'; import { DOM } from '../shared/dom'; import type { GlCommitDetailsApp } from './components/commit-details-app'; -import type { GlCommitDetails } from './components/gl-commit-details'; -import type { FileChangeListItemDetail } from './components/gl-details-base'; import './commitDetails.scss'; -import '../shared/components/actions/action-item'; -import '../shared/components/actions/action-nav'; -import '../shared/components/code-icon'; -import '../shared/components/commit/commit-identity'; -import '../shared/components/rich/issue-pull-request'; -import '../shared/components/skeleton-loader'; -import '../shared/components/commit/commit-stats'; -import '../shared/components/webview-pane'; import './components/commit-details-app'; -export const uncommittedSha = '0000000000000000000000000000000000000000'; - export type CommitState = SomeNonNullable, 'commit'>; export class CommitDetailsApp extends App> { constructor() { @@ -52,247 +14,13 @@ export class CommitDetailsApp extends App> { } override onInitialize() { - this.attachState(); - } - - override onBind() { - const disposables = [ - DOM.on('[data-action="commit-actions"]', 'click', e => this.onCommitActions(e)), - DOM.on('[data-action="pick-commit"]', 'click', e => this.onPickCommit(e)), - DOM.on('[data-action="wip"]', 'click', e => this.onSwitchMode(e, 'wip')), - DOM.on('[data-action="details"]', 'click', e => this.onSwitchMode(e, 'commit')), - DOM.on('[data-action="search-commit"]', 'click', e => this.onSearchCommit(e)), - DOM.on('[data-action="autolink-settings"]', 'click', e => this.onAutolinkSettings(e)), - DOM.on('[data-action="files-layout"]', 'click', e => this.onToggleFilesLayout(e)), - DOM.on('[data-action="pin"]', 'click', e => this.onTogglePin(e)), - DOM.on('[data-action="back"]', 'click', e => this.onNavigate('back', e)), - DOM.on('[data-action="forward"]', 'click', e => this.onNavigate('forward', e)), - DOM.on('[data-action="create-patch"]', 'click', _e => this.onCreatePatchFromWip(true)), - DOM.on( - '[data-region="rich-pane"]', - 'expanded-change', - e => this.onExpandedChange(e.detail), - ), - DOM.on('[data-action="explain-commit"]', 'click', e => this.onExplainCommit(e)), - DOM.on('[data-action="switch-ai"]', 'click', e => this.onSwitchAiModel(e)), - DOM.on('gl-wip-details', 'create-patch', e => - this.onCreatePatchFromWip(e.detail.checked), - ), - - DOM.on('gl-commit-details', 'file-open-on-remote', e => - this.onOpenFileOnRemote(e.detail), - ), - DOM.on('gl-commit-details,gl-wip-details', 'file-open', e => - this.onOpenFile(e.detail), - ), - DOM.on('gl-commit-details', 'file-compare-working', e => - this.onCompareFileWithWorking(e.detail), - ), - DOM.on( - 'gl-commit-details,gl-wip-details', - 'file-compare-previous', - e => this.onCompareFileWithPrevious(e.detail), - ), - DOM.on('gl-commit-details', 'file-more-actions', e => - this.onFileMoreActions(e.detail), - ), - DOM.on('gl-wip-details', 'file-stage', e => - this.onStageFile(e.detail), - ), - DOM.on('gl-wip-details', 'file-unstage', e => - this.onUnstageFile(e.detail), - ), - ]; - - return disposables; - } - - protected override onMessageReceived(msg: IpcMessage) { - switch (msg.method) { - // case DidChangeRichStateNotificationType.method: - // onIpc(DidChangeRichStateNotificationType, msg, params => { - // if (this.state.selected == null) return; - - // assertsSerialized(params); - - // const newState = { ...this.state }; - // if (params.formattedMessage != null) { - // newState.selected!.message = params.formattedMessage; - // } - // // if (params.pullRequest != null) { - // newState.pullRequest = params.pullRequest; - // // } - // // if (params.formattedMessage != null) { - // newState.autolinkedIssues = params.autolinkedIssues; - // // } - - // this.state = newState; - // this.setState(this.state); - - // this.renderRichContent(); - // }); - // break; - case DidChangeNotificationType.method: - onIpc(DidChangeNotificationType, msg, params => { - assertsSerialized(params.state); - - this.state = params.state; - this.setState(this.state); - this.attachState(); - }); - break; - - case DidChangeWipStateNotificationType.method: - onIpc(DidChangeWipStateNotificationType, msg, params => { - this.state = { ...this.state, ...params }; - this.setState(this.state); - this.attachState(); - }); - break; - - default: - super.onMessageReceived?.(msg); - } - } - - private onCreatePatchFromWip(checked: boolean | 'staged' = true) { - if (this.state.wip?.changes == null) return; - this.sendCommand(CreatePatchFromWipCommandType, { changes: this.state.wip?.changes, checked: checked }); - } - - private onCommandClickedCore(action?: string) { - const command = action?.startsWith('command:') ? action.slice(8) : action; - if (command == null) return; - - this.sendCommand(ExecuteCommandType, { command: command }); - } - - private onSwitchAiModel(_e: MouseEvent) { - this.onCommandClickedCore('gitlens.switchAIModel'); - } - - async onExplainCommit(_e: MouseEvent) { - try { - const result = await this.sendCommandWithCompletion(ExplainCommandType, undefined, DidExplainCommandType); - - if (result.error) { - this.component.explain = { error: { message: result.error.message ?? 'Error retrieving content' } }; - } else if (result.summary) { - this.component.explain = { summary: result.summary }; - } else { - this.component.explain = undefined; - } - } catch (ex) { - this.component.explain = { error: { message: 'Error retrieving content' } }; - } - } - - private onToggleFilesLayout(e: MouseEvent) { - const layout = ((e.target as HTMLElement)?.dataset.filesLayout as ViewFilesLayout) ?? undefined; - if (layout === this.state.preferences?.files?.layout) return; - - const files = { - ...this.state.preferences?.files, - layout: layout ?? 'auto', - }; - - this.state = { ...this.state, preferences: { ...this.state.preferences, files: files } }; - this.attachState(); - - this.sendCommand(UpdatePreferencesCommandType, { files: files }); - } - - private onExpandedChange(e: WebviewPaneExpandedChangeEventDetail) { - this.state = { ...this.state, preferences: { ...this.state.preferences, autolinksExpanded: e.expanded } }; - this.attachState(); - - this.sendCommand(UpdatePreferencesCommandType, { autolinksExpanded: e.expanded }); - } - - private onNavigate(direction: 'back' | 'forward', e: Event) { - e.preventDefault(); - this.sendCommand(NavigateCommitCommandType, { direction: direction }); - } - - private onTogglePin(e: MouseEvent) { - e.preventDefault(); - this.sendCommand(PinCommitCommandType, { pin: !this.state.pinned }); - } - - private onAutolinkSettings(e: MouseEvent) { - e.preventDefault(); - this.sendCommand(AutolinkSettingsCommandType, undefined); - } - - private onPickCommit(_e: MouseEvent) { - this.sendCommand(PickCommitCommandType, undefined); - } - - private onSearchCommit(_e: MouseEvent) { - this.sendCommand(SearchCommitCommandType, undefined); - } - - private onSwitchMode(_e: MouseEvent, mode: Mode) { - this.state = { ...this.state, mode: mode }; - this.attachState(); - - this.sendCommand(SwitchModeCommandType, { mode: mode, repoPath: this.state.commit?.repoPath }); - } - - private onOpenFileOnRemote(e: FileChangeListItemDetail) { - this.sendCommand(OpenFileOnRemoteCommandType, e); - } - - private onOpenFile(e: FileChangeListItemDetail) { - this.sendCommand(OpenFileCommandType, e); - } - - private onCompareFileWithWorking(e: FileChangeListItemDetail) { - this.sendCommand(OpenFileCompareWorkingCommandType, e); - } - - private onCompareFileWithPrevious(e: FileChangeListItemDetail) { - this.sendCommand(OpenFileComparePreviousCommandType, e); - } - - private onFileMoreActions(e: FileChangeListItemDetail) { - this.sendCommand(FileActionsCommandType, e); - } - - onStageFile(e: FileChangeListItemDetail): void { - this.sendCommand(StageFileCommandType, e); - } - - onUnstageFile(e: FileChangeListItemDetail): void { - this.sendCommand(UnstageFileCommandType, e); - } - - private onCommitActions(e: MouseEvent) { - e.preventDefault(); - if (this.state.commit === undefined) { - e.stopPropagation(); - return; - } - - const action = (e.target as HTMLElement)?.getAttribute('data-action-type'); - if (action == null) return; - - this.sendCommand(CommitActionsCommandType, { action: action as CommitActionsParams['action'], alt: e.altKey }); - } - - private _component?: GlCommitDetailsApp; - private get component() { - if (this._component == null) { - this._component = (document.getElementById('app') as GlCommitDetailsApp)!; - } - return this._component; - } - - attachState() { - this.component.state = this.state; + const component = document.getElementById('app') as GlCommitDetailsApp; + component.state = this.state; + DOM.on>(component, 'state-changed', e => { + this.state = e.detail; + this.setState(this.state); + }); } } -function assertsSerialized(obj: unknown): asserts obj is Serialized {} - new CommitDetailsApp(); diff --git a/src/webviews/apps/commitDetails/components/commit-details-app.ts b/src/webviews/apps/commitDetails/components/commit-details-app.ts index 0916d00c693fe..909c2303a1cde 100644 --- a/src/webviews/apps/commitDetails/components/commit-details-app.ts +++ b/src/webviews/apps/commitDetails/components/commit-details-app.ts @@ -3,13 +3,53 @@ import { html, LitElement } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; import { ifDefined } from 'lit/directives/if-defined.js'; import { when } from 'lit/directives/when.js'; +import type { ViewFilesLayout } from '../../../../config'; import type { Serialized } from '../../../../system/serialize'; import { pluralize } from '../../../../system/string'; -import type { State } from '../../../commitDetails/protocol'; +import type { CommitActionsParams, Mode, State } from '../../../commitDetails/protocol'; +import { + AutolinkSettingsCommandType, + CommitActionsCommandType, + CreatePatchFromWipCommandType, + DidChangeNotificationType, + DidChangeWipStateNotificationType, + DidExplainCommandType, + ExplainCommandType, + FileActionsCommandType, + NavigateCommitCommandType, + OpenFileCommandType, + OpenFileComparePreviousCommandType, + OpenFileCompareWorkingCommandType, + OpenFileOnRemoteCommandType, + PickCommitCommandType, + PinCommitCommandType, + SearchCommitCommandType, + StageFileCommandType, + SwitchModeCommandType, + UnstageFileCommandType, + UpdatePreferencesCommandType, +} from '../../../commitDetails/protocol'; +import type { IpcMessage } from '../../../protocol'; +import { ExecuteCommandType, onIpc } from '../../../protocol'; import '../../shared/components/button'; import './gl-commit-details'; import './gl-wip-details'; -import { uncommittedSha } from '../commitDetails'; +import type { WebviewPane, WebviewPaneExpandedChangeEventDetail } from '../../shared/components/webview-pane'; +import type { Disposable } from '../../shared/dom'; +import { DOM } from '../../shared/dom'; +import { assertsSerialized, HostIpc } from '../../shared/ipc'; +import type { GlCommitDetails } from './gl-commit-details'; +import type { FileChangeListItemDetail } from './gl-details-base'; +import '../../shared/components/actions/action-item'; +import '../../shared/components/actions/action-nav'; +import '../../shared/components/code-icon'; +import '../../shared/components/commit/commit-identity'; +import '../../shared/components/rich/issue-pull-request'; +import '../../shared/components/skeleton-loader'; +import '../../shared/components/commit/commit-stats'; +import '../../shared/components/webview-pane'; + +export const uncommittedSha = '0000000000000000000000000000000000000000'; interface ExplainState { cancelled?: boolean; @@ -62,6 +102,9 @@ export class GlCommitDetailsApp extends LitElement { return actions; } + private _disposables: Disposable[] = []; + private _hostIpc!: HostIpc; + constructor() { super(); @@ -84,6 +127,117 @@ export class GlCommitDetailsApp extends LitElement { } } + override connectedCallback() { + super.connectedCallback(); + + this._hostIpc = new HostIpc('commit-details'); + + this._disposables = [ + this._hostIpc.onReceiveMessage(e => this.onMessageReceived(e)), + this._hostIpc, + + DOM.on('[data-action="commit-actions"]', 'click', e => this.onCommitActions(e)), + DOM.on('[data-action="pick-commit"]', 'click', e => this.onPickCommit(e)), + DOM.on('[data-action="wip"]', 'click', e => this.onSwitchMode(e, 'wip')), + DOM.on('[data-action="details"]', 'click', e => this.onSwitchMode(e, 'commit')), + DOM.on('[data-action="search-commit"]', 'click', e => this.onSearchCommit(e)), + DOM.on('[data-action="autolink-settings"]', 'click', e => this.onAutolinkSettings(e)), + DOM.on('[data-action="files-layout"]', 'click', e => this.onToggleFilesLayout(e)), + DOM.on('[data-action="pin"]', 'click', e => this.onTogglePin(e)), + DOM.on('[data-action="back"]', 'click', e => this.onNavigate('back', e)), + DOM.on('[data-action="forward"]', 'click', e => this.onNavigate('forward', e)), + DOM.on('[data-action="create-patch"]', 'click', _e => this.onCreatePatchFromWip(true)), + DOM.on( + '[data-region="rich-pane"]', + 'expanded-change', + e => this.onExpandedChange(e.detail), + ), + DOM.on('[data-action="explain-commit"]', 'click', e => this.onExplainCommit(e)), + DOM.on('[data-action="switch-ai"]', 'click', e => this.onSwitchAiModel(e)), + DOM.on('gl-wip-details', 'create-patch', e => + this.onCreatePatchFromWip(e.detail.checked), + ), + + DOM.on('gl-commit-details', 'file-open-on-remote', e => + this.onOpenFileOnRemote(e.detail), + ), + DOM.on('gl-commit-details,gl-wip-details', 'file-open', e => + this.onOpenFile(e.detail), + ), + DOM.on('gl-commit-details', 'file-compare-working', e => + this.onCompareFileWithWorking(e.detail), + ), + DOM.on( + 'gl-commit-details,gl-wip-details', + 'file-compare-previous', + e => this.onCompareFileWithPrevious(e.detail), + ), + DOM.on('gl-commit-details', 'file-more-actions', e => + this.onFileMoreActions(e.detail), + ), + DOM.on('gl-wip-details', 'file-stage', e => + this.onStageFile(e.detail), + ), + DOM.on('gl-wip-details', 'file-unstage', e => + this.onUnstageFile(e.detail), + ), + ]; + } + + private onMessageReceived(msg: IpcMessage) { + switch (msg.method) { + // case DidChangeRichStateNotificationType.method: + // onIpc(DidChangeRichStateNotificationType, msg, params => { + // if (this.state.selected == null) return; + + // assertsSerialized(params); + + // const newState = { ...this.state }; + // if (params.formattedMessage != null) { + // newState.selected!.message = params.formattedMessage; + // } + // // if (params.pullRequest != null) { + // newState.pullRequest = params.pullRequest; + // // } + // // if (params.formattedMessage != null) { + // newState.autolinkedIssues = params.autolinkedIssues; + // // } + + // this.state = newState; + // this.setState(this.state); + + // this.renderRichContent(); + // }); + // break; + case DidChangeNotificationType.method: + onIpc(DidChangeNotificationType, msg, params => { + assertsSerialized(params.state); + + this.state = params.state; + this.dispatchEvent(new CustomEvent('state-changed', { detail: this.state })); + // this.setState(this.state); + // this.attachState(); + }); + break; + + case DidChangeWipStateNotificationType.method: + onIpc(DidChangeWipStateNotificationType, msg, params => { + this.state = { ...this.state, ...params } as any; + this.dispatchEvent(new CustomEvent('state-changed', { detail: this.state })); + // this.setState(this.state); + // this.attachState(); + }); + break; + } + } + + override disconnectedCallback() { + this._disposables.forEach(d => d.dispose()); + this._disposables = []; + + super.disconnectedCallback(); + } + override render() { const wip = this.state?.wip; @@ -147,4 +301,138 @@ export class GlCommitDetailsApp extends LitElement { protected override createRenderRoot() { return this; } + + private onCreatePatchFromWip(checked: boolean | 'staged' = true) { + if (this.state?.wip?.changes == null) return; + this._hostIpc.sendCommand(CreatePatchFromWipCommandType, { changes: this.state.wip.changes, checked: checked }); + } + + private onCommandClickedCore(action?: string) { + const command = action?.startsWith('command:') ? action.slice(8) : action; + if (command == null) return; + + this._hostIpc.sendCommand(ExecuteCommandType, { command: command }); + } + + private onSwitchAiModel(_e: MouseEvent) { + this.onCommandClickedCore('gitlens.switchAIModel'); + } + + async onExplainCommit(_e: MouseEvent) { + try { + const result = await this._hostIpc.sendCommandWithCompletion( + ExplainCommandType, + undefined, + DidExplainCommandType, + ); + if (result.error) { + this.explain = { error: { message: result.error.message ?? 'Error retrieving content' } }; + } else if (result.summary) { + this.explain = { summary: result.summary }; + } else { + this.explain = undefined; + } + } catch (ex) { + this.explain = { error: { message: 'Error retrieving content' } }; + } + } + + private onToggleFilesLayout(e: MouseEvent) { + const layout = ((e.target as HTMLElement)?.dataset.filesLayout as ViewFilesLayout) ?? undefined; + if (layout === this.state?.preferences?.files?.layout) return; + + const files = { + ...this.state!.preferences?.files, + layout: layout ?? 'auto', + }; + + this.state = { ...this.state, preferences: { ...this.state!.preferences, files: files } } as any; + // this.attachState(); + + this._hostIpc.sendCommand(UpdatePreferencesCommandType, { files: files }); + } + + private onExpandedChange(e: WebviewPaneExpandedChangeEventDetail) { + this.state = { + ...this.state, + preferences: { ...this.state!.preferences, autolinksExpanded: e.expanded }, + } as any; + // this.attachState(); + + this._hostIpc.sendCommand(UpdatePreferencesCommandType, { autolinksExpanded: e.expanded }); + } + + private onNavigate(direction: 'back' | 'forward', e: Event) { + e.preventDefault(); + this._hostIpc.sendCommand(NavigateCommitCommandType, { direction: direction }); + } + + private onTogglePin(e: MouseEvent) { + e.preventDefault(); + this._hostIpc.sendCommand(PinCommitCommandType, { pin: !this.state!.pinned }); + } + + private onAutolinkSettings(e: MouseEvent) { + e.preventDefault(); + this._hostIpc.sendCommand(AutolinkSettingsCommandType, undefined); + } + + private onPickCommit(_e: MouseEvent) { + this._hostIpc.sendCommand(PickCommitCommandType, undefined); + } + + private onSearchCommit(_e: MouseEvent) { + this._hostIpc.sendCommand(SearchCommitCommandType, undefined); + } + + private onSwitchMode(_e: MouseEvent, mode: Mode) { + this.state = { ...this.state, mode: mode } as any; + // this.attachState(); + + this._hostIpc.sendCommand(SwitchModeCommandType, { mode: mode, repoPath: this.state!.commit?.repoPath }); + } + + private onOpenFileOnRemote(e: FileChangeListItemDetail) { + this._hostIpc.sendCommand(OpenFileOnRemoteCommandType, e); + } + + private onOpenFile(e: FileChangeListItemDetail) { + this._hostIpc.sendCommand(OpenFileCommandType, e); + } + + private onCompareFileWithWorking(e: FileChangeListItemDetail) { + this._hostIpc.sendCommand(OpenFileCompareWorkingCommandType, e); + } + + private onCompareFileWithPrevious(e: FileChangeListItemDetail) { + this._hostIpc.sendCommand(OpenFileComparePreviousCommandType, e); + } + + private onFileMoreActions(e: FileChangeListItemDetail) { + this._hostIpc.sendCommand(FileActionsCommandType, e); + } + + private onStageFile(e: FileChangeListItemDetail): void { + this._hostIpc.sendCommand(StageFileCommandType, e); + } + + private onUnstageFile(e: FileChangeListItemDetail): void { + this._hostIpc.sendCommand(UnstageFileCommandType, e); + } + + private onCommitActions(e: MouseEvent) { + e.preventDefault(); + if (this.state?.commit === undefined) { + e.stopPropagation(); + return; + } + + const action = (e.target as HTMLElement)?.getAttribute('data-action-type'); + if (action == null) return; + + this._hostIpc.sendCommand(CommitActionsCommandType, { + action: action as CommitActionsParams['action'], + alt: e.altKey, + }); + } } diff --git a/src/webviews/apps/commitDetails/components/gl-commit-details.ts b/src/webviews/apps/commitDetails/components/gl-commit-details.ts index 1b6fa5697e647..e418dc1472072 100644 --- a/src/webviews/apps/commitDetails/components/gl-commit-details.ts +++ b/src/webviews/apps/commitDetails/components/gl-commit-details.ts @@ -9,7 +9,7 @@ import type { Serialized } from '../../../../system/serialize'; import type { State } from '../../../commitDetails/protocol'; import { messageHeadlineSplitterToken } from '../../../commitDetails/protocol'; import type { TreeItemAction, TreeItemBase } from '../../shared/components/tree/base'; -import { uncommittedSha } from '../commitDetails'; +import { uncommittedSha } from './commit-details-app'; import type { File } from './gl-details-base'; import { GlDetailsBase } from './gl-details-base'; diff --git a/src/webviews/apps/shared/dom.ts b/src/webviews/apps/shared/dom.ts index cb2d7797e3c57..0c5ad114e01b3 100644 --- a/src/webviews/apps/shared/dom.ts +++ b/src/webviews/apps/shared/dom.ts @@ -24,6 +24,12 @@ export namespace DOM { listener: (e: DocumentEventMap[K] & { target: HTMLElement | null }, target: T) => void, options?: boolean | AddEventListenerOptions, ): Disposable; + export function on( + elemtent: T, + name: string, + listener: (e: CustomEvent & { target: HTMLElement | null }, target: T) => void, + options?: boolean | AddEventListenerOptions, + ): Disposable; export function on( selector: string, name: K, From f00d2989b5338dac10e8686d829604cf388e9f47 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 13 Feb 2024 01:29:11 -0500 Subject: [PATCH 0516/1012] Replaces isEditor/isView with isHost --- src/plus/webviews/graph/graphWebview.ts | 35 ++++++++--------- .../patchDetails/patchDetailsWebview.ts | 16 +++++--- src/plus/webviews/timeline/timelineWebview.ts | 38 ++++++++++--------- src/webviews/webviewController.ts | 31 ++++++++------- src/webviews/webviewProvider.ts | 4 +- 5 files changed, 69 insertions(+), 55 deletions(-) diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts index 17a45f20832c9..9d6370378b420 100644 --- a/src/plus/webviews/graph/graphWebview.ts +++ b/src/plus/webviews/graph/graphWebview.ts @@ -255,7 +255,7 @@ export class GraphWebviewProvider implements WebviewProvider this.host.refresh(true)), registerCommand( `${this.host.id}.openInTab`, @@ -395,12 +396,10 @@ export class GraphWebviewProvider implements WebviewProvider(Commands.ShowInDetailsView, { - repoPath: ref.repoPath, - refs: [ref.ref], - }); + if (this.host.isHost('view')) { + return void showGraphDetailsView(ref, { preserveFocus: true, preserveVisibility: false }); } - return void showGraphDetailsView(ref, { preserveFocus: true, preserveVisibility: false }); + return executeCommand(Commands.ShowInDetailsView, { + repoPath: ref.repoPath, + refs: [ref.ref], + }); } @debug() diff --git a/src/plus/webviews/patchDetails/patchDetailsWebview.ts b/src/plus/webviews/patchDetails/patchDetailsWebview.ts index fea4ab03b6ef5..377c5fc75ac68 100644 --- a/src/plus/webviews/patchDetails/patchDetailsWebview.ts +++ b/src/plus/webviews/patchDetails/patchDetailsWebview.ts @@ -199,12 +199,16 @@ export class PatchDetailsWebviewProvider } registerCommands(): Disposable[] { - return this.host.isEditor() - ? [] - : [ - registerCommand(`${this.host.id}.refresh`, () => this.host.refresh(true)), - registerCommand(`${this.host.id}.close`, () => this.closeView()), - ]; + const commands: Disposable[] = []; + + if (this.host.isHost('view')) { + commands.push( + registerCommand(`${this.host.id}.refresh`, () => this.host.refresh(true)), + registerCommand(`${this.host.id}.close`, () => this.closeView()), + ); + } + + return commands; } onMessageReceived(e: IpcMessage) { diff --git a/src/plus/webviews/timeline/timelineWebview.ts b/src/plus/webviews/timeline/timelineWebview.ts index 3e053b1ce1637..7f4410661c66a 100644 --- a/src/plus/webviews/timeline/timelineWebview.ts +++ b/src/plus/webviews/timeline/timelineWebview.ts @@ -62,7 +62,7 @@ export class TimelineWebviewProvider implements WebviewProvider this.host.refresh(true), this), - registerCommand( - `${this.host.id}.openInTab`, - () => { - if (this._context.uri == null) return; - - void executeCommand(Commands.ShowInTimeline, this._context.uri); - }, - this, - ), - ]; + const commands: Disposable[] = []; + + if (this.host.isHost('view')) { + commands.push( + registerCommand(`${this.host.id}.refresh`, () => this.host.refresh(true), this), + registerCommand( + `${this.host.id}.openInTab`, + () => { + if (this._context.uri == null) return; + + void executeCommand(Commands.ShowInTimeline, this._context.uri); + }, + this, + ), + ); + } + + return commands; } onVisibilityChanged(visible: boolean) { if (!visible) return; - if (!this.host.isEditor()) { + if (this.host.isHost('view')) { this.updatePendingEditor(window.activeTextEditor); } @@ -298,7 +302,7 @@ export class TimelineWebviewProvider implements WebviewProvider; private readonly webview: Webview; @@ -144,7 +145,7 @@ export class WebviewController< this.webview = parent.webview; const isInEditor = 'onDidChangeViewState' in parent; - this._isEditor = isInEditor; + this._isInEditor = isInEditor; this._originalTitle = descriptor.title; parent.title = descriptor.title; @@ -196,12 +197,14 @@ export class WebviewController< this._initializing = undefined; } - private _isEditor: boolean; - isEditor(): this is WebviewPanelController { - return this._isEditor; - } - isView(): this is WebviewViewController { - return !this._isEditor; + isHost(type: 'editor'): this is WebviewPanelController; + isHost(type: 'view'): this is WebviewViewController; + isHost( + type: 'editor' | 'view', + ): this is + | WebviewPanelController + | WebviewViewController { + return type === 'editor' ? this._isInEditor : !this._isInEditor; } get active() { @@ -256,14 +259,14 @@ export class WebviewController< options?: WebviewShowOptions, ...args: WebviewShowingArgs ): boolean | undefined { - if (!this.isEditor()) return undefined; + if (!this.isHost('editor')) return undefined; if (options?.column != null && options.column !== this.parent.viewColumn) return false; return this.provider.canReuseInstance?.(...args); } getSplitArgs(): WebviewShowingArgs { - if (!this.isEditor()) return []; + if (this.isHost('view')) return []; return this.provider.getSplitArgs?.() ?? []; } @@ -291,14 +294,14 @@ export class WebviewController< this.webview.html = await this.getHtml(this.webview); } - if (this.isEditor()) { + if (this.isHost('editor')) { if (!loading) { this.parent.reveal( options.column ?? this.parent.viewColumn ?? this.descriptor.column ?? ViewColumn.Beside, options.preserveFocus ?? false, ); } - } else if (this.isView()) { + } else if (this.isHost('view')) { await executeCoreCommand(`${this.id}.focus`, options); if (loading) { this.provider.onVisibilityChanged?.(true); @@ -490,7 +493,7 @@ export class WebviewController< this._cspNonce, this.asWebviewUri(this.getRootUri()).toString(), this.getWebRoot(), - this.isEditor() ? 'editor' : 'view', + this.isHost('editor') ? 'editor' : 'view', bootstrap, head, body, @@ -573,7 +576,7 @@ export class WebviewController< let success; - if (this.isView()) { + if (this.isHost('view')) { // If we are in a view, show progress if we are waiting too long const result = await pauseOnCancelOrTimeout(promise, undefined, 100); if (result.paused) { diff --git a/src/webviews/webviewProvider.ts b/src/webviews/webviewProvider.ts index cc8b5e38bf973..7b303fab07ff0 100644 --- a/src/webviews/webviewProvider.ts +++ b/src/webviews/webviewProvider.ts @@ -63,7 +63,9 @@ export interface WebviewHost< clearPendingIpcNotifications(): void; sendPendingIpcNotifications(): void; - isEditor(): boolean; + isHost(type: 'editor'): this is WebviewHost; + isHost(type: 'view'): this is WebviewHost; + notify>( type: T, params: IpcMessageParams, From 8545d8cc3e4a483dfa74adea90acdab944b46c06 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Wed, 14 Feb 2024 11:53:48 -0500 Subject: [PATCH 0517/1012] Fixes initial context keys for patches and AI features --- src/plus/gk/account/organizationService.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/plus/gk/account/organizationService.ts b/src/plus/gk/account/organizationService.ts index 8972f6a952b0d..7cfb7b3da05dc 100644 --- a/src/plus/gk/account/organizationService.ts +++ b/src/plus/gk/account/organizationService.ts @@ -28,12 +28,10 @@ export class OrganizationService implements Disposable { private readonly connection: ServerConnection, ) { this._disposable = Disposable.from( - once(onDidChangeContext)(async key => { - if (key === 'gitlens:plus') { - const orgId = await this.getActiveOrganizationId(); - void this.updateOrganizationPermissions(orgId); - } - }, this), + once(container.onReady)(async () => { + const orgId = await this.getActiveOrganizationId(); + void this.updateOrganizationPermissions(orgId); + }), container.subscription.onDidChange(this.onSubscriptionChanged, this), ); } From dad7c0f24be5e064244dc08bc3b50da83e097522 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Wed, 14 Feb 2024 11:56:07 -0500 Subject: [PATCH 0518/1012] Fixes subscription change handler for drafts view --- src/views/draftsView.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/views/draftsView.ts b/src/views/draftsView.ts index 4557bbcb8546b..80261e681ba9f 100644 --- a/src/views/draftsView.ts +++ b/src/views/draftsView.ts @@ -1,4 +1,4 @@ -import type { CancellationToken } from 'vscode'; +import type { CancellationToken, TreeViewVisibilityChangeEvent } from 'vscode'; import { Disposable, TreeItem, TreeItemCollapsibleState, window } from 'vscode'; import type { RepositoriesViewConfig } from '../config'; import { Commands } from '../constants'; @@ -91,16 +91,17 @@ export class DraftsView extends ViewBase<'drafts', DraftsViewNode, RepositoriesV return new DraftsViewNode(this); } - override async show(options?: { preserveFocus?: boolean | undefined }): Promise { - if (!(await ensurePlusFeaturesEnabled())) return; - + protected override onVisibilityChanged(e: TreeViewVisibilityChangeEvent): void { if (this._disposable == null) { - // this._disposable = Disposable.from( - // this.container.drafts.onDidResetDrafts(() => void this.ensureRoot().triggerChange(true)), - // ); this._disposable = Disposable.from(this.container.subscription.onDidChange(() => this.refresh(true), this)); } + super.onVisibilityChanged(e); + } + + override async show(options?: { preserveFocus?: boolean | undefined }): Promise { + if (!(await ensurePlusFeaturesEnabled())) return; + return super.show(options); } From f563e216dac43143021d5c145848bfa2cc6b273b Mon Sep 17 00:00:00 2001 From: Ramin Tadayon <67011668+axosoft-ramint@users.noreply.github.com> Date: Wed, 14 Feb 2024 12:55:01 -0700 Subject: [PATCH 0519/1012] Adds trial reactivation UX and command (#3147) * Adds trial reactivation UX and command * Updates wording on all trial states and references * Fixes button text in Worktrees view --- README.md | 12 ++-- package.json | 30 +++++--- src/constants.ts | 1 + src/plus/gk/account/subscription.ts | 25 +++++-- src/plus/gk/account/subscriptionService.ts | 68 ++++++++++++++++++- src/plus/gk/checkin.ts | 6 ++ src/plus/integrations/providerIntegration.ts | 2 +- src/plus/utils.ts | 2 +- src/plus/workspaces/workspacesService.ts | 2 +- src/quickpicks/items/directive.ts | 2 +- src/system/date.ts | 10 +-- .../account/components/account-content.ts | 64 +++++++++++------ .../apps/plus/focus/components/focus-app.ts | 16 ++++- src/webviews/apps/plus/graph/GraphWrapper.tsx | 11 ++- .../components/feature-gate-plus-state.ts | 31 +++++---- src/webviews/apps/plus/timeline/timeline.html | 13 +++- .../shared/components/feature-gate-badge.ts | 1 + .../apps/shared/components/feature-gate.ts | 8 +++ src/webviews/apps/welcome/welcome.html | 2 +- 19 files changed, 235 insertions(+), 71 deletions(-) diff --git a/README.md b/README.md index 5aa6bc3fd2f27..bbe86bb827d98 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ See the [FAQ](#is-gitlens-free-to-use 'Jump to FAQ') for more details. [Features](#discover-powerful-features 'Jump to Discover Powerful Features') | [Labs](#gitkraken-labs 'Jump to GitKraken Labs') -| [Pro](#ready-for-gitlens-pro 'Jump to Ready for GitKraken Pro?') +| [Pro](#ready-for-gitlens-pro 'Jump to Ready for GitLens Pro?') | [FAQ](#faq 'Jump to FAQ') | [Support and Community](#support-and-community 'Jump to Support and Community') | [Contributing](#contributing 'Jump to Contributing') @@ -257,11 +257,11 @@ Use the Explain panel on the **Commit Details** view to leverage AI to help you Use the `Generate Commit Message` command from the Source Control view's context menu to automatically generate a commit message for your staged changes by leveraging AI. -# Ready for GitKraken Pro? +# Ready for GitLens Pro? -When you're ready to unlock the full potential of GitLens and enjoy all the benefits on your privately hosted repos, consider upgrading to GitKraken Pro. With GitKraken Pro, you'll gain access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan. +When you're ready to unlock the full potential of GitLens and enjoy all the benefits on your privately hosted repos, consider upgrading to GitLens Pro. With GitLens Pro, you'll gain access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan. -To learn more about the pricing and the additional ✨ and ☁️ features offered with GitKraken Pro, visit the [GitLens Pricing page](https://www.gitkraken.com/gitlens/pricing). Upgrade to GitKraken Pro today and take your Git workflow to the next level! +To learn more about the pricing and the additional ✨ and ☁️ features offered with GitLens Pro, visit the [GitLens Pricing page](https://www.gitkraken.com/gitlens/pricing). Upgrade to GitLens Pro today and take your Git workflow to the next level! # FAQ @@ -274,7 +274,7 @@ Yes. All features are free to use on all repos, **except** for features, While GitLens offers a remarkable set of free features, a subset of features tailored for professional developers and teams, marked with a ✨, require a trial or paid plan for use on privately hosted repos — use on local or publicly hosted repos is free for everyone. Additionally some features marked with a ☁️, rely on GitKraken Dev Services which requires a GitKraken account and access is based on your plan, e.g. Free, Pro, etc. -Preview ✨ features instantly for free for 3 days without an account, or start a free GitKraken trial to get an additional 7 days and gain access to ☁️ features to experience the full power of GitLens. +Preview ✨ features instantly for free for 3 days without an account, or start a free GitLens Pro trial to get an additional 7 days and gain access to ☁️ features to experience the full power of GitLens. ## Are ✨ and ☁️ features free to use? @@ -300,7 +300,7 @@ Join the GitLens community on [GitHub Discussions](https://github.com/gitkraken/ For any issues or inquiries related to GitLens, you can reach out to the GitKraken support team via the [official support page](https://support.gitkraken.com/). They will be happy to assist you with any problems you may encounter. -With GitKraken Pro, you gain access to priority email support from our customer success team, ensuring higher priority and faster response times. Custom onboarding and training are also available to help you and your team quickly get up and running with a GitKraken Pro plan. +With GitLens Pro, you gain access to priority email support from our customer success team, ensuring higher priority and faster response times. Custom onboarding and training are also available to help you and your team quickly get up and running with a GitLens Pro plan. # Contributing diff --git a/package.json b/package.json index 945ec0c167fdd..4f38cb97d6866 100644 --- a/package.json +++ b/package.json @@ -5123,6 +5123,11 @@ "title": "Preview Pro", "category": "GitLens" }, + { + "command": "gitlens.plus.reactivateProTrial", + "title": "Reactivate Pro Trial", + "category": "GitLens" + }, { "command": "gitlens.plus.manage", "title": "Manage Your Account...", @@ -8929,6 +8934,10 @@ "command": "gitlens.plus.startPreviewTrial", "when": "!gitlens:plus" }, + { + "command": "gitlens.plus.reactivateProTrial", + "when": "gitlens:plus:state == 5" + }, { "command": "gitlens.plus.manage", "when": "gitlens:plus" @@ -16123,7 +16132,7 @@ }, { "view": "gitlens.views.drafts", - "contents": "[Start Free Pro Trial](command:gitlens.plus.signUp)\n\nStart a free 7-day Pro trial to use Cloud Patches, or [sign in](command:gitlens.plus.login).\n☁️ Requires a GitKraken account and access is based on your plan, e.g. Free, Pro, etc", + "contents": "[Start Pro Trial](command:gitlens.plus.signUp)\n\nStart a free 7-day GitLens Pro trial to use Cloud Patches, or [sign in](command:gitlens.plus.login).\n☁️ Requires a GitKraken account and access is based on your plan, e.g. Free, Pro, etc", "when": "!gitlens:plus" }, { @@ -16137,7 +16146,7 @@ }, { "view": "gitlens.views.workspaces", - "contents": "[Start Free GitKraken Trial](command:gitlens.plus.signUp)\n\nStart a free 7-day GitKraken trial to use GitKraken Workspaces, or [sign in](command:gitlens.plus.login).\n☁️ Requires a GitKraken account and access is based on your plan, e.g. Free, Pro, etc", + "contents": "[Start Pro Trial](command:gitlens.plus.signUp)\n\nStart a free 7-day GitLens Pro trial to use GitKraken Workspaces, or [sign in](command:gitlens.plus.login).\n☁️ Requires a GitKraken account and access is based on your plan, e.g. Free, Pro, etc", "when": "!gitlens:plus" }, { @@ -16157,18 +16166,23 @@ }, { "view": "gitlens.views.worktrees", - "contents": "[Preview Pro](command:gitlens.plus.startPreviewTrial)\n\nPreview Pro for 3 days, or [sign up](command:gitlens.plus.signUp) to start a full 7-day GitKraken trial.\n✨ A trial or paid plan is required to use this on privately hosted repos.", + "contents": "[Preview Pro](command:gitlens.plus.startPreviewTrial)\n\nPreview Pro for 3 days, or [sign up](command:gitlens.plus.signUp) to start a full 7-day GitLens Pro trial.\n[✨ Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) — seamlessly work on multiple branches simultaneously.", "when": "gitlens:plus:required && gitlens:plus:state == 0" }, { "view": "gitlens.views.worktrees", - "contents": "Your 3-day Pro preview has ended, start a free GitKraken trial to get an additional 7 days, or [sign in](command:gitlens.plus.login).\n\n[Start Free GitKraken Trial](command:gitlens.plus.signUp)\n✨ A trial or paid plan is required to use this on privately hosted repos.", + "contents": "Your 3-day preview has ended. Start a free GitLens Pro trial to get an additional 7 days, or [sign in](command:gitlens.plus.login).\n\n[Start Pro Trial](command:gitlens.plus.signUp)\n[✨ Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) — seamlessly work on multiple branches simultaneously.", "when": "gitlens:plus:required && gitlens:plus:state == 2" }, { "view": "gitlens.views.worktrees", - "contents": "Your GitKraken trial has ended, please upgrade to continue to use this on privately hosted repos.\n\n[Upgrade to Pro](command:gitlens.plus.purchase)\n✨ A paid plan is required to use this on privately hosted repos.", + "contents": "Your GitLens Pro trial has ended. Please upgrade to continue to use this on privately hosted repos.\n\n[Get GitLens Pro](command:gitlens.plus.purchase)\n[✨ Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) — seamlessly work on multiple branches simultaneously.", "when": "gitlens:plus:required && gitlens:plus:state == 4" + }, + { + "view": "gitlens.views.worktrees", + "contents": "You're eligible to reactivate your GitLens Pro trial and experience all the new Pro features — free for another 7 days!\n\n[Try Pro](command:gitlens.plus.reactivateProTrial)\n[✨ Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) — seamlessly work on multiple branches simultaneously.", + "when": "gitlens:plus:required && gitlens:plus:state == 5" } ], "views": { @@ -16441,8 +16455,8 @@ }, { "id": "gitlens.welcome.preview", - "title": "Previewing GitKraken Pro", - "description": "During your preview, you have access to ✨ features on privately hosted repos. [Learn more](https://www.gitkraken.com/gitlens/pro-features)\n\n[Start Free GitKraken Trial](command:gitlens.plus.signUp)\n\nStart a free GitKraken trial to get an additional 7 days.", + "title": "Previewing GitLens Pro", + "description": "During your preview, you have access to ✨ features on privately hosted repos. [Learn more](https://www.gitkraken.com/gitlens/pro-features)\n\n[Start Free Pro Trial](command:gitlens.plus.signUp)\n\nStart a free Pro trial to get an additional 7 days.", "media": { "markdown": "walkthroughs/welcome/preview.md" }, @@ -16450,7 +16464,7 @@ }, { "id": "gitlens.welcome.trial", - "title": "Trialing GitKraken Pro", + "title": "Trialing GitLens Pro", "description": "During your trial, you have access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan. [Learn more](https://www.gitkraken.com/gitlens/pro-features)\n\n[Upgrade to Pro](command:gitlens.plus.purchase)", "media": { "markdown": "walkthroughs/welcome/trial.md" diff --git a/src/constants.ts b/src/constants.ts index 68ef8aac7c652..53f50cccf3440 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -252,6 +252,7 @@ export const enum Commands { PlusLogout = 'gitlens.plus.logout', PlusManage = 'gitlens.plus.manage', PlusPurchase = 'gitlens.plus.purchase', + PlusReactivateProTrial = 'gitlens.plus.reactivateProTrial', PlusResendVerification = 'gitlens.plus.resendVerification', PlusRestore = 'gitlens.plus.restore', PlusShowPlans = 'gitlens.plus.showPlans', diff --git a/src/plus/gk/account/subscription.ts b/src/plus/gk/account/subscription.ts index c3ed2bfc17789..2bca55f5cf58c 100644 --- a/src/plus/gk/account/subscription.ts +++ b/src/plus/gk/account/subscription.ts @@ -34,6 +34,7 @@ export interface SubscriptionPlan { readonly name: string; readonly bundle: boolean; readonly trialReactivationCount: number; + readonly nextTrialOptInDate?: string | undefined; readonly cancelled: boolean; readonly startedOn: string; readonly expiresOn?: string | undefined; @@ -53,6 +54,7 @@ export interface SubscriptionPreviewTrial { readonly expiresOn: string; } +// Note: Pay attention to gitlens:plus:state in package.json when modifying this enum export const enum SubscriptionState { /** Indicates a user who hasn't verified their email address yet */ VerificationRequired = -1, @@ -64,8 +66,10 @@ export const enum SubscriptionState { FreePreviewTrialExpired, /** Indicates a Free+ user with a completed trial */ FreePlusInTrial, - /** Indicates a Free+ user who's trial has expired */ + /** Indicates a Free+ user who's trial has expired and is not yet eligible for reactivation */ FreePlusTrialExpired, + /** Indicated a Free+ user who's trial has expired and is eligible for reactivation */ + FreePlusTrialReactivationEligible, /** Indicates a Paid user */ Paid, } @@ -84,8 +88,13 @@ export function computeSubscriptionState(subscription: Optional): boolean { diff --git a/src/plus/gk/account/subscriptionService.ts b/src/plus/gk/account/subscriptionService.ts index 9062f8063d1be..fd639d31c222d 100644 --- a/src/plus/gk/account/subscriptionService.ts +++ b/src/plus/gk/account/subscriptionService.ts @@ -17,6 +17,7 @@ import { ProgressLocation, StatusBarAlignment, ThemeColor, + Uri, window, } from 'vscode'; import { getPlatform } from '@env/platform'; @@ -173,6 +174,7 @@ export class SubscriptionService implements Disposable { registerCommand(Commands.PlusLogout, () => this.logout()), registerCommand(Commands.PlusStartPreviewTrial, () => this.startPreviewTrial()), + registerCommand(Commands.PlusReactivateProTrial, () => this.reactivateProTrial()), registerCommand(Commands.PlusManage, () => this.manage()), registerCommand(Commands.PlusPurchase, () => this.purchase()), @@ -436,10 +438,10 @@ export class SubscriptionService implements Disposable { void this.showAccountView(); if (!silent && plan.effective.id === SubscriptionPlanId.Free) { - const confirm: MessageItem = { title: 'Start Free GitKraken Trial', isCloseAffordance: true }; + const confirm: MessageItem = { title: 'Start Pro Trial', isCloseAffordance: true }; const cancel: MessageItem = { title: 'Cancel' }; const result = await window.showInformationMessage( - 'Your 3-day Pro preview has ended, start a free GitKraken trial to get an additional 7 days.\n\n✨ A trial or paid plan is required to use Pro features on privately hosted repos.', + 'Your 3-day preview has ended. Start a free GitLens Pro trial to get an additional 7 days.\n\n✨ A trial or paid plan is required to use Pro features on privately hosted repos.', { modal: true }, confirm, cancel, @@ -492,7 +494,7 @@ export class SubscriptionService implements Disposable { `You can now preview Pro features for ${pluralize( 'day', days, - )}. After which, you can start a free GitKraken trial for an additional 7 days.`, + )}. After which, you can start a free GitLens Pro trial for an additional 7 days.`, confirm, learn, ); @@ -504,6 +506,66 @@ export class SubscriptionService implements Disposable { } } + @gate() + @log() + async reactivateProTrial(): Promise { + if (!(await ensurePlusFeaturesEnabled())) return; + const scope = getLogScope(); + + const session = await this.ensureSession(false); + if (session == null) return; + + const rsp = await this.connection.fetchApi('user/reactivate-trial', { + method: 'POST', + body: JSON.stringify({ client: 'gitlens' }), + }); + + if (!rsp.ok) { + if (rsp.status === 409) { + void window.showErrorMessage( + 'Unable to reactivate trial: User not eligible. Please try again. If this issue persists, please contact support.', + 'OK', + ); + return; + } + + void window.showErrorMessage( + `Unable to reactivate trial: (${rsp.status}) ${rsp.statusText}. Please try again. If this issue persists, please contact support.`, + 'OK', + ); + return; + } + + // Trial was reactivated. Do a check-in to update, and show a message if successful. + try { + await this.checkInAndValidate(session, { force: true }); + if (isSubscriptionTrial(this._subscription)) { + const remaining = getSubscriptionTimeRemaining(this._subscription, 'days'); + + const confirm: MessageItem = { title: 'OK', isCloseAffordance: true }; + const learn: MessageItem = { title: "See What's New" }; + const result = await window.showInformationMessage( + `Your new trial has been activated! Enjoy access to Pro features on privately hosted repos for another ${pluralize( + 'day', + remaining ?? 0, + )}.`, + { modal: true }, + confirm, + learn, + ); + + if (result === learn) { + void env.openExternal( + Uri.parse('https://help.gitkraken.com/gitlens/gitlens-release-notes-current/'), + ); + } + } + } catch (ex) { + Logger.error(ex, scope); + debugger; + } + } + @gate(o => `${o?.force ?? false}`) @log() async validate(options?: { force?: boolean }): Promise { diff --git a/src/plus/gk/checkin.ts b/src/plus/gk/checkin.ts index 1123e40eebb1a..4cebd5d75a73d 100644 --- a/src/plus/gk/checkin.ts +++ b/src/plus/gk/checkin.ts @@ -8,6 +8,7 @@ export interface GKCheckInResponse { readonly paidLicenses: Record; readonly effectiveLicenses: Record; }; + readonly nextOptInDate?: string; } export interface GKUser { @@ -25,6 +26,7 @@ export interface GKLicense { readonly latestEndDate: string; readonly organizationId: string | undefined; readonly reactivationCount?: number; + readonly nextOptInDate?: string; } export type GKLicenseType = @@ -144,6 +146,9 @@ export function getSubscriptionFromCheckIn( : data.user.createdDate != null ? new Date(data.user.createdDate) : undefined, + undefined, + undefined, + data.nextOptInDate, ); } @@ -162,6 +167,7 @@ export function getSubscriptionFromCheckIn( new Date(license.latestStartDate), new Date(license.latestEndDate), license.latestStatus === 'cancelled', + license.nextOptInDate ?? data.nextOptInDate, ); } diff --git a/src/plus/integrations/providerIntegration.ts b/src/plus/integrations/providerIntegration.ts index 14dc7b13b2436..578c40c2db0e0 100644 --- a/src/plus/integrations/providerIntegration.ts +++ b/src/plus/integrations/providerIntegration.ts @@ -934,7 +934,7 @@ export async function ensurePaidPlan(providerName: string, container: Container) void container.subscription.startPreviewTrial(); break; } else if (subscription.account == null) { - const signIn = { title: 'Start Free GitKraken Trial' }; + const signIn = { title: 'Start Pro Trial' }; const cancel = { title: 'Cancel', isCloseAffordance: true }; const result = await window.showWarningMessage( `${title}\n\nDo you want to continue to use ✨ features on privately hosted repos, free for an additional 7 days?`, diff --git a/src/plus/utils.ts b/src/plus/utils.ts index 0bc2957523b33..38f5fa60339bb 100644 --- a/src/plus/utils.ts +++ b/src/plus/utils.ts @@ -29,7 +29,7 @@ export async function ensurePaidPlan(title: string, container: Container): Promi if (isSubscriptionPaidPlan(plan)) break; if (subscription.account == null) { - const signIn = { title: 'Start Free GitKraken Trial' }; + const signIn = { title: 'Start Pro Trial' }; const cancel = { title: 'Cancel', isCloseAffordance: true }; const result = await window.showWarningMessage( `${title}\n\nTry our developer productivity and collaboration services free for 7 days.`, diff --git a/src/plus/workspaces/workspacesService.ts b/src/plus/workspaces/workspacesService.ts index 84364a6476794..79d831c337699 100644 --- a/src/plus/workspaces/workspacesService.ts +++ b/src/plus/workspaces/workspacesService.ts @@ -163,7 +163,7 @@ export class WorkspacesService implements Disposable { cloudWorkspaces: cloudWorkspaces, cloudWorkspaceInfo: filteredSharedWorkspaceCount > 0 - ? `${filteredSharedWorkspaceCount} shared workspaces hidden - upgrade to GitKraken Pro to access.` + ? `${filteredSharedWorkspaceCount} shared workspaces hidden - upgrade to GitLens Pro to access.` : undefined, }; } diff --git a/src/quickpicks/items/directive.ts b/src/quickpicks/items/directive.ts index 28bd14dcca845..4ce7a718a384d 100644 --- a/src/quickpicks/items/directive.ts +++ b/src/quickpicks/items/directive.ts @@ -53,7 +53,7 @@ export function createDirectiveQuickPickItem( detail = 'Preview Pro for 3-days to use this on privately hosted repos'; break; case Directive.ExtendTrial: - label = 'Start Free GitKraken Trial'; + label = 'Start Pro Trial'; detail = 'Continue to use this on privately hosted repos, free for an additional 7 days'; break; case Directive.RequiresVerification: diff --git a/src/system/date.ts b/src/system/date.ts index 4edae74fdfb48..f5bb490a4781b 100644 --- a/src/system/date.ts +++ b/src/system/date.ts @@ -236,19 +236,21 @@ export function getDateDifference( first: Date | number, second: Date | number, unit?: 'days' | 'hours' | 'minutes' | 'seconds', + roundFn?: (value: number) => number, ): number { const diff = (typeof second === 'number' ? second : second.getTime()) - (typeof first === 'number' ? first : first.getTime()); + const round = roundFn ?? Math.floor; switch (unit) { case 'days': - return Math.floor(diff / (1000 * 60 * 60 * 24)); + return round(diff / (1000 * 60 * 60 * 24)); case 'hours': - return Math.floor(diff / (1000 * 60 * 60)); + return round(diff / (1000 * 60 * 60)); case 'minutes': - return Math.floor(diff / (1000 * 60)); + return round(diff / (1000 * 60)); case 'seconds': - return Math.floor(diff / 1000); + return round(diff / 1000); default: return diff; } diff --git a/src/webviews/apps/plus/account/components/account-content.ts b/src/webviews/apps/plus/account/components/account-content.ts index 9ee737d5d8bef..b2c9a0db5a4ed 100644 --- a/src/webviews/apps/plus/account/components/account-content.ts +++ b/src/webviews/apps/plus/account/components/account-content.ts @@ -149,6 +149,7 @@ export class AccountContent extends LitElement { case SubscriptionState.Free: case SubscriptionState.FreePreviewTrialExpired: case SubscriptionState.FreePlusTrialExpired: + case SubscriptionState.FreePlusTrialReactivationEligible: return 'GitKraken Free'; case SubscriptionState.FreeInPreviewTrial: case SubscriptionState.FreePlusInTrial: @@ -261,19 +262,24 @@ export class AccountContent extends LitElement { case SubscriptionState.FreePreviewTrialExpired: return html`

    - Sign up for access to our developer productivity and collaboration services, e.g. Workspaces, or + Your 3-day preview has ended. Start a free GitLens Pro trial to get an additional 7 days, or sign in.

    - Sign Up + Start Pro Trial -

    Signing up starts a free 7-day GitKraken trial.

    +

    + Your Pro trial provides access to the entire + GitKraken suite, unleashing powerful Git + visualization & productivity capabilities everywhere you work: IDE, desktop, browser, and + terminal. +

    `; case SubscriptionState.FreePlusTrialExpired: return html`

    - Your GitKraken trial has ended, please upgrade to continue to use ✨ features on privately + Your GitLens Pro trial has ended. Please upgrade to continue to use ✨ features on privately hosted repos.

    ${when( @@ -282,22 +288,39 @@ export class AccountContent extends LitElement { html`

    Holiday Special: 50% off first seat of Pro — only $4/month! Includes entire - GitKraken suite of dev tools.Holiday Special: 50% off first seat of Pro — only $4/month!

    `, () => html`

    - Special: 50% off first seat of Pro — only $4/month! Includes entire GitKraken suite of - dev tools. + Special: 50% off first seat of Pro — only $4/month!

    `, )} - Upgrade to Pro + Get GitLens Pro

    - You only have access to ✨ features on local and publicly hosted repos and ☁️ features based on - your plan, e.g. Free, Pro, etc. + A Pro account provides access to the entire + GitKraken suite, unleashing powerful Git + visualization & productivity capabilities everywhere you work: IDE, desktop, browser, and + terminal. +

    + `; + + case SubscriptionState.FreePlusTrialReactivationEligible: + return html` +

    + You're eligible to reactivate your GitLens Pro trial and experience all the new Pro features — + free for another 7 days! +

    + + Try Pro + +

    + Your Pro trial provides access to the entire + GitKraken suite, unleashing powerful Git + visualization & productivity capabilities everywhere you work: IDE, desktop, browser, and + terminal.

    `; @@ -312,9 +335,9 @@ export class AccountContent extends LitElement { ${pluralize('day', this.days, { infix: ' more ', })} - in your GitKraken trial.` + in your GitLens Pro trial.` : `You have - ${this.daysRemaining} remaining in your GitKraken trial.`} + ${this.daysRemaining} remaining in your GitLens Pro trial.`} Once your trial ends, you'll need a paid plan to continue using ✨ features.

    ${when( @@ -323,25 +346,22 @@ export class AccountContent extends LitElement { html`

    Holiday Special: 50% off first seat of Pro — only $4/month! Includes entire - GitKraken suite of dev tools.Holiday Special: 50% off first seat of Pro — only $4/month!

    `, () => html`

    - Special: 50% off first seat of Pro — only $4/month! Includes entire GitKraken - suite of dev tools. + Special: 50% off first seat of Pro — only $4/month!

    `, )} Upgrade to Pro

    - You have access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan. -

    -

    - Try our - other developer tools also included in your trial. + A Pro account provides access to the entire + GitKraken suite, unleashing powerful Git + visualization & productivity capabilities everywhere you work: IDE, desktop, browser, and + terminal.

    `; diff --git a/src/webviews/apps/plus/focus/components/focus-app.ts b/src/webviews/apps/plus/focus/components/focus-app.ts index 4bad25954943b..ee4945a00cbca 100644 --- a/src/webviews/apps/plus/focus/components/focus-app.ts +++ b/src/webviews/apps/plus/focus/components/focus-app.ts @@ -321,9 +321,19 @@ export class GlFocusApp extends LitElement { id="subscription-gate" class="scrollable" >

    - Brings all of your GitHub pull requests and issues into a unified actionable view to help to - you more easily juggle work in progress, pending work, reviews, and more. Quickly see if - anything requires your attention while keeping you focused. + Focus View + — brings all of your GitHub pull requests and issues into a unified actionable view to + help to you more easily juggle work in progress, pending work, reviews, and more. Quickly + see if anything requires your attention while keeping you focused. +

    +

    + Focus View + — effortlessly view all of your GitHub pull requests and issues in a unified, + actionable view.

    diff --git a/src/webviews/apps/plus/graph/GraphWrapper.tsx b/src/webviews/apps/plus/graph/GraphWrapper.tsx index d0d07f70edc09..78b05a479aa50 100644 --- a/src/webviews/apps/plus/graph/GraphWrapper.tsx +++ b/src/webviews/apps/plus/graph/GraphWrapper.tsx @@ -1362,13 +1362,22 @@ export function GraphWrapper({

    - Helps you easily visualize your repository and keep track of all work in progress. + + Commit Graph + + — helps you easily visualize your repository and keep track of all work in progress.

    Use the rich commit search to find exactly what you're looking for. It's powerful filters allow you to search by a specific commit, message, author, a changed file or files, or even a specific code change.

    +

    + + Commit Graph + + — easily visualize your repository and keep track of work in progress all in one view. +

    {graphConfig?.minimap && (

    Preview Pro for 3 days, or - sign up to start a full 7-day GitKraken trial. + sign up to start a full 7-day GitLens Pro trial.

    ✨ A trial or paid plan is required to use this on privately hosted repos.

    `; @@ -87,19 +87,16 @@ export class FeatureGatePlusState extends LitElement { case SubscriptionState.FreePreviewTrialExpired: return html`

    - Your 3-day Pro preview has ended, start a free GitKraken trial to get an additional 7 days, or + Your 3-day preview has ended. Start a free GitLens Pro trial to get an additional 7 days, or sign in.

    - Start Free GitKraken Trial -

    ✨ A trial or paid plan is required to use this on privately hosted repos.

    + Start Pro Trial `; case SubscriptionState.FreePlusTrialExpired: return html`

    - Your GitKraken trial has ended, please upgrade to continue to use this on privately hosted + Your GitLens Pro trial has ended. Please upgrade to continue to use this on privately hosted repos.

    ${when( @@ -108,20 +105,28 @@ export class FeatureGatePlusState extends LitElement { html`

    Holiday Special: 50% off first seat of Pro — only $4/month!
    - Includes entire GitKraken suite of dev tools.     + >Holiday Special: 50% off first seat of Pro — only $4/month!

    `, () => html`

    Special: 50% off first seat of Pro — only $4/month!
    - Includes entire GitKraken suite of dev tools.

    `, )} Upgrade to ProGet GitLens Pro + `; + + case SubscriptionState.FreePlusTrialReactivationEligible: + return html` +

    + You're eligible to reactivate your GitLens Pro trial and experience all the new Pro features — + free for another 7 days! +

    + Try Pro -

    ✨ A paid plan is required to use this on privately hosted repos.

    `; } diff --git a/src/webviews/apps/plus/timeline/timeline.html b/src/webviews/apps/plus/timeline/timeline.html index bcbdd2a23fe97..e3318b34be0a9 100644 --- a/src/webviews/apps/plus/timeline/timeline.html +++ b/src/webviews/apps/plus/timeline/timeline.html @@ -23,8 +23,17 @@ >

    - Visualize the evolution of a file, including when changes were made, how large they were, and who made - them. + Visual File History + — visualize the evolution of a file, including when changes were made, how large they were, and + who made them. +

    +

    + Visual File History + — quickly identify when the most impactful changes were made to a file and by whom.

    diff --git a/src/webviews/apps/shared/components/feature-gate-badge.ts b/src/webviews/apps/shared/components/feature-gate-badge.ts index d0e492df01227..2a37d5c3c166c 100644 --- a/src/webviews/apps/shared/components/feature-gate-badge.ts +++ b/src/webviews/apps/shared/components/feature-gate-badge.ts @@ -123,6 +123,7 @@ export class FeatureGateBadge extends LitElement { case SubscriptionState.FreePlusTrialExpired: case SubscriptionState.FreeInPreviewTrial: case SubscriptionState.FreePlusInTrial: + case SubscriptionState.FreePlusTrialReactivationEligible: return html`✨ Requires a paid plan for use on privately hosted repos.`; diff --git a/src/webviews/apps/shared/components/feature-gate.ts b/src/webviews/apps/shared/components/feature-gate.ts index a7b80b5d17958..81eb277f2edc0 100644 --- a/src/webviews/apps/shared/components/feature-gate.ts +++ b/src/webviews/apps/shared/components/feature-gate.ts @@ -107,6 +107,14 @@ export class FeatureGate extends LitElement { +

    • `; } diff --git a/src/webviews/apps/welcome/welcome.html b/src/webviews/apps/welcome/welcome.html index 4cab49c73bde9..90fe1302a150f 100644 --- a/src/webviews/apps/welcome/welcome.html +++ b/src/webviews/apps/welcome/welcome.html @@ -464,7 +464,7 @@

    Try Pro ✨

    Unlock the full power of GitLens ✨ and ☁️ features

    Start a GitKraken trialStart a Pro trial  or sign in

    From 120cc731ca42a363dcb9295f0ae60128d193f221 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Wed, 14 Feb 2024 13:42:04 -0700 Subject: [PATCH 0520/1012] Restores Free and Preview Trial states in Account view --- .../apps/plus/account/components/account-content.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/webviews/apps/plus/account/components/account-content.ts b/src/webviews/apps/plus/account/components/account-content.ts index b2c9a0db5a4ed..d079ef2b357ec 100644 --- a/src/webviews/apps/plus/account/components/account-content.ts +++ b/src/webviews/apps/plus/account/components/account-content.ts @@ -259,6 +259,17 @@ export class AccountContent extends LitElement { case SubscriptionState.Free: case SubscriptionState.FreeInPreviewTrial: + return html` +

    + Sign up for access to our developer productivity and collaboration services, e.g. Workspaces, or + sign in. +

    + + Sign Up + +

    Signing up starts a free 7-day GitKraken trial.

    + `; + case SubscriptionState.FreePreviewTrialExpired: return html`

    From b3fa3eae246ff5ab46fbd043d1d7e90d7d1b2438 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Wed, 14 Feb 2024 14:43:32 -0700 Subject: [PATCH 0521/1012] Updates CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65df11528e728..e8ed7f06e4836 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Added - Adds a _Create New Branch..._ option to the _Git Switch to..._ command to easily create a new branch to switch to — closes [#3138](https://github.com/gitkraken/vscode-gitlens/issues/3138) +- Adds the ability to start a new trial from the _Account View_ and feature gates for users without a Pro account whose Pro trial has been expired for over 90 days. ## [14.8.0] - 2024-02-08 From 28a863a4abda2c51bb8202eaabe093218834e6c0 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Wed, 14 Feb 2024 16:50:06 -0500 Subject: [PATCH 0522/1012] Updates CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8ed7f06e4836..4a37f3e3519b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds a _Create New Branch..._ option to the _Git Switch to..._ command to easily create a new branch to switch to — closes [#3138](https://github.com/gitkraken/vscode-gitlens/issues/3138) - Adds the ability to start a new trial from the _Account View_ and feature gates for users without a Pro account whose Pro trial has been expired for over 90 days. +### Fixed + +- Fixes AI features not being displayed when signed-out of an account + ## [14.8.0] - 2024-02-08 ### Added From c42f0907817b40f2721d32a2c99e9f724975f5de Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Wed, 14 Feb 2024 16:18:41 -0700 Subject: [PATCH 0523/1012] Fixes styling issues on some feature gates --- src/webviews/apps/plus/graph/GraphWrapper.tsx | 4 ++-- src/webviews/apps/plus/timeline/timeline.scss | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/webviews/apps/plus/graph/GraphWrapper.tsx b/src/webviews/apps/plus/graph/GraphWrapper.tsx index 78b05a479aa50..e63a11306dd80 100644 --- a/src/webviews/apps/plus/graph/GraphWrapper.tsx +++ b/src/webviews/apps/plus/graph/GraphWrapper.tsx @@ -1364,7 +1364,7 @@ export function GraphWrapper({

    Commit Graph - + {' '} — helps you easily visualize your repository and keep track of all work in progress.

    @@ -1375,7 +1375,7 @@ export function GraphWrapper({

    Commit Graph - + {' '} — easily visualize your repository and keep track of work in progress all in one view.

    diff --git a/src/webviews/apps/plus/timeline/timeline.scss b/src/webviews/apps/plus/timeline/timeline.scss index 15d57eb2aaa4a..5e7f37e2f7931 100644 --- a/src/webviews/apps/plus/timeline/timeline.scss +++ b/src/webviews/apps/plus/timeline/timeline.scss @@ -42,6 +42,14 @@ body[data-placement='editor'] { background-color: var(--color-background); } +a { + text-decoration: none; + + &:hover { + text-decoration: underline; + } +} + .container { display: grid; grid-template-rows: min-content 1fr min-content; From dbaa603d216cb4c12ce80b36cb8fa84e21ca17d3 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Wed, 14 Feb 2024 18:18:04 -0700 Subject: [PATCH 0524/1012] Updates section ordering and feature descriptions in gates --- package.json | 13 ++++++------- .../apps/plus/focus/components/focus-app.ts | 8 -------- src/webviews/apps/plus/graph/GraphWrapper.tsx | 13 ++----------- .../components/feature-gate-plus-state.ts | 18 +++++++++--------- src/webviews/apps/plus/timeline/timeline.html | 10 ++-------- .../apps/shared/components/feature-gate.ts | 18 +++++------------- 6 files changed, 24 insertions(+), 56 deletions(-) diff --git a/package.json b/package.json index 4f38cb97d6866..0e083403d7478 100644 --- a/package.json +++ b/package.json @@ -16151,8 +16151,7 @@ }, { "view": "gitlens.views.worktrees", - "contents": "Worktrees help you multitask by minimizing the context switching between branches, allowing you to easily work on different branches of a repository simultaneously.\n\nYou can create multiple working trees, each of which can be opened in individual windows or all together in a single workspace.", - "when": "!gitlens:plus:required || gitlens:plus:state == 0" + "contents": "[Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) — minimizes context switching by allowing you to work on multiple branches simultaneously." }, { "view": "gitlens.views.worktrees", @@ -16161,27 +16160,27 @@ }, { "view": "gitlens.views.worktrees", - "contents": "You must verify your email before you can continue.\n\n[Resend verification email](command:gitlens.plus.resendVerification)\n\n[Refresh verification status](command:gitlens.plus.validate)", + "contents": "[Resend verification email](command:gitlens.plus.resendVerification)\n\n[Refresh verification status](command:gitlens.plus.validate)\n\nYou must verify your email before you can continue.", "when": "gitlens:plus:state == -1" }, { "view": "gitlens.views.worktrees", - "contents": "[Preview Pro](command:gitlens.plus.startPreviewTrial)\n\nPreview Pro for 3 days, or [sign up](command:gitlens.plus.signUp) to start a full 7-day GitLens Pro trial.\n[✨ Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) — seamlessly work on multiple branches simultaneously.", + "contents": "[Preview Pro](command:gitlens.plus.startPreviewTrial)\n\nPreview Pro for 3 days, or [sign up](command:gitlens.plus.signUp) to start a full 7-day GitLens Pro trial.", "when": "gitlens:plus:required && gitlens:plus:state == 0" }, { "view": "gitlens.views.worktrees", - "contents": "Your 3-day preview has ended. Start a free GitLens Pro trial to get an additional 7 days, or [sign in](command:gitlens.plus.login).\n\n[Start Pro Trial](command:gitlens.plus.signUp)\n[✨ Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) — seamlessly work on multiple branches simultaneously.", + "contents": "[Try Pro](command:gitlens.plus.signUp)\n\nYour 3-day preview has ended. Start a free GitLens Pro trial to get an additional 7 days, or [sign in](command:gitlens.plus.login).", "when": "gitlens:plus:required && gitlens:plus:state == 2" }, { "view": "gitlens.views.worktrees", - "contents": "Your GitLens Pro trial has ended. Please upgrade to continue to use this on privately hosted repos.\n\n[Get GitLens Pro](command:gitlens.plus.purchase)\n[✨ Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) — seamlessly work on multiple branches simultaneously.", + "contents": "[Get GitLens Pro](command:gitlens.plus.purchase)\n\nYour GitLens Pro trial has ended. Please upgrade to continue to use this on privately hosted repos.", "when": "gitlens:plus:required && gitlens:plus:state == 4" }, { "view": "gitlens.views.worktrees", - "contents": "You're eligible to reactivate your GitLens Pro trial and experience all the new Pro features — free for another 7 days!\n\n[Try Pro](command:gitlens.plus.reactivateProTrial)\n[✨ Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) — seamlessly work on multiple branches simultaneously.", + "contents": "[Try Pro](command:gitlens.plus.reactivateProTrial)\n\nYou're eligible to reactivate your GitLens Pro trial and experience all the new Pro features — free for another 7 days!", "when": "gitlens:plus:required && gitlens:plus:state == 5" } ], diff --git a/src/webviews/apps/plus/focus/components/focus-app.ts b/src/webviews/apps/plus/focus/components/focus-app.ts index ee4945a00cbca..6d699c711f5b4 100644 --- a/src/webviews/apps/plus/focus/components/focus-app.ts +++ b/src/webviews/apps/plus/focus/components/focus-app.ts @@ -321,14 +321,6 @@ export class GlFocusApp extends LitElement { id="subscription-gate" class="scrollable" >

    - Focus View - — brings all of your GitHub pull requests and issues into a unified actionable view to - help to you more easily juggle work in progress, pending work, reviews, and more. Quickly - see if anything requires your attention while keeping you focused. -

    -

    Focus View diff --git a/src/webviews/apps/plus/graph/GraphWrapper.tsx b/src/webviews/apps/plus/graph/GraphWrapper.tsx index e63a11306dd80..7efde72adb8c7 100644 --- a/src/webviews/apps/plus/graph/GraphWrapper.tsx +++ b/src/webviews/apps/plus/graph/GraphWrapper.tsx @@ -1365,19 +1365,10 @@ export function GraphWrapper({ Commit Graph {' '} - — helps you easily visualize your repository and keep track of all work in progress. -
    -
    - Use the rich commit search to find exactly what you're looking for. It's powerful filters allow you - to search by a specific commit, message, author, a changed file or files, or even a specific code + — easily visualize your repository and keep track of all work in progress. Use the rich commit + search to find a specific commit, message, author, a changed file or files, or even a specific code change.

    -

    - - Commit Graph - {' '} - — easily visualize your repository and keep track of work in progress all in one view. -

    {graphConfig?.minimap && ( You must verify your email before you can continue.

    Resend verification email Refresh verification status +

    You must verify your email before you can continue.

    `; case SubscriptionState.Free: return html` Preview NowPreview Pro

    Preview Pro for 3 days, or @@ -86,15 +86,18 @@ export class FeatureGatePlusState extends LitElement { case SubscriptionState.FreePreviewTrialExpired: return html` + Try Pro

    Your 3-day preview has ended. Start a free GitLens Pro trial to get an additional 7 days, or sign in.

    - Start Pro Trial `; case SubscriptionState.FreePlusTrialExpired: return html` + Get GitLens Pro

    Your GitLens Pro trial has ended. Please upgrade to continue to use this on privately hosted repos. @@ -113,20 +116,17 @@ export class FeatureGatePlusState extends LitElement { Special: 50% off first seat of Pro — only $4/month!

    `, )} - Get GitLens Pro `; case SubscriptionState.FreePlusTrialReactivationEligible: return html` + Try Pro

    You're eligible to reactivate your GitLens Pro trial and experience all the new Pro features — free for another 7 days!

    - Try Pro `; } diff --git a/src/webviews/apps/plus/timeline/timeline.html b/src/webviews/apps/plus/timeline/timeline.html index e3318b34be0a9..9bcfaa38689e5 100644 --- a/src/webviews/apps/plus/timeline/timeline.html +++ b/src/webviews/apps/plus/timeline/timeline.html @@ -26,14 +26,8 @@ Visual File History - — visualize the evolution of a file, including when changes were made, how large they were, and - who made them. -

    -

    - Visual File History - — quickly identify when the most impactful changes were made to a file and by whom. + — visualize the evolution of a file and quickly identify when the most impactful changes were made + and by whom.

    diff --git a/src/webviews/apps/shared/components/feature-gate.ts b/src/webviews/apps/shared/components/feature-gate.ts index 81eb277f2edc0..617bcab364c59 100644 --- a/src/webviews/apps/shared/components/feature-gate.ts +++ b/src/webviews/apps/shared/components/feature-gate.ts @@ -1,6 +1,7 @@ -import { css, html, LitElement, nothing } from 'lit'; +import { css, html, LitElement } from 'lit'; import { customElement, property } from 'lit/decorators.js'; -import { isSubscriptionStatePaidOrTrial, SubscriptionState } from '../../../../plus/gk/account/subscription'; +import type { SubscriptionState } from '../../../../plus/gk/account/subscription'; +import { isSubscriptionStatePaidOrTrial } from '../../../../plus/gk/account/subscription'; import '../../plus/shared/components/feature-gate-plus-state'; @customElement('gk-feature-gate') @@ -103,18 +104,9 @@ export class FeatureGate extends LitElement { this.hidden = false; return html`
    - - - + + -
    `; } From 72fc9c38958b46346c9276e7726b89f4c5800f5b Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Thu, 15 Feb 2024 11:22:39 -0700 Subject: [PATCH 0525/1012] Bumps to v14.8.1 --- CHANGELOG.md | 5 ++++- package.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a37f3e3519b1..1697c69c04dbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] +## [14.8.1] - 2024-02-15 + ### Added - Adds a _Create New Branch..._ option to the _Git Switch to..._ command to easily create a new branch to switch to — closes [#3138](https://github.com/gitkraken/vscode-gitlens/issues/3138) @@ -5220,7 +5222,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Initial release but still heavily a work in progress. -[unreleased]: https://github.com/gitkraken/vscode-gitlens/compare/v14.8.0...HEAD +[unreleased]: https://github.com/gitkraken/vscode-gitlens/compare/v14.8.1...HEAD +[14.8.1]: https://github.com/gitkraken/vscode-gitlens/compare/v14.8.0...gitkraken:v14.8.1 [14.8.0]: https://github.com/gitkraken/vscode-gitlens/compare/v14.7.0...gitkraken:v14.8.0 [14.7.0]: https://github.com/gitkraken/vscode-gitlens/compare/v14.6.1...gitkraken:v14.7.0 [14.6.1]: https://github.com/gitkraken/vscode-gitlens/compare/v14.6.0...gitkraken:v14.6.1 diff --git a/package.json b/package.json index 0e083403d7478..dd7bfa8043e31 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "gitlens", "displayName": "GitLens — Git supercharged", "description": "Supercharge Git within VS Code — Visualize code authorship at a glance via Git blame annotations and CodeLens, seamlessly navigate and explore Git repositories, gain valuable insights via rich visualizations and powerful comparison commands, and so much more", - "version": "14.8.0", + "version": "14.8.1", "engines": { "vscode": "^1.82.0" }, From ac5de7f49d44151ac109b475358f50d33178a0ef Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Thu, 15 Feb 2024 16:18:59 -0500 Subject: [PATCH 0526/1012] Fixes patch message --- .../apps/plus/patchDetails/components/gl-patch-create.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts b/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts index b9710e1585205..0fdc68f06aa4b 100644 --- a/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts +++ b/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts @@ -245,9 +245,8 @@ export class GlPatchCreate extends GlTreeBase { Create Cloud Patch

    - ${when( - this.state?.orgSettings.byob === true, + this.state?.orgSettings.byob === false, () => html`

    From 3e37328b3f51b401ea9bd2ef2fba8455a529d721 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Fri, 16 Feb 2024 14:23:37 -0500 Subject: [PATCH 0527/1012] Fixes title messaging on patch security links --- .../apps/plus/patchDetails/components/gl-patch-create.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts b/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts index 0fdc68f06aa4b..9e3fbd7749885 100644 --- a/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts +++ b/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts @@ -253,13 +253,13 @@ export class GlPatchCreate extends GlTreeBase { Cloud Patches are securely stored @@ -272,7 +272,7 @@ export class GlPatchCreate extends GlTreeBase { Cloud Patch will be securely stored in your organization's self-hosted storage From 48d6b2b127a70f467a6354da101c0d48fe6cec5e Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Fri, 16 Feb 2024 14:39:34 -0500 Subject: [PATCH 0528/1012] Updates CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1697c69c04dbf..0899418cd410c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] +### Fixed + +- Fixes incorrect organization self-hosting message when creating a Cloud Patch + ## [14.8.1] - 2024-02-15 ### Added From 6cb67ab424fe63d89eb307193779bd9c28fe6ea1 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Fri, 16 Feb 2024 14:43:44 -0500 Subject: [PATCH 0529/1012] Bumps to v14.8.2 --- CHANGELOG.md | 5 ++++- package.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0899418cd410c..540dc1994ddf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] +## [14.8.2] - 2024-02-16 + ### Fixed - Fixes incorrect organization self-hosting message when creating a Cloud Patch @@ -5226,7 +5228,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Initial release but still heavily a work in progress. -[unreleased]: https://github.com/gitkraken/vscode-gitlens/compare/v14.8.1...HEAD +[unreleased]: https://github.com/gitkraken/vscode-gitlens/compare/v14.8.2...HEAD +[14.8.2]: https://github.com/gitkraken/vscode-gitlens/compare/v14.8.1...gitkraken:v14.8.2 [14.8.1]: https://github.com/gitkraken/vscode-gitlens/compare/v14.8.0...gitkraken:v14.8.1 [14.8.0]: https://github.com/gitkraken/vscode-gitlens/compare/v14.7.0...gitkraken:v14.8.0 [14.7.0]: https://github.com/gitkraken/vscode-gitlens/compare/v14.6.1...gitkraken:v14.7.0 diff --git a/package.json b/package.json index dd7bfa8043e31..44847f9e5b476 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "gitlens", "displayName": "GitLens — Git supercharged", "description": "Supercharge Git within VS Code — Visualize code authorship at a glance via Git blame annotations and CodeLens, seamlessly navigate and explore Git repositories, gain valuable insights via rich visualizations and powerful comparison commands, and so much more", - "version": "14.8.1", + "version": "14.8.2", "engines": { "vscode": "^1.82.0" }, From 7cdc1a901c571afcce4a8b2093c085dffd98c3a3 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sat, 17 Feb 2024 15:00:40 -0500 Subject: [PATCH 0530/1012] Changes graph date style to default to the default style Refs: #3153 --- package.json | 2 +- .../apps/settings/partials/commit-graph.html | 18 +++++++++++++ src/webviews/apps/settings/settings.ts | 25 ++++++++++++------- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 44847f9e5b476..24d230029f3d0 100644 --- a/package.json +++ b/package.json @@ -2667,7 +2667,7 @@ "string", "null" ], - "default": "relative", + "default": null, "enum": [ "relative", "absolute" diff --git a/src/webviews/apps/settings/partials/commit-graph.html b/src/webviews/apps/settings/partials/commit-graph.html index 8756cb51af4df..7b284c3bf7a9e 100644 --- a/src/webviews/apps/settings/partials/commit-graph.html +++ b/src/webviews/apps/settings/partials/commit-graph.html @@ -234,11 +234,28 @@

    + + @@ -268,6 +285,7 @@

    diff --git a/src/webviews/apps/settings/settings.ts b/src/webviews/apps/settings/settings.ts index 733109a6383d9..104a1f485e06a 100644 --- a/src/webviews/apps/settings/settings.ts +++ b/src/webviews/apps/settings/settings.ts @@ -456,18 +456,24 @@ export class SettingsApp extends App { switch (op) { case '=': { // Equals - let value = changes[lhs]; + let value: string | boolean | null | undefined = changes[lhs]; if (value === undefined) { - value = this.getSettingValue(lhs) ?? false; + value = this.getSettingValue(lhs); + if (value === undefined || (value === null && typeof rhs !== 'string')) { + value = false; + } } state = rhs !== undefined ? rhs === String(value) : Boolean(value); break; } case '!': { // Not equals - let value = changes[lhs]; + let value: string | boolean | null | undefined = changes[lhs]; if (value === undefined) { - value = this.getSettingValue(lhs) ?? false; + value = this.getSettingValue(lhs); + if (value === undefined || (value === null && typeof rhs !== 'string')) { + value = false; + } } state = rhs !== undefined ? rhs !== String(value) : !value; break; @@ -524,6 +530,7 @@ export class SettingsApp extends App { } else if (el.dataset.valueOff != null) { const value = this.getSettingValue(el.name); el.checked = el.dataset.valueOff !== value; + el.indeterminate = value === null; } else { el.checked = this.getSettingValue(el.name) ?? false; } @@ -604,12 +611,12 @@ export class SettingsApp extends App { } if (!value) { - value = el.dataset.settingPreviewDefault; + const lookup = el.dataset.settingPreviewDefaultLookup; + if (lookup != null) { + value = this.getSettingValue(lookup); + } if (value == null) { - const lookup = el.dataset.settingPreviewDefaultLookup; - if (lookup != null) { - value = this.getSettingValue(lookup); - } + value = el.dataset.settingPreviewDefault; } } From b08df251fa3326a38fc239996a612703787c54b2 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 20 Feb 2024 14:09:23 -0500 Subject: [PATCH 0531/1012] Removes unused import --- src/plus/gk/account/organizationService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plus/gk/account/organizationService.ts b/src/plus/gk/account/organizationService.ts index 7cfb7b3da05dc..6a00151bc95eb 100644 --- a/src/plus/gk/account/organizationService.ts +++ b/src/plus/gk/account/organizationService.ts @@ -1,6 +1,6 @@ import { Disposable, window } from 'vscode'; import type { Container } from '../../../container'; -import { onDidChangeContext, setContext } from '../../../system/context'; +import { setContext } from '../../../system/context'; import { gate } from '../../../system/decorators/gate'; import { once } from '../../../system/function'; import { Logger } from '../../../system/logger'; From 84665e44856deff8f5d473cfc36a5a7da489e4ad Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 20 Feb 2024 16:54:34 -0500 Subject: [PATCH 0532/1012] Closes #3160 re-adds add to workspace option Adds repo name to workspace folder name --- src/commands/git/worktree.ts | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/commands/git/worktree.ts b/src/commands/git/worktree.ts index 992ce1d766c12..2e66a5198f6c5 100644 --- a/src/commands/git/worktree.ts +++ b/src/commands/git/worktree.ts @@ -975,7 +975,16 @@ export class WorktreeGitCommand extends QuickCommand { if (state.flags.includes('--reveal-explorer')) { void revealInFileExplorer(state.worktree.uri); } else { - openWorkspace(state.worktree.uri, { location: convertOpenFlagsToLocation(state.flags) }); + let name; + + const repo = (await state.repo.getMainRepository()) ?? state.repo; + if (repo.name !== state.worktree.name) { + name = `${repo.name}: ${state.worktree.name}`; + } else { + name = state.worktree.name; + } + + openWorkspace(state.worktree.uri, { location: convertOpenFlagsToLocation(state.flags), name: name }); } } } @@ -992,14 +1001,15 @@ export class WorktreeGitCommand extends QuickCommand { label: `Open Worktree in a New Window`, detail: 'Will open the worktree in a new window', }), + createFlagsQuickPickItem(state.flags, ['--add-to-workspace'], { + label: `Add Worktree to Workspace`, + detail: 'Will add the worktree into the current workspace', + }), ]; if (!state.openOnly) { confirmations.push( - createFlagsQuickPickItem(state.flags, ['--add-to-workspace'], { - label: `Add Worktree to Workspace`, - detail: 'Will add the worktree into the current workspace', - }), + createQuickPickSeparator(), createFlagsQuickPickItem(state.flags, ['--reveal-explorer'], { label: `Reveal in File Explorer`, description: `$(folder) ${truncateLeft(GitWorktree.getFriendlyPath(state.worktree.uri), 40)}`, From 1460f0424f2bb7a26e140172a7414fa6986a1f2f Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 21 Feb 2024 11:04:12 -0500 Subject: [PATCH 0533/1012] Adds better message when stashing only untracked files --- src/commands/git/stash.ts | 42 ++++++++++++++++++++++------------ src/env/node/git/git.ts | 6 ++++- src/git/errors.ts | 48 +++++++++++++++++++++------------------ 3 files changed, 58 insertions(+), 38 deletions(-) diff --git a/src/commands/git/stash.ts b/src/commands/git/stash.ts index caef3dd608493..a3a64c9190467 100644 --- a/src/commands/git/stash.ts +++ b/src/commands/git/stash.ts @@ -551,24 +551,36 @@ export class StashGitCommand extends QuickCommand { } catch (ex) { Logger.error(ex, context.title); - if ( - ex instanceof StashPushError && - ex.reason === StashPushErrorReason.ConflictingStagedAndUnstagedLines && - state.flags.includes('--staged') - ) { - const confirm = { title: 'Yes' }; - const cancel = { title: 'No', isCloseAffordance: true }; - const result = await window.showErrorMessage(ex.message, { modal: true }, confirm, cancel); - - if (result === confirm) { - if (state.uris == null) { - state.uris = state.onlyStagedUris; + if (ex instanceof StashPushError) { + if (ex.reason === StashPushErrorReason.NothingToSave) { + if (!state.flags.includes('--include-untracked')) { + void window.showWarningMessage( + 'No changes to stash. Choose the "Push & Include Untracked" option, if you have untracked files.', + ); + continue; } - state.flags.splice(state.flags.indexOf('--staged'), 1); - continue; + + void window.showInformationMessage('No changes to stash.'); + return; } + if ( + ex.reason === StashPushErrorReason.ConflictingStagedAndUnstagedLines && + state.flags.includes('--staged') + ) { + const confirm = { title: 'Yes' }; + const cancel = { title: 'No', isCloseAffordance: true }; + const result = await window.showErrorMessage(ex.message, { modal: true }, confirm, cancel); + + if (result === confirm) { + if (state.uris == null) { + state.uris = state.onlyStagedUris; + } + state.flags.splice(state.flags.indexOf('--staged'), 1); + continue; + } - return; + return; + } } const msg: string = ex?.message ?? ex?.toString() ?? ''; diff --git a/src/env/node/git/git.ts b/src/env/node/git/git.ts index 76e405a0348b9..8d9dcb3424d1d 100644 --- a/src/env/node/git/git.ts +++ b/src/env/node/git/git.ts @@ -2085,7 +2085,11 @@ export class Git { } try { - void (await this.git({ cwd: repoPath, stdin: stdin }, ...params)); + const data = await this.git({ cwd: repoPath, stdin: stdin }, ...params); + if (data.includes('No local changes to save')) { + throw new StashPushError(StashPushErrorReason.NothingToSave); + return; + } } catch (ex) { if ( ex instanceof RunError && diff --git a/src/git/errors.ts b/src/git/errors.ts index 4e551c5daed94..bbf88ee60d442 100644 --- a/src/git/errors.ts +++ b/src/git/errors.ts @@ -63,7 +63,7 @@ export class BlameIgnoreRevsFileBadRevisionError extends Error { } export const enum StashApplyErrorReason { - WorkingChanges = 1, + WorkingChanges, } export class StashApplyError extends Error { @@ -98,7 +98,8 @@ export class StashApplyError extends Error { } export const enum StashPushErrorReason { - ConflictingStagedAndUnstagedLines = 1, + ConflictingStagedAndUnstagedLines, + NothingToSave, } export class StashPushError extends Error { @@ -126,6 +127,9 @@ export class StashPushError extends Error { message = 'Stash was created, but the working tree cannot be updated because at least one file has staged and unstaged changes on the same line(s).\n\nDo you want to try again by stashing both your staged and unstaged changes?'; break; + case StashPushErrorReason.NothingToSave: + message = 'No files to stash'; + break; default: message = 'Unable to stash'; } @@ -139,7 +143,7 @@ export class StashPushError extends Error { } export const enum PushErrorReason { - RemoteAhead = 1, + RemoteAhead, TipBehind, PushRejected, PushRejectedWithLease, @@ -215,17 +219,17 @@ export class PushError extends Error { } export const enum PullErrorReason { - Conflict = 1, - GitIdentity = 2, - RemoteConnection = 3, - UnstagedChanges = 4, - UnmergedFiles = 5, - UncommittedChanges = 6, - OverwrittenChanges = 7, - RefLocked = 8, - RebaseMultipleBranches = 9, - TagConflict = 10, - Other = 11, + Conflict, + GitIdentity, + RemoteConnection, + UnstagedChanges, + UnmergedFiles, + UncommittedChanges, + OverwrittenChanges, + RefLocked, + RebaseMultipleBranches, + TagConflict, + Other, } export class PullError extends Error { @@ -298,10 +302,10 @@ export class PullError extends Error { } export const enum FetchErrorReason { - NoFastForward = 1, - NoRemote = 2, - RemoteConnection = 3, - Other = 4, + NoFastForward, + NoRemote, + RemoteConnection, + Other, } export class FetchError extends Error { @@ -407,8 +411,8 @@ export class WorkspaceUntrustedError extends Error { } export const enum WorktreeCreateErrorReason { - AlreadyCheckedOut = 1, - AlreadyExists = 2, + AlreadyCheckedOut, + AlreadyExists, } export class WorktreeCreateError extends Error { @@ -449,8 +453,8 @@ export class WorktreeCreateError extends Error { } export const enum WorktreeDeleteErrorReason { - HasChanges = 1, - MainWorkingTree = 2, + HasChanges, + MainWorkingTree, } export class WorktreeDeleteError extends Error { From db1c867fe2449d6f989eca1851b91040eb0de725 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Thu, 22 Feb 2024 14:37:32 -0700 Subject: [PATCH 0534/1012] Updates `getMyPullRequests` and `getMyIssues` Limits to hosted providers, but also loads the provider if not already in the cache --- src/plus/integrations/integrationService.ts | 22 +++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/plus/integrations/integrationService.ts b/src/plus/integrations/integrationService.ts index 4ae667c6c36e5..6b1ed20cc414f 100644 --- a/src/plus/integrations/integrationService.ts +++ b/src/plus/integrations/integrationService.ts @@ -150,14 +150,15 @@ export class IntegrationService implements Disposable { } async getMyIssues( - providerIds?: ProviderId[], + providerIds?: HostedProviderId[], cancellation?: CancellationToken, ): Promise { const providers: Map = new Map(); - for (const integration of this._integrations.values()) { - if (providerIds == null || providerIds.includes(integration.id)) { - providers.set(integration, undefined); - } + for (const providerId of providerIds?.length ? providerIds : Object.values(HostedProviderId)) { + const provider = this.get(providerId); + if (provider == null) continue; + + providers.set(provider, undefined); } if (providers.size === 0) return undefined; @@ -218,14 +219,15 @@ export class IntegrationService implements Disposable { } async getMyPullRequests( - providerIds?: ProviderId[], + providerIds?: HostedProviderId[], cancellation?: CancellationToken, ): Promise { const providers: Map = new Map(); - for (const integration of this._integrations.values()) { - if (providerIds == null || providerIds.includes(integration.id)) { - providers.set(integration, undefined); - } + for (const providerId of providerIds?.length ? providerIds : Object.values(HostedProviderId)) { + const provider = this.get(providerId); + if (provider == null) continue; + + providers.set(provider, undefined); } if (providers.size === 0) return undefined; From 4a7696c2ae4025112f1065b4ce6b17bcae17f1b4 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Fri, 23 Feb 2024 09:30:40 -0700 Subject: [PATCH 0535/1012] Removes unused import --- src/plus/integrations/integrationService.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plus/integrations/integrationService.ts b/src/plus/integrations/integrationService.ts index 6b1ed20cc414f..33fe76aa60766 100644 --- a/src/plus/integrations/integrationService.ts +++ b/src/plus/integrations/integrationService.ts @@ -21,7 +21,6 @@ import { AzureDevOpsIntegration } from './providers/azureDevOps'; import { BitbucketIntegration } from './providers/bitbucket'; import { GitHubEnterpriseIntegration, GitHubIntegration } from './providers/github'; import { GitLabIntegration, GitLabSelfHostedIntegration } from './providers/gitlab'; -import type { ProviderId } from './providers/models'; import { HostedProviderId, isSelfHostedProviderId, SelfHostedProviderId } from './providers/models'; import { ProvidersApi } from './providers/providersApi'; From 152b6a5bd48a7972b5c2d67872ff33378fd57e82 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Fri, 23 Feb 2024 15:53:27 -0700 Subject: [PATCH 0536/1012] Prevents double-encoding of redirect url --- src/plus/gk/account/authenticationConnection.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plus/gk/account/authenticationConnection.ts b/src/plus/gk/account/authenticationConnection.ts index 6037795934841..6b7f1d880fb8e 100644 --- a/src/plus/gk/account/authenticationConnection.ts +++ b/src/plus/gk/account/authenticationConnection.ts @@ -77,7 +77,7 @@ export class AuthenticationConnection implements Disposable { signUp ? 'register' : 'login', `${scopes.includes('gitlens') ? 'source=gitlens&' : ''}state=${encodeURIComponent( gkstate, - )}&redirect_uri=${encodeURIComponent(callbackUri.toString())}`, + )}&redirect_uri=${encodeURIComponent(callbackUri.toString(true))}`, ); void (await openUrl(uri.toString(true))); From a450c2abc849e6c232c5b42153d3f406c56f0b8d Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sun, 25 Feb 2024 11:29:13 -0500 Subject: [PATCH 0537/1012] Updates dev dependencies --- package.json | 26 +- src/env/node/git/localGitProvider.ts | 2 +- src/vsls/host.ts | 2 +- yarn.lock | 1362 ++++++++++++-------------- 4 files changed, 639 insertions(+), 753 deletions(-) diff --git a/package.json b/package.json index 24d230029f3d0..d2a9173b4d058 100644 --- a/package.json +++ b/package.json @@ -16566,7 +16566,7 @@ }, "devDependencies": { "@eamodio/eslint-lite-webpack-plugin": "0.0.8", - "@swc/core": "1.4.0", + "@swc/core": "1.4.2", "@twbs/fantasticon": "2.7.2", "@types/mocha": "10.0.6", "@types/node": "18.15.0", @@ -16574,11 +16574,11 @@ "@types/react-dom": "17.0.21", "@types/sortablejs": "1.15.7", "@types/vscode": "1.82.0", - "@typescript-eslint/eslint-plugin": "6.21.0", - "@typescript-eslint/parser": "6.21.0", + "@typescript-eslint/eslint-plugin": "7.0.2", + "@typescript-eslint/parser": "7.0.2", "@vscode/test-electron": "2.3.9", - "@vscode/test-web": "0.0.51", - "@vscode/vsce": "2.23.0", + "@vscode/test-web": "0.0.52", + "@vscode/vsce": "2.24.0", "circular-dependency-plugin": "5.2.2", "clean-webpack-plugin": "4.0.0", "concurrently": "8.2.2", @@ -16586,11 +16586,11 @@ "csp-html-webpack-plugin": "5.1.0", "css-loader": "6.10.0", "css-minimizer-webpack-plugin": "6.0.0", - "cssnano-preset-advanced": "6.0.3", - "esbuild": "0.20.0", + "cssnano-preset-advanced": "6.0.5", + "esbuild": "0.20.1", "esbuild-loader": "4.0.3", - "esbuild-sass-plugin": "3.0.0", - "eslint": "8.56.0", + "esbuild-sass-plugin": "3.1.0", + "eslint": "8.57.0", "eslint-cli": "1.1.1", "eslint-import-resolver-typescript": "3.6.1", "eslint-plugin-anti-trojan-source": "1.1.1", @@ -16605,10 +16605,10 @@ "license-checker-rseidelsohn": "4.3.0", "lz-string": "1.5.0", "mini-css-extract-plugin": "2.8.0", - "mocha": "10.2.0", + "mocha": "10.3.0", "prettier": "3.1.0", - "sass": "1.70.0", - "sass-loader": "14.1.0", + "sass": "1.71.1", + "sass-loader": "14.1.1", "schema-utils": "4.2.0", "sharp": "0.32.6", "svgo": "3.2.0", @@ -16616,7 +16616,7 @@ "ts-loader": "9.5.1", "tsc-alias": "1.8.8", "typescript": "5.3.3", - "webpack": "5.90.1", + "webpack": "5.90.3", "webpack-bundle-analyzer": "4.10.1", "webpack-cli": "5.1.4", "webpack-node-externals": "3.0.0", diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts index 61df031e9b93b..b72bada571553 100644 --- a/src/env/node/git/localGitProvider.ts +++ b/src/env/node/git/localGitProvider.ts @@ -5708,8 +5708,8 @@ export class LocalGitProvider implements GitProvider, Disposable { return parseGitWorktrees(data, repoPath); } - // eslint-disable-next-line @typescript-eslint/require-await @log() + // eslint-disable-next-line @typescript-eslint/require-await async getWorktreesDefaultUri(repoPath: string): Promise { let location = configuration.get('worktrees.defaultLocation'); if (location == null) return undefined; diff --git a/src/vsls/host.ts b/src/vsls/host.ts index a024c41d0433a..acd4cd3ec2c5d 100644 --- a/src/vsls/host.ts +++ b/src/vsls/host.ts @@ -196,8 +196,8 @@ export class VslsHostService implements Disposable { return { data: data, count: count }; } - // eslint-disable-next-line @typescript-eslint/require-await @log() + // eslint-disable-next-line @typescript-eslint/require-await private async onGetRepositoriesForUriRequest( request: GetRepositoriesForUriRequest, _cancellation: CancellationToken, diff --git a/yarn.lock b/yarn.lock index d8b35259eba11..99995bb7b5f03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -56,11 +56,6 @@ dependencies: regenerator-runtime "^0.14.0" -"@bufbuild/protobuf@^1.0.0": - version "1.7.2" - resolved "https://registry.yarnpkg.com/@bufbuild/protobuf/-/protobuf-1.7.2.tgz#1b3d6c66ebd987f7da7f1e3f0546cffaa87f8732" - integrity sha512-i5GE2Dk5ekdlK1TR7SugY4LWRrKSfb5T1Qn4unpIMbfxoeGKERKQ59HG3iYewacGD10SR7UzevfPnh6my4tNmQ== - "@discoveryjs/json-ext@0.5.7", "@discoveryjs/json-ext@^0.5.0": version "0.5.7" resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" @@ -81,230 +76,230 @@ resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz#d1bc06aedb6936b3b6d313bf809a5a40387d2b7f" integrity sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA== -"@esbuild/aix-ppc64@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.0.tgz#509621cca4e67caf0d18561a0c56f8b70237472f" - integrity sha512-fGFDEctNh0CcSwsiRPxiaqX0P5rq+AqE0SRhYGZ4PX46Lg1FNR6oCxJghf8YgY0WQEgQuh3lErUFE4KxLeRmmw== +"@esbuild/aix-ppc64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz#eafa8775019b3650a77e8310ba4dbd17ca7af6d5" + integrity sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA== "@esbuild/android-arm64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz#7ad65a36cfdb7e0d429c353e00f680d737c2aed4" integrity sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA== -"@esbuild/android-arm64@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.0.tgz#109a6fdc4a2783fc26193d2687827045d8fef5ab" - integrity sha512-aVpnM4lURNkp0D3qPoAzSG92VXStYmoVPOgXveAUoQBWRSuQzt51yvSju29J6AHPmwY1BjH49uR29oyfH1ra8Q== +"@esbuild/android-arm64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz#68791afa389550736f682c15b963a4f37ec2f5f6" + integrity sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A== "@esbuild/android-arm@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.12.tgz#b0c26536f37776162ca8bde25e42040c203f2824" integrity sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w== -"@esbuild/android-arm@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.0.tgz#1397a2c54c476c4799f9b9073550ede496c94ba5" - integrity sha512-3bMAfInvByLHfJwYPJRlpTeaQA75n8C/QKpEaiS4HrFWFiJlNI0vzq/zCjBrhAYcPyVPG7Eo9dMrcQXuqmNk5g== +"@esbuild/android-arm@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.1.tgz#38c91d8ee8d5196f7fbbdf4f0061415dde3a473a" + integrity sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw== "@esbuild/android-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.12.tgz#cb13e2211282012194d89bf3bfe7721273473b3d" integrity sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew== -"@esbuild/android-x64@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.0.tgz#2b615abefb50dc0a70ac313971102f4ce2fdb3ca" - integrity sha512-uK7wAnlRvjkCPzh8jJ+QejFyrP8ObKuR5cBIsQZ+qbMunwR8sbd8krmMbxTLSrDhiPZaJYKQAU5Y3iMDcZPhyQ== +"@esbuild/android-x64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.1.tgz#93f6190ce997b313669c20edbf3645fc6c8d8f22" + integrity sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA== "@esbuild/darwin-arm64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz#cbee41e988020d4b516e9d9e44dd29200996275e" integrity sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g== -"@esbuild/darwin-arm64@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.0.tgz#5c122ed799eb0c35b9d571097f77254964c276a2" - integrity sha512-AjEcivGAlPs3UAcJedMa9qYg9eSfU6FnGHJjT8s346HSKkrcWlYezGE8VaO2xKfvvlZkgAhyvl06OJOxiMgOYQ== +"@esbuild/darwin-arm64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz#0d391f2e81fda833fe609182cc2fbb65e03a3c46" + integrity sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA== "@esbuild/darwin-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz#e37d9633246d52aecf491ee916ece709f9d5f4cd" integrity sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A== -"@esbuild/darwin-x64@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.0.tgz#9561d277002ba8caf1524f209de2b22e93d170c1" - integrity sha512-bsgTPoyYDnPv8ER0HqnJggXK6RyFy4PH4rtsId0V7Efa90u2+EifxytE9pZnsDgExgkARy24WUQGv9irVbTvIw== +"@esbuild/darwin-x64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz#92504077424584684862f483a2242cfde4055ba2" + integrity sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA== "@esbuild/freebsd-arm64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz#1ee4d8b682ed363b08af74d1ea2b2b4dbba76487" integrity sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA== -"@esbuild/freebsd-arm64@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.0.tgz#84178986a3138e8500d17cc380044868176dd821" - integrity sha512-kQ7jYdlKS335mpGbMW5tEe3IrQFIok9r84EM3PXB8qBFJPSc6dpWfrtsC/y1pyrz82xfUIn5ZrnSHQQsd6jebQ== +"@esbuild/freebsd-arm64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz#a1646fa6ba87029c67ac8a102bb34384b9290774" + integrity sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw== "@esbuild/freebsd-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz#37a693553d42ff77cd7126764b535fb6cc28a11c" integrity sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg== -"@esbuild/freebsd-x64@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.0.tgz#3f9ce53344af2f08d178551cd475629147324a83" - integrity sha512-uG8B0WSepMRsBNVXAQcHf9+Ko/Tr+XqmK7Ptel9HVmnykupXdS4J7ovSQUIi0tQGIndhbqWLaIL/qO/cWhXKyQ== +"@esbuild/freebsd-x64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz#41c9243ab2b3254ea7fb512f71ffdb341562e951" + integrity sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg== "@esbuild/linux-arm64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz#be9b145985ec6c57470e0e051d887b09dddb2d4b" integrity sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA== -"@esbuild/linux-arm64@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.0.tgz#24efa685515689df4ecbc13031fa0a9dda910a11" - integrity sha512-uTtyYAP5veqi2z9b6Gr0NUoNv9F/rOzI8tOD5jKcCvRUn7T60Bb+42NDBCWNhMjkQzI0qqwXkQGo1SY41G52nw== +"@esbuild/linux-arm64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz#f3c1e1269fbc9eedd9591a5bdd32bf707a883156" + integrity sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w== "@esbuild/linux-arm@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz#207ecd982a8db95f7b5279207d0ff2331acf5eef" integrity sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w== -"@esbuild/linux-arm@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.0.tgz#6b586a488e02e9b073a75a957f2952b3b6e87b4c" - integrity sha512-2ezuhdiZw8vuHf1HKSf4TIk80naTbP9At7sOqZmdVwvvMyuoDiZB49YZKLsLOfKIr77+I40dWpHVeY5JHpIEIg== +"@esbuild/linux-arm@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz#4503ca7001a8ee99589c072801ce9d7540717a21" + integrity sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw== "@esbuild/linux-ia32@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz#d0d86b5ca1562523dc284a6723293a52d5860601" integrity sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA== -"@esbuild/linux-ia32@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.0.tgz#84ce7864f762708dcebc1b123898a397dea13624" - integrity sha512-c88wwtfs8tTffPaoJ+SQn3y+lKtgTzyjkD8NgsyCtCmtoIC8RDL7PrJU05an/e9VuAke6eJqGkoMhJK1RY6z4w== +"@esbuild/linux-ia32@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz#98c474e3e0cbb5bcbdd8561a6e65d18f5767ce48" + integrity sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw== "@esbuild/linux-loong64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz#9a37f87fec4b8408e682b528391fa22afd952299" integrity sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA== -"@esbuild/linux-loong64@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.0.tgz#1922f571f4cae1958e3ad29439c563f7d4fd9037" - integrity sha512-lR2rr/128/6svngnVta6JN4gxSXle/yZEZL3o4XZ6esOqhyR4wsKyfu6qXAL04S4S5CgGfG+GYZnjFd4YiG3Aw== +"@esbuild/linux-loong64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz#a8097d28d14b9165c725fe58fc438f80decd2f33" + integrity sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA== "@esbuild/linux-mips64el@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz#4ddebd4e6eeba20b509d8e74c8e30d8ace0b89ec" integrity sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w== -"@esbuild/linux-mips64el@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.0.tgz#7ca1bd9df3f874d18dbf46af009aebdb881188fe" - integrity sha512-9Sycc+1uUsDnJCelDf6ZNqgZQoK1mJvFtqf2MUz4ujTxGhvCWw+4chYfDLPepMEvVL9PDwn6HrXad5yOrNzIsQ== +"@esbuild/linux-mips64el@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz#c44f6f0d7d017c41ad3bb15bfdb69b690656b5ea" + integrity sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA== "@esbuild/linux-ppc64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz#adb67dadb73656849f63cd522f5ecb351dd8dee8" integrity sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg== -"@esbuild/linux-ppc64@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.0.tgz#8f95baf05f9486343bceeb683703875d698708a4" - integrity sha512-CoWSaaAXOZd+CjbUTdXIJE/t7Oz+4g90A3VBCHLbfuc5yUQU/nFDLOzQsN0cdxgXd97lYW/psIIBdjzQIwTBGw== +"@esbuild/linux-ppc64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz#0765a55389a99237b3c84227948c6e47eba96f0d" + integrity sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw== "@esbuild/linux-riscv64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz#11bc0698bf0a2abf8727f1c7ace2112612c15adf" integrity sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg== -"@esbuild/linux-riscv64@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.0.tgz#ca63b921d5fe315e28610deb0c195e79b1a262ca" - integrity sha512-mlb1hg/eYRJUpv8h/x+4ShgoNLL8wgZ64SUr26KwglTYnwAWjkhR2GpoKftDbPOCnodA9t4Y/b68H4J9XmmPzA== +"@esbuild/linux-riscv64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz#e4153b032288e3095ddf4c8be07893781b309a7e" + integrity sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg== "@esbuild/linux-s390x@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz#e86fb8ffba7c5c92ba91fc3b27ed5a70196c3cc8" integrity sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg== -"@esbuild/linux-s390x@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.0.tgz#cb3d069f47dc202f785c997175f2307531371ef8" - integrity sha512-fgf9ubb53xSnOBqyvWEY6ukBNRl1mVX1srPNu06B6mNsNK20JfH6xV6jECzrQ69/VMiTLvHMicQR/PgTOgqJUQ== +"@esbuild/linux-s390x@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz#b9ab8af6e4b73b26d63c1c426d7669a5d53eb5a7" + integrity sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ== "@esbuild/linux-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz#5f37cfdc705aea687dfe5dfbec086a05acfe9c78" integrity sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg== -"@esbuild/linux-x64@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.0.tgz#ac617e0dc14e9758d3d7efd70288c14122557dc7" - integrity sha512-H9Eu6MGse++204XZcYsse1yFHmRXEWgadk2N58O/xd50P9EvFMLJTQLg+lB4E1cF2xhLZU5luSWtGTb0l9UeSg== +"@esbuild/linux-x64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz#0b25da17ac38c3e11cdd06ca3691d4d6bef2755f" + integrity sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA== "@esbuild/netbsd-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz#29da566a75324e0d0dd7e47519ba2f7ef168657b" integrity sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA== -"@esbuild/netbsd-x64@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.0.tgz#6cc778567f1513da6e08060e0aeb41f82eb0f53c" - integrity sha512-lCT675rTN1v8Fo+RGrE5KjSnfY0x9Og4RN7t7lVrN3vMSjy34/+3na0q7RIfWDAj0e0rCh0OL+P88lu3Rt21MQ== +"@esbuild/netbsd-x64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz#3148e48406cd0d4f7ba1e0bf3f4d77d548c98407" + integrity sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg== "@esbuild/openbsd-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz#306c0acbdb5a99c95be98bdd1d47c916e7dc3ff0" integrity sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw== -"@esbuild/openbsd-x64@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.0.tgz#76848bcf76b4372574fb4d06cd0ed1fb29ec0fbe" - integrity sha512-HKoUGXz/TOVXKQ+67NhxyHv+aDSZf44QpWLa3I1lLvAwGq8x1k0T+e2HHSRvxWhfJrFxaaqre1+YyzQ99KixoA== +"@esbuild/openbsd-x64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz#7b73e852986a9750192626d377ac96ac2b749b76" + integrity sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw== "@esbuild/sunos-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz#0933eaab9af8b9b2c930236f62aae3fc593faf30" integrity sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA== -"@esbuild/sunos-x64@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.0.tgz#ea4cd0639bf294ad51bc08ffbb2dac297e9b4706" - integrity sha512-GDwAqgHQm1mVoPppGsoq4WJwT3vhnz/2N62CzhvApFD1eJyTroob30FPpOZabN+FgCjhG+AgcZyOPIkR8dfD7g== +"@esbuild/sunos-x64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz#402a441cdac2eee98d8be378c7bc23e00c1861c5" + integrity sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q== "@esbuild/win32-arm64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz#773bdbaa1971b36db2f6560088639ccd1e6773ae" integrity sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A== -"@esbuild/win32-arm64@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.0.tgz#a5c171e4a7f7e4e8be0e9947a65812c1535a7cf0" - integrity sha512-0vYsP8aC4TvMlOQYozoksiaxjlvUcQrac+muDqj1Fxy6jh9l9CZJzj7zmh8JGfiV49cYLTorFLxg7593pGldwQ== +"@esbuild/win32-arm64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz#36c4e311085806a6a0c5fc54d1ac4d7b27e94d7b" + integrity sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A== "@esbuild/win32-ia32@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz#000516cad06354cc84a73f0943a4aa690ef6fd67" integrity sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ== -"@esbuild/win32-ia32@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.0.tgz#f8ac5650c412d33ea62d7551e0caf82da52b7f85" - integrity sha512-p98u4rIgfh4gdpV00IqknBD5pC84LCub+4a3MO+zjqvU5MVXOc3hqR2UgT2jI2nh3h8s9EQxmOsVI3tyzv1iFg== +"@esbuild/win32-ia32@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz#0cf933be3fb9dc58b45d149559fe03e9e22b54fe" + integrity sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw== "@esbuild/win32-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz#c57c8afbb4054a3ab8317591a0b7320360b444ae" integrity sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA== -"@esbuild/win32-x64@0.20.0": - version "0.20.0" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.0.tgz#2efddf82828aac85e64cef62482af61c29561bee" - integrity sha512-NgJnesu1RtWihtTtXGFMU5YSE6JyyHPMxCwBZK7a6/8d31GuSo9l0Ss7w1Jw5QnKUawG6UEehs883kcXf5fYwg== +"@esbuild/win32-x64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz#77583b6ea54cee7c1410ebbd54051b6a3fcbd8ba" + integrity sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA== "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" @@ -333,12 +328,12 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.56.0": - version "8.56.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b" - integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A== +"@eslint/js@8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f" + integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== -"@floating-ui/core@^1.6.0": +"@floating-ui/core@^1.0.0": version "1.6.0" resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.0.tgz#fa41b87812a16bf123122bf945946bae3fdf7fc1" integrity sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g== @@ -346,14 +341,14 @@ "@floating-ui/utils" "^0.2.1" "@floating-ui/dom@^1.4.2": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.1.tgz#d552e8444f77f2d88534372369b3771dc3a2fa5d" - integrity sha512-iA8qE43/H5iGozC3W0YSnVSW42Vh522yyM1gj+BqRwVsTNOyr231PsXDaV04yT39PsO0QL2QpbI/M0ZaLUQgRQ== + version "1.6.3" + resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.3.tgz#954e46c1dd3ad48e49db9ada7218b0985cee75ef" + integrity sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw== dependencies: - "@floating-ui/core" "^1.6.0" - "@floating-ui/utils" "^0.2.1" + "@floating-ui/core" "^1.0.0" + "@floating-ui/utils" "^0.2.0" -"@floating-ui/utils@^0.2.1": +"@floating-ui/utils@^0.2.0", "@floating-ui/utils@^0.2.1": version "0.2.1" resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.1.tgz#16308cea045f0fc777b6ff20a9f25474dd8293d2" integrity sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q== @@ -392,7 +387,7 @@ "@floating-ui/dom" "^1.4.2" typescript "^4.9.5" -"@humanwhocodes/config-array@^0.11.13": +"@humanwhocodes/config-array@^0.11.14": version "0.11.14" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b" integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg== @@ -443,18 +438,18 @@ chalk "^4.0.0" "@jridgewell/gen-mapping@^0.3.0": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" - integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== + version "0.3.4" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.4.tgz#9b18145d26cf33d08576cf4c7665b28554480ed7" + integrity sha512-Oud2QPM5dHviZNn4y/WhhYKSXksv+1xLEIsNrAbGcFzUN3ubqWRFT5gwPchNc5NuzILOU4tPBDTZ4VwhL8Y7cw== dependencies: "@jridgewell/set-array" "^1.0.1" "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" "@jridgewell/resolve-uri@^3.1.0": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" - integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== + version "3.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" + integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw== "@jridgewell/set-array@^1.0.1": version "1.1.2" @@ -475,9 +470,9 @@ integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.21", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.22" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz#72a621e5de59f5f1ef792d0793a82ee20f645e4c" - integrity sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw== + version "0.3.23" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.23.tgz#afc96847f3f07841477f303eed687707a5aacd80" + integrity sha512-9/4foRoUKp8s96tSkh8DlAAc5A0Ty8vLXld+l9gjKKY6ckwI8G15f0hskGmuLZu78ZlGa1vtsfOa+lnB4vG6Jg== dependencies: "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" @@ -608,10 +603,10 @@ "@octokit/types" "^12.0.0" universal-user-agent "^6.0.0" -"@octokit/openapi-types@^19.1.0": - version "19.1.0" - resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-19.1.0.tgz#75ec7e64743870fc73e1ab4bc6ec252ecdd624dc" - integrity sha512-6G+ywGClliGQwRsjvqVYpklIfa7oRPA0vyhPQG/1Feh+B+wU0vGH1JiJ5T25d3g1JZYBHzR2qefLi9x8Gt+cpw== +"@octokit/openapi-types@^20.0.0": + version "20.0.0" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-20.0.0.tgz#9ec2daa0090eeb865ee147636e0c00f73790c6e5" + integrity sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA== "@octokit/request-error@^5.0.0": version "5.0.1" @@ -643,11 +638,11 @@ universal-user-agent "^6.0.0" "@octokit/types@^12.0.0": - version "12.4.0" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-12.4.0.tgz#8f97b601e91ce6b9776ed8152217e77a71be7aac" - integrity sha512-FLWs/AvZllw/AGVs+nJ+ELCDZZJk+kY0zMen118xhL2zD0s1etIUHm1odgjP7epxYU1ln7SZxEUWYop5bhsdgQ== + version "12.6.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-12.6.0.tgz#8100fb9eeedfe083aae66473bd97b15b62aedcb2" + integrity sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw== dependencies: - "@octokit/openapi-types" "^19.1.0" + "@octokit/openapi-types" "^20.0.0" "@opentelemetry/api-logs@0.45.1": version "0.45.1" @@ -742,7 +737,7 @@ resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== -"@playwright/browser-chromium@^1.41.1": +"@playwright/browser-chromium@^1.41.2": version "1.41.2" resolved "https://registry.yarnpkg.com/@playwright/browser-chromium/-/browser-chromium-1.41.2.tgz#f6b2e51b95bb98e916e7c42c9a6f885923cfcd4b" integrity sha512-vzobqNg2K6cJPyXCVaUxq8uDV54l3pEJvkO58XK0CBV2nl9IBySXvEqcgwsQc8PmQ930yVDrz0oCrMR6H/Qv3A== @@ -759,81 +754,81 @@ resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e" integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA== -"@sindresorhus/merge-streams@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/merge-streams/-/merge-streams-1.0.0.tgz#9cd84cc15bc865a5ca35fcaae198eb899f7b5c90" - integrity sha512-rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw== +"@sindresorhus/merge-streams@^2.1.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz#719df7fb41766bc143369eaa0dd56d8dc87c9958" + integrity sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg== -"@swc/core-darwin-arm64@1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.4.0.tgz#11abf23b884929a467ba270cf6789b9c50c4248b" - integrity sha512-UTJ/Vz+s7Pagef6HmufWt6Rs0aUu+EJF4Pzuwvr7JQQ5b1DZeAAUeUtkUTFx/PvCbM8Xfw4XdKBUZfrIKCfW8A== +"@swc/core-darwin-arm64@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.4.2.tgz#3b5677c5b9c5a7a91d953b96cd603c94064e2835" + integrity sha512-1uSdAn1MRK5C1m/TvLZ2RDvr0zLvochgrZ2xL+lRzugLlCTlSA+Q4TWtrZaOz+vnnFVliCpw7c7qu0JouhgQIw== -"@swc/core-darwin-x64@1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.4.0.tgz#f044ddaca60c5081e907b148721ad7461f6f6dfe" - integrity sha512-f8v58u2GsGak8EtZFN9guXqE0Ep10Suny6xriaW2d8FGqESPyNrnBzli3aqkSeQk5gGqu2zJ7WiiKp3XoUOidA== +"@swc/core-darwin-x64@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.4.2.tgz#bbc8bbf420389b12541151255a50f319cc17ef96" + integrity sha512-TYD28+dCQKeuxxcy7gLJUCFLqrwDZnHtC2z7cdeGfZpbI2mbfppfTf2wUPzqZk3gEC96zHd4Yr37V3Tvzar+lQ== -"@swc/core-linux-arm-gnueabihf@1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.4.0.tgz#52ceea673fc76692c0bd6d58e1863125c3e6173b" - integrity sha512-q2KAkBzmPcTnRij/Y1fgHCKAGevUX/H4uUESrw1J5gmUg9Qip6onKV80lTumA1/aooGJ18LOsB31qdbwmZk9OA== +"@swc/core-linux-arm-gnueabihf@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.4.2.tgz#aa9a18f130820717df08c9dd882043fc47e8d35a" + integrity sha512-Eyqipf7ZPGj0vplKHo8JUOoU1un2sg5PjJMpEesX0k+6HKE2T8pdyeyXODN0YTFqzndSa/J43EEPXm+rHAsLFQ== -"@swc/core-linux-arm64-gnu@1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.4.0.tgz#7f3ff1ab824ec48acdb39d231cbcb4096a4f9dd0" - integrity sha512-SknGu96W0mzHtLHWm+62fk5+Omp9fMPFO7AWyGFmz2tr8EgRRXtTSrBUnWhAbgcalnhen48GsvtMdxf1KNputg== +"@swc/core-linux-arm64-gnu@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.4.2.tgz#5ef1de0ca7cc3a034aa3a1c3c1794b78e6ca207e" + integrity sha512-wZn02DH8VYPv3FC0ub4my52Rttsus/rFw+UUfzdb3tHMHXB66LqN+rR0ssIOZrH6K+VLN6qpTw9VizjyoH0BxA== -"@swc/core-linux-arm64-musl@1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.4.0.tgz#26c3b1f7947c19ef725997af716f230957d586f8" - integrity sha512-/k3TDvpBRMDNskHooNN1KqwUhcwkfBlIYxRTnJvsfT2C7My4pffR+4KXmt0IKynlTTbCdlU/4jgX4801FSuliw== +"@swc/core-linux-arm64-musl@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.4.2.tgz#5dfd2a8c0483770a307de0ccb6019a082ff0d902" + integrity sha512-3G0D5z9hUj9bXNcwmA1eGiFTwe5rWkuL3DsoviTj73TKLpk7u64ND0XjEfO0huVv4vVu9H1jodrKb7nvln/dlw== -"@swc/core-linux-x64-gnu@1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.4.0.tgz#2c7d03a04a7d045394cfed7d46419ff8816ec22e" - integrity sha512-GYsTMvNt5+WTVlwwQzOOWsPMw6P/F41u5PGHWmfev8Nd4QJ1h3rWPySKk4mV42IJwH9MgQCVSl3ygwNqwl6kFg== +"@swc/core-linux-x64-gnu@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.4.2.tgz#314aa76b7c1208e315e3156ab57b7188fb605bc2" + integrity sha512-LFxn9U8cjmYHw3jrdPNqPAkBGglKE3tCZ8rA7hYyp0BFxuo7L2ZcEnPm4RFpmSCCsExFH+LEJWuMGgWERoktvg== -"@swc/core-linux-x64-musl@1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.4.0.tgz#0e76442dfb6d5026d8d6e7db6b2f4922b7692d0f" - integrity sha512-jGVPdM/VwF7kK/uYRW5N6FwzKf/FnDjGIR3RPvQokjYJy7Auk+3Oj21C0Jev7sIT9RYnO/TrFEoEozKeD/z2Qw== +"@swc/core-linux-x64-musl@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.4.2.tgz#b2b226657f6a8d48f561cb3dbe2d414cfbafe467" + integrity sha512-dp0fAmreeVVYTUcb4u9njTPrYzKnbIH0EhH2qvC9GOYNNREUu2GezSIDgonjOXkHiTCvopG4xU7y56XtXj4VrQ== -"@swc/core-win32-arm64-msvc@1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.4.0.tgz#0177bebf312eb251d6749ab76259c0e08088e837" - integrity sha512-biHYm1AronEKlt47O/H8sSOBM2BKXMmWT+ApvlxUw50m1RGNnVnE0bgY7tylFuuSiWyXsQPJbmUV708JqORXVg== +"@swc/core-win32-arm64-msvc@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.4.2.tgz#582f79fa328ce0f426ab8313b3d881e7315fab2f" + integrity sha512-HlVIiLMQkzthAdqMslQhDkoXJ5+AOLUSTV6fm6shFKZKqc/9cJvr4S8UveNERL9zUficA36yM3bbfo36McwnvQ== -"@swc/core-win32-ia32-msvc@1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.4.0.tgz#27fa650280e5651aa42129eaf03e02787b866417" - integrity sha512-TL5L2tFQb19kJwv6+elToGBj74QXCn9j+hZfwQatvZEJRA5rDK16eH6oAE751dGUArhnWlW3Vj65hViPvTuycw== +"@swc/core-win32-ia32-msvc@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.4.2.tgz#15c8289e1c18857f79b9b888100ab1f871bf58f6" + integrity sha512-WCF8faPGjCl4oIgugkp+kL9nl3nUATlzKXCEGFowMEmVVCFM0GsqlmGdPp1pjZoWc9tpYanoXQDnp5IvlDSLhA== -"@swc/core-win32-x64-msvc@1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.4.0.tgz#bd575c599bd6847bddc4863a3babd85e3db5e11e" - integrity sha512-e2xVezU7XZ2Stzn4i7TOQe2Kn84oYdG0M3A7XI7oTdcpsKCcKwgiMoroiAhqCv+iN20KNqhnWwJiUiTj/qN5AA== +"@swc/core-win32-x64-msvc@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.4.2.tgz#c999ca7b68124d058b40a1431cdd6f56779670d5" + integrity sha512-oV71rwiSpA5xre2C5570BhCsg1HF97SNLsZ/12xv7zayGzqr3yvFALFJN8tHKpqUdCB4FGPjoP3JFdV3i+1wUw== -"@swc/core@1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.4.0.tgz#3a0ceeea5b889173f4592955fe1da4d071d86a76" - integrity sha512-wc5DMI5BJftnK0Fyx9SNJKkA0+BZSJQx8430yutWmsILkHMBD3Yd9GhlMaxasab9RhgKqZp7Ht30hUYO5ZDvQg== +"@swc/core@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.4.2.tgz#310b0d5e93e47ca72f54150c8f9efcb434c39b17" + integrity sha512-vWgY07R/eqj1/a0vsRKLI9o9klGZfpLNOVEnrv4nrccxBgYPjcf22IWwAoaBJ+wpA7Q4fVjCUM8lP0m01dpxcg== dependencies: - "@swc/counter" "^0.1.1" + "@swc/counter" "^0.1.2" "@swc/types" "^0.1.5" optionalDependencies: - "@swc/core-darwin-arm64" "1.4.0" - "@swc/core-darwin-x64" "1.4.0" - "@swc/core-linux-arm-gnueabihf" "1.4.0" - "@swc/core-linux-arm64-gnu" "1.4.0" - "@swc/core-linux-arm64-musl" "1.4.0" - "@swc/core-linux-x64-gnu" "1.4.0" - "@swc/core-linux-x64-musl" "1.4.0" - "@swc/core-win32-arm64-msvc" "1.4.0" - "@swc/core-win32-ia32-msvc" "1.4.0" - "@swc/core-win32-x64-msvc" "1.4.0" - -"@swc/counter@^0.1.1": + "@swc/core-darwin-arm64" "1.4.2" + "@swc/core-darwin-x64" "1.4.2" + "@swc/core-linux-arm-gnueabihf" "1.4.2" + "@swc/core-linux-arm64-gnu" "1.4.2" + "@swc/core-linux-arm64-musl" "1.4.2" + "@swc/core-linux-x64-gnu" "1.4.2" + "@swc/core-linux-x64-musl" "1.4.2" + "@swc/core-win32-arm64-msvc" "1.4.2" + "@swc/core-win32-ia32-msvc" "1.4.2" + "@swc/core-win32-x64-msvc" "1.4.2" + +"@swc/counter@^0.1.2": version "0.1.3" resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.3.tgz#cc7463bd02949611c6329596fccd2b0ec782b0e9" integrity sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ== @@ -897,9 +892,9 @@ "@types/estree" "*" "@types/eslint@*", "@types/eslint@^8.44.8": - version "8.56.2" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.2.tgz#1c72a9b794aa26a8b94ad26d5b9aa51c8a6384bb" - integrity sha512-uQDwm1wFHmbBbCZCqAlq6Do9LYwByNZHWzXppSnay9SuwJ+VRbjkbLABer54kcPnMSlG6Fdiy2yaFXm/z9Z5gw== + version "8.56.3" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.3.tgz#d1f6b2303ac5ed53cb2cf59e0ab680cde1698f5f" + integrity sha512-PvSf1wfv2wJpVIFUMSb+i4PvqNYkB9Rkp9ZDO3oaWzq4SKhsQk4mrMBr3ZH06I0hKrVGLBacmgl8JM4WVjb9dg== dependencies: "@types/estree" "*" "@types/json-schema" "*" @@ -967,9 +962,9 @@ integrity sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg== "@types/node@*": - version "20.11.17" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.17.tgz#cdd642d0e62ef3a861f88ddbc2b61e32578a9292" - integrity sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw== + version "20.11.20" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.20.tgz#f0a2aee575215149a62784210ad88b3a34843659" + integrity sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg== dependencies: undici-types "~5.26.4" @@ -1024,9 +1019,9 @@ integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A== "@types/semver@^7.5.0": - version "7.5.6" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339" - integrity sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A== + version "7.5.8" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e" + integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ== "@types/sortablejs@1.15.7": version "1.15.7" @@ -1064,16 +1059,16 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz#30830c1ca81fd5f3c2714e524c4303e0194f9cd3" - integrity sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA== +"@typescript-eslint/eslint-plugin@7.0.2": + version "7.0.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.0.2.tgz#c13a34057be425167cc4a765158c46fdf2fd981d" + integrity sha512-/XtVZJtbaphtdrWjr+CJclaCVGPtOdBpFEnvtNf/jRV0IiEemRrL0qABex/nEt8isYcnFacm3nPHYQwL+Wb7qg== dependencies: "@eslint-community/regexpp" "^4.5.1" - "@typescript-eslint/scope-manager" "6.21.0" - "@typescript-eslint/type-utils" "6.21.0" - "@typescript-eslint/utils" "6.21.0" - "@typescript-eslint/visitor-keys" "6.21.0" + "@typescript-eslint/scope-manager" "7.0.2" + "@typescript-eslint/type-utils" "7.0.2" + "@typescript-eslint/utils" "7.0.2" + "@typescript-eslint/visitor-keys" "7.0.2" debug "^4.3.4" graphemer "^1.4.0" ignore "^5.2.4" @@ -1081,47 +1076,47 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/parser@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.21.0.tgz#af8fcf66feee2edc86bc5d1cf45e33b0630bf35b" - integrity sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ== +"@typescript-eslint/parser@7.0.2": + version "7.0.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.0.2.tgz#95c31233d343db1ca1df8df7811b5b87ca7b1a68" + integrity sha512-GdwfDglCxSmU+QTS9vhz2Sop46ebNCXpPPvsByK7hu0rFGRHL+AusKQJ7SoN+LbLh6APFpQwHKmDSwN35Z700Q== dependencies: - "@typescript-eslint/scope-manager" "6.21.0" - "@typescript-eslint/types" "6.21.0" - "@typescript-eslint/typescript-estree" "6.21.0" - "@typescript-eslint/visitor-keys" "6.21.0" + "@typescript-eslint/scope-manager" "7.0.2" + "@typescript-eslint/types" "7.0.2" + "@typescript-eslint/typescript-estree" "7.0.2" + "@typescript-eslint/visitor-keys" "7.0.2" debug "^4.3.4" -"@typescript-eslint/scope-manager@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1" - integrity sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg== +"@typescript-eslint/scope-manager@7.0.2": + version "7.0.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.0.2.tgz#6ec4cc03752758ddd1fdaae6fbd0ed9a2ca4fe63" + integrity sha512-l6sa2jF3h+qgN2qUMjVR3uCNGjWw4ahGfzIYsCtFrQJCjhbrDPdiihYT8FnnqFwsWX+20hK592yX9I2rxKTP4g== dependencies: - "@typescript-eslint/types" "6.21.0" - "@typescript-eslint/visitor-keys" "6.21.0" + "@typescript-eslint/types" "7.0.2" + "@typescript-eslint/visitor-keys" "7.0.2" -"@typescript-eslint/type-utils@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz#6473281cfed4dacabe8004e8521cee0bd9d4c01e" - integrity sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag== +"@typescript-eslint/type-utils@7.0.2": + version "7.0.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.0.2.tgz#a7fc0adff0c202562721357e7478207d380a757b" + integrity sha512-IKKDcFsKAYlk8Rs4wiFfEwJTQlHcdn8CLwLaxwd6zb8HNiMcQIFX9sWax2k4Cjj7l7mGS5N1zl7RCHOVwHq2VQ== dependencies: - "@typescript-eslint/typescript-estree" "6.21.0" - "@typescript-eslint/utils" "6.21.0" + "@typescript-eslint/typescript-estree" "7.0.2" + "@typescript-eslint/utils" "7.0.2" debug "^4.3.4" ts-api-utils "^1.0.1" -"@typescript-eslint/types@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d" - integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg== +"@typescript-eslint/types@7.0.2": + version "7.0.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.0.2.tgz#b6edd108648028194eb213887d8d43ab5750351c" + integrity sha512-ZzcCQHj4JaXFjdOql6adYV4B/oFOFjPOC9XYwCaZFRvqN8Llfvv4gSxrkQkd2u4Ci62i2c6W6gkDwQJDaRc4nA== -"@typescript-eslint/typescript-estree@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46" - integrity sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ== +"@typescript-eslint/typescript-estree@7.0.2": + version "7.0.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.0.2.tgz#3c6dc8a3b9799f4ef7eca0d224ded01974e4cb39" + integrity sha512-3AMc8khTcELFWcKcPc0xiLviEvvfzATpdPj/DXuOGIdQIIFybf4DMT1vKRbuAEOFMwhWt7NFLXRkbjsvKZQyvw== dependencies: - "@typescript-eslint/types" "6.21.0" - "@typescript-eslint/visitor-keys" "6.21.0" + "@typescript-eslint/types" "7.0.2" + "@typescript-eslint/visitor-keys" "7.0.2" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -1129,25 +1124,25 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/utils@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134" - integrity sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ== +"@typescript-eslint/utils@7.0.2": + version "7.0.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.0.2.tgz#8756123054cd934c8ba7db6a6cffbc654b10b5c4" + integrity sha512-PZPIONBIB/X684bhT1XlrkjNZJIEevwkKDsdwfiu1WeqBxYEEdIgVDgm8/bbKHVu+6YOpeRqcfImTdImx/4Bsw== dependencies: "@eslint-community/eslint-utils" "^4.4.0" "@types/json-schema" "^7.0.12" "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "6.21.0" - "@typescript-eslint/types" "6.21.0" - "@typescript-eslint/typescript-estree" "6.21.0" + "@typescript-eslint/scope-manager" "7.0.2" + "@typescript-eslint/types" "7.0.2" + "@typescript-eslint/typescript-estree" "7.0.2" semver "^7.5.4" -"@typescript-eslint/visitor-keys@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47" - integrity sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A== +"@typescript-eslint/visitor-keys@7.0.2": + version "7.0.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.0.2.tgz#2899b716053ad7094962beb895d11396fc12afc7" + integrity sha512-8Y+YiBmqPighbm5xA2k4wKTxRzx9EkBu7Rlw+WHqMvRJ3RPz/BMBO9b2ru0LUNmXg120PHUXD5+SWFy2R8DqlQ== dependencies: - "@typescript-eslint/types" "6.21.0" + "@typescript-eslint/types" "7.0.2" eslint-visitor-keys "^3.4.1" "@ungap/structured-clone@^1.2.0": @@ -1170,36 +1165,35 @@ jszip "^3.10.1" semver "^7.5.2" -"@vscode/test-web@0.0.51": - version "0.0.51" - resolved "https://registry.yarnpkg.com/@vscode/test-web/-/test-web-0.0.51.tgz#503dbbbba84770402b8a14e7e26ddb605262981e" - integrity sha512-BULmM/HkTuWYuDQLq17L0XYZkzOtsIIC38HN5eYaVBUXSOSwXpyihTalsQ6y9GNPuGWZUnc2XqXYvR6gdSHHOg== +"@vscode/test-web@0.0.52": + version "0.0.52" + resolved "https://registry.yarnpkg.com/@vscode/test-web/-/test-web-0.0.52.tgz#5c32abc28214190957cfc362bfdf4bac0cf33ce2" + integrity sha512-PEYyru1GTUgNFpICWnvz33MnZ+nIIdG6feYHebvJMyFRZFL4s35Mp/6/aa8xUvfzAz/XBHCsbLRtJ1l067f/eQ== dependencies: "@koa/cors" "^5.0.0" "@koa/router" "^12.0.1" - "@playwright/browser-chromium" "^1.41.1" + "@playwright/browser-chromium" "^1.41.2" gunzip-maybe "^1.4.2" - http-proxy-agent "^7.0.0" - https-proxy-agent "^7.0.2" + http-proxy-agent "^7.0.2" + https-proxy-agent "^7.0.4" koa "^2.15.0" koa-morgan "^1.0.1" koa-mount "^4.0.0" koa-static "^5.0.0" minimist "^1.2.8" - playwright "^1.41.1" - tar-fs "^3.0.4" + playwright "^1.41.2" + tar-fs "^3.0.5" vscode-uri "^3.0.8" -"@vscode/vsce@2.23.0": - version "2.23.0" - resolved "https://registry.yarnpkg.com/@vscode/vsce/-/vsce-2.23.0.tgz#280ce82356c59efda97d3ba14bcdd9e3e22ddb7f" - integrity sha512-Wf9yN8feZf4XmUW/erXyKQvCL577u72AQv4AI4Cwt5o5NyE49C5mpfw3pN78BJYYG3qnSIxwRo7JPvEurkQuNA== +"@vscode/vsce@2.24.0": + version "2.24.0" + resolved "https://registry.yarnpkg.com/@vscode/vsce/-/vsce-2.24.0.tgz#7f835b9fdd5bfedcecd62a6c4d684841a74974d4" + integrity sha512-p6CIXpH5HXDqmUkgFXvIKTjZpZxy/uDx4d/UsfhS9vQUun43KDNUbYeZocyAHgqcJlPEurgArHz9te1PPiqPyA== dependencies: azure-devops-node-api "^11.0.1" chalk "^2.4.2" cheerio "^1.0.0-rc.9" commander "^6.2.1" - find-yarn-workspace-root "^2.0.0" glob "^7.0.6" hosted-git-info "^4.0.2" jsonc-parser "^3.2.0" @@ -1553,7 +1547,7 @@ argparse@^2.0.1: resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== -array-buffer-byte-length@^1.0.0, array-buffer-byte-length@^1.0.1: +array-buffer-byte-length@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f" integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg== @@ -1641,7 +1635,7 @@ array.prototype.flatmap@^1.3.2: es-abstract "^1.22.1" es-shim-unscopables "^1.0.0" -arraybuffer.prototype.slice@^1.0.2: +arraybuffer.prototype.slice@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6" integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A== @@ -1670,7 +1664,7 @@ atoa@1.0.0: resolved "https://registry.yarnpkg.com/atoa/-/atoa-1.0.0.tgz#0cc0e91a480e738f923ebc103676471779b34a49" integrity sha512-VVE1H6cc4ai+ZXo/CRWoJiHXrA1qfA31DPnx6D20+kSI547hQN5Greh51LQ1baMRMfxO5K5M4ImMtZbZt2DODQ== -autoprefixer@^10.4.16: +autoprefixer@^10.4.17: version "10.4.17" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.17.tgz#35cd5695cbbe82f536a50fa025d561b01fdec8be" integrity sha512-/cpVNRLSfhOtcGflT13P2794gVSgmPgTR+erw5ifnMLZb0UnSlkK4tquLmkd3BhA+nLo5tX8Cu0upUsGKvKbmg== @@ -1682,10 +1676,12 @@ autoprefixer@^10.4.16: picocolors "^1.0.0" postcss-value-parser "^4.2.0" -available-typed-arrays@^1.0.5, available-typed-arrays@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.6.tgz#ac812d8ce5a6b976d738e1c45f08d0b00bc7d725" - integrity sha512-j1QzY8iPNPG4o4xmO3ptzpRxTciqD3MgEHtifP/YnJpIo58Xu+ne4BejlbkuaLfXn/nz6HFiw29bLpj2PNMdGg== +available-typed-arrays@^1.0.6, available-typed-arrays@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846" + integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ== + dependencies: + possible-typed-array-names "^1.0.0" azure-devops-node-api@^11.0.1: version "11.2.0" @@ -1711,9 +1707,9 @@ bare-events@^2.0.0, bare-events@^2.2.0: integrity sha512-Yyyqff4PIFfSuthCZqLlPISTWHmnQxoPuAvkmgzsJEmG3CesdIv6Xweayl0JkCZJSB2yYIdJyEz97tpxNhgjbg== bare-fs@^2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-2.1.3.tgz#92e9ed679af898b2e7a23523113f79113048d75b" - integrity sha512-Oa7F0QJV7We0mtKq7Tk246uiBrl7vun64cPEsJOEwv2vHjnVL9yO7aH3643aSrd4rXfVe7yhJ9LHZywQQAXKFQ== + version "2.2.0" + resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-2.2.0.tgz#e23ab841be0e08b29ad2933281ce4ad5ddd60384" + integrity sha512-+VhW202E9eTVGkX7p+TNXtZC4RTzj9JfJW7PtfIbZ7mIQ/QT9uOafQTx7lx2n9ERmWsXvLHF4hStAFn4gl2mQw== dependencies: bare-events "^2.0.0" bare-os "^2.0.0" @@ -1721,9 +1717,9 @@ bare-fs@^2.1.1: streamx "^2.13.0" bare-os@^2.0.0, bare-os@^2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/bare-os/-/bare-os-2.1.2.tgz#bdc8855062ea1c4bcb82fbb669d90be57462305d" - integrity sha512-slQjOn78Q8itnzomNAamiKo5MDpEpV3JnoNZ93lyynaFh6paWcU+5c0GVcZ7EYIJC2unN2JGdF1qupdscYl0Yg== + version "2.2.0" + resolved "https://registry.yarnpkg.com/bare-os/-/bare-os-2.2.0.tgz#24364692984d0bd507621754781b31d7872736b2" + integrity sha512-hD0rOPfYWOMpVirTACt4/nK8mC55La12K5fY1ij8HAdfQakD62M+H4o4tpfKzVGLgRDTuk3vjA4GqGXXCeFbag== bare-path@^2.0.0, bare-path@^2.1.0: version "2.1.0" @@ -1830,21 +1826,16 @@ browserify-zlib@^0.1.4: dependencies: pako "~0.2.0" -browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.22.2: - version "4.22.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.3.tgz#299d11b7e947a6b843981392721169e27d60c5a6" - integrity sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A== +browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.22.2, browserslist@^4.23.0: + version "4.23.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab" + integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ== dependencies: - caniuse-lite "^1.0.30001580" - electron-to-chromium "^1.4.648" + caniuse-lite "^1.0.30001587" + electron-to-chromium "^1.4.668" node-releases "^2.0.14" update-browserslist-db "^1.0.13" -buffer-builder@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/buffer-builder/-/buffer-builder-0.2.0.tgz#3322cd307d8296dab1f604618593b261a3fade8f" - integrity sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg== - buffer-crc32@~0.2.3: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" @@ -1902,15 +1893,16 @@ cache-content-type@^1.0.0: mime-types "^2.1.18" ylru "^1.2.0" -call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.6.tgz#6c46675fc7a5e9de82d75a233d586c8b7ac0d931" - integrity sha512-Mj50FLHtlsoVfRfnHaZvyrooHcrlceNZdL/QBvJJVd9Ta55qCQK0gs4ss2oZDeV9zFCs6ewzYgVE5yfVmfFpVg== +call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" + integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== dependencies: + es-define-property "^1.0.0" es-errors "^1.3.0" function-bind "^1.1.2" - get-intrinsic "^1.2.3" - set-function-length "^1.2.0" + get-intrinsic "^1.2.4" + set-function-length "^1.2.1" callsites@^3.0.0: version "3.1.0" @@ -1950,10 +1942,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001578, caniuse-lite@^1.0.30001580: - version "1.0.30001585" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001585.tgz#0b4e848d84919c783b2a41c13f7de8ce96744401" - integrity sha512-yr2BWR1yLXQ8fMpdS/4ZZXpseBgE7o4g41x3a6AJOqZuOi+iE/WdJYAuZ6Y95i4Ohd2Y+9MzIWRR+uGABH4s3Q== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001578, caniuse-lite@^1.0.30001587: + version "1.0.30001589" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001589.tgz#7ad6dba4c9bf6561aec8291976402339dc157dfb" + integrity sha512-vNQWS6kI+q6sBlHbh71IIeC+sRwK2N3EDySc/updIGhIee2x5z00J4c1242/5/d6EpEMdOnk/m+6tuk4/tcsqg== capital-case@^1.0.4: version "1.0.4" @@ -2190,7 +2182,7 @@ color@^4.2.3: color-convert "^2.0.1" color-string "^1.9.0" -colord@^2.9.1: +colord@^2.9.3: version "2.9.3" resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43" integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw== @@ -2428,37 +2420,37 @@ cssesc@^3.0.0: resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssnano-preset-advanced@6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/cssnano-preset-advanced/-/cssnano-preset-advanced-6.0.3.tgz#951af1ba95bdf59e05dd60d209c40e7b7578e814" - integrity sha512-+DIOR5FFId+nb6/JcBkAMiXYDadEx2waDmSDhAA3rL1Q1N1AaZP0N25jiZnqLp3MdWnRg9t9CNaDs/OdB/lpPg== +cssnano-preset-advanced@6.0.5: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cssnano-preset-advanced/-/cssnano-preset-advanced-6.0.5.tgz#4f2c5a1229250129cad4cd11b7e072a720fe6941" + integrity sha512-weLbFCo1ka/9oRYDxa+NngtcWf/yDQi6JnjaUTZ1TROWeQVmA7v3xfHQatNYtWa8sloZaTk7KswcwSs7bj7IbA== dependencies: - autoprefixer "^10.4.16" - cssnano-preset-default "^6.0.3" - postcss-discard-unused "^6.0.2" - postcss-merge-idents "^6.0.1" + autoprefixer "^10.4.17" + cssnano-preset-default "^6.0.5" + postcss-discard-unused "^6.0.3" + postcss-merge-idents "^6.0.2" postcss-reduce-idents "^6.0.2" postcss-zindex "^6.0.1" -cssnano-preset-default@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-6.0.3.tgz#b4ce755974f4dc8d3d09ac13bb6281cce3ced45e" - integrity sha512-4y3H370aZCkT9Ev8P4SO4bZbt+AExeKhh8wTbms/X7OLDo5E7AYUUy6YPxa/uF5Grf+AJwNcCnxKhZynJ6luBA== +cssnano-preset-default@^6.0.5: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-6.0.5.tgz#c7afd6af1230a78b8d12c6da771d1156ab0127cf" + integrity sha512-M+qRDEr5QZrfNl0B2ySdbTLGyNb8kBcSjuwR7WBamYBOEREH9t2efnB/nblekqhdGLZdkf4oZNetykG2JWRdZQ== dependencies: css-declaration-sorter "^7.1.1" cssnano-utils "^4.0.1" postcss-calc "^9.0.1" - postcss-colormin "^6.0.2" - postcss-convert-values "^6.0.2" + postcss-colormin "^6.0.3" + postcss-convert-values "^6.0.4" postcss-discard-comments "^6.0.1" - postcss-discard-duplicates "^6.0.1" - postcss-discard-empty "^6.0.1" + postcss-discard-duplicates "^6.0.2" + postcss-discard-empty "^6.0.2" postcss-discard-overridden "^6.0.1" - postcss-merge-longhand "^6.0.2" - postcss-merge-rules "^6.0.3" - postcss-minify-font-values "^6.0.1" - postcss-minify-gradients "^6.0.1" - postcss-minify-params "^6.0.2" + postcss-merge-longhand "^6.0.3" + postcss-merge-rules "^6.0.4" + postcss-minify-font-values "^6.0.2" + postcss-minify-gradients "^6.0.2" + postcss-minify-params "^6.0.3" postcss-minify-selectors "^6.0.2" postcss-normalize-charset "^6.0.1" postcss-normalize-display-values "^6.0.1" @@ -2466,11 +2458,11 @@ cssnano-preset-default@^6.0.3: postcss-normalize-repeat-style "^6.0.1" postcss-normalize-string "^6.0.1" postcss-normalize-timing-functions "^6.0.1" - postcss-normalize-unicode "^6.0.2" + postcss-normalize-unicode "^6.0.3" postcss-normalize-url "^6.0.1" postcss-normalize-whitespace "^6.0.1" postcss-ordered-values "^6.0.1" - postcss-reduce-initial "^6.0.2" + postcss-reduce-initial "^6.0.3" postcss-reduce-transforms "^6.0.1" postcss-svgo "^6.0.2" postcss-unique-selectors "^6.0.2" @@ -2481,12 +2473,12 @@ cssnano-utils@^4.0.1: integrity sha512-6qQuYDqsGoiXssZ3zct6dcMxiqfT6epy7x4R0TQJadd4LWO3sPR6JH6ZByOvVLoZ6EdwPGgd7+DR1EmX3tiXQQ== cssnano@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-6.0.3.tgz#46db972da71aa159437287fb4c6bc9c5d3cc5d93" - integrity sha512-MRq4CIj8pnyZpcI2qs6wswoYoDD1t0aL28n+41c1Ukcpm56m1h6mCexIHBGjfZfnTqtGSSCP4/fB1ovxgjBOiw== + version "6.0.5" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-6.0.5.tgz#5ff1a344ca9d7862ee7198991cf3e7463bd12355" + integrity sha512-tpTp/ukgrElwu3ESFY4IvWnGn8eTt8cJhC2aAbtA3lvUlxp6t6UPv8YCLjNnEGiFreT1O0LiOM1U3QyTBVFl2A== dependencies: - cssnano-preset-default "^6.0.3" - lilconfig "^3.0.0" + cssnano-preset-default "^6.0.5" + lilconfig "^3.1.1" csso@^5.0.5: version "5.0.5" @@ -2734,15 +2726,14 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== -define-data-property@^1.0.1, define-data-property@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.2.tgz#f3c33b4f0102360cd7c0f5f28700f5678510b63a" - integrity sha512-SRtsSqsDbgpJBbW3pABMCOt6rQyeM8s8RiyeSN8jYG8sYmt/kGJejbydttUsnDs1tadr19tvhT4ShwMyoqAm4g== +define-data-property@^1.0.1, define-data-property@^1.1.2, define-data-property@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" + integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== dependencies: + es-define-property "^1.0.0" es-errors "^1.3.0" - get-intrinsic "^1.2.2" gopd "^1.0.1" - has-property-descriptors "^1.0.1" define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1: version "1.2.1" @@ -2940,10 +2931,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.4.648: - version "1.4.665" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.665.tgz#681700bd590b0e5a3be66e3e2874ce62abcf5da5" - integrity sha512-UpyCWObBoD+nSZgOC2ToaIdZB0r9GhqT2WahPKiSki6ckkSuKhQNso8V2PrFcHBMleI/eqbKgVQgVC4Wni4ilw== +electron-to-chromium@^1.4.668: + version "1.4.681" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.681.tgz#5f23fad8aa7e1f64cbb7dd9d15c7e39a1cd7e6e3" + integrity sha512-1PpuqJUFWoXZ1E54m8bsLPVYwIVCRzvaL+n5cjigGga4z854abDnFRc+cTa2th4S79kyGqya/1xoR7h+Y5G5lg== emoji-regex@^8.0.0: version "8.0.0" @@ -3025,55 +3016,64 @@ error-ex@^1.3.1: is-arrayish "^0.2.1" es-abstract@^1.22.1, es-abstract@^1.22.3: - version "1.22.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32" - integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA== + version "1.22.4" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.4.tgz#26eb2e7538c3271141f5754d31aabfdb215f27bf" + integrity sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg== dependencies: - array-buffer-byte-length "^1.0.0" - arraybuffer.prototype.slice "^1.0.2" - available-typed-arrays "^1.0.5" - call-bind "^1.0.5" - es-set-tostringtag "^2.0.1" + array-buffer-byte-length "^1.0.1" + arraybuffer.prototype.slice "^1.0.3" + available-typed-arrays "^1.0.6" + call-bind "^1.0.7" + es-define-property "^1.0.0" + es-errors "^1.3.0" + es-set-tostringtag "^2.0.2" es-to-primitive "^1.2.1" function.prototype.name "^1.1.6" - get-intrinsic "^1.2.2" - get-symbol-description "^1.0.0" + get-intrinsic "^1.2.4" + get-symbol-description "^1.0.2" globalthis "^1.0.3" gopd "^1.0.1" - has-property-descriptors "^1.0.0" + has-property-descriptors "^1.0.2" has-proto "^1.0.1" has-symbols "^1.0.3" - hasown "^2.0.0" - internal-slot "^1.0.5" - is-array-buffer "^3.0.2" + hasown "^2.0.1" + internal-slot "^1.0.7" + is-array-buffer "^3.0.4" is-callable "^1.2.7" is-negative-zero "^2.0.2" is-regex "^1.1.4" is-shared-array-buffer "^1.0.2" is-string "^1.0.7" - is-typed-array "^1.1.12" + is-typed-array "^1.1.13" is-weakref "^1.0.2" object-inspect "^1.13.1" object-keys "^1.1.1" - object.assign "^4.1.4" - regexp.prototype.flags "^1.5.1" - safe-array-concat "^1.0.1" - safe-regex-test "^1.0.0" + object.assign "^4.1.5" + regexp.prototype.flags "^1.5.2" + safe-array-concat "^1.1.0" + safe-regex-test "^1.0.3" string.prototype.trim "^1.2.8" string.prototype.trimend "^1.0.7" string.prototype.trimstart "^1.0.7" - typed-array-buffer "^1.0.0" + typed-array-buffer "^1.0.1" typed-array-byte-length "^1.0.0" typed-array-byte-offset "^1.0.0" typed-array-length "^1.0.4" unbox-primitive "^1.0.2" - which-typed-array "^1.1.13" + which-typed-array "^1.1.14" es-array-method-boxes-properly@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e" integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== +es-define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" + integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== + dependencies: + get-intrinsic "^1.2.4" + es-errors@^1.0.0, es-errors@^1.2.1, es-errors@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" @@ -3084,14 +3084,14 @@ es-module-lexer@^1.2.1: resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5" integrity sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w== -es-set-tostringtag@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz#11f7cc9f63376930a5f20be4915834f4bc74f9c9" - integrity sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q== +es-set-tostringtag@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777" + integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ== dependencies: - get-intrinsic "^1.2.2" - has-tostringtag "^1.0.0" - hasown "^2.0.0" + get-intrinsic "^1.2.4" + has-tostringtag "^1.0.2" + hasown "^2.0.1" es-shim-unscopables@^1.0.0, es-shim-unscopables@^1.0.2: version "1.0.2" @@ -3119,42 +3119,42 @@ esbuild-loader@4.0.3: loader-utils "^2.0.4" webpack-sources "^1.4.3" -esbuild-sass-plugin@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/esbuild-sass-plugin/-/esbuild-sass-plugin-3.0.0.tgz#e8ed1ac291699c09f377bbe67d91ccfb45852148" - integrity sha512-bwIzYBdI7mK0HghblwqGEYX44Hknvj6EBKXEI8e0hC+Xui5L8oUXFeJ4/PDldxYD++wIPuA6Lr4EAnNCtbv//A== +esbuild-sass-plugin@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/esbuild-sass-plugin/-/esbuild-sass-plugin-3.1.0.tgz#a6d1ed0e0f7ea0366c928009d4d11a80612416e9" + integrity sha512-LX/PhMuA7KskPDT8yB10/o3C3fTKVWEzcfzGnGH0wqjZm3FEtm4d6dCxUn+252kuWZAgFOGzGOnBv1FpzClJrA== dependencies: - resolve "^1.22.6" - sass-embedded "^1.70.0" + resolve "^1.22.8" + sass "^1.71.1" -esbuild@0.20.0: - version "0.20.0" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.0.tgz#a7170b63447286cd2ff1f01579f09970e6965da4" - integrity sha512-6iwE3Y2RVYCME1jLpBqq7LQWK3MW6vjV2bZy6gt/WrqkY+WE74Spyc0ThAOYpMtITvnjX09CrC6ym7A/m9mebA== +esbuild@0.20.1: + version "0.20.1" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.1.tgz#1e4cbb380ad1959db7609cb9573ee77257724a3e" + integrity sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA== optionalDependencies: - "@esbuild/aix-ppc64" "0.20.0" - "@esbuild/android-arm" "0.20.0" - "@esbuild/android-arm64" "0.20.0" - "@esbuild/android-x64" "0.20.0" - "@esbuild/darwin-arm64" "0.20.0" - "@esbuild/darwin-x64" "0.20.0" - "@esbuild/freebsd-arm64" "0.20.0" - "@esbuild/freebsd-x64" "0.20.0" - "@esbuild/linux-arm" "0.20.0" - "@esbuild/linux-arm64" "0.20.0" - "@esbuild/linux-ia32" "0.20.0" - "@esbuild/linux-loong64" "0.20.0" - "@esbuild/linux-mips64el" "0.20.0" - "@esbuild/linux-ppc64" "0.20.0" - "@esbuild/linux-riscv64" "0.20.0" - "@esbuild/linux-s390x" "0.20.0" - "@esbuild/linux-x64" "0.20.0" - "@esbuild/netbsd-x64" "0.20.0" - "@esbuild/openbsd-x64" "0.20.0" - "@esbuild/sunos-x64" "0.20.0" - "@esbuild/win32-arm64" "0.20.0" - "@esbuild/win32-ia32" "0.20.0" - "@esbuild/win32-x64" "0.20.0" + "@esbuild/aix-ppc64" "0.20.1" + "@esbuild/android-arm" "0.20.1" + "@esbuild/android-arm64" "0.20.1" + "@esbuild/android-x64" "0.20.1" + "@esbuild/darwin-arm64" "0.20.1" + "@esbuild/darwin-x64" "0.20.1" + "@esbuild/freebsd-arm64" "0.20.1" + "@esbuild/freebsd-x64" "0.20.1" + "@esbuild/linux-arm" "0.20.1" + "@esbuild/linux-arm64" "0.20.1" + "@esbuild/linux-ia32" "0.20.1" + "@esbuild/linux-loong64" "0.20.1" + "@esbuild/linux-mips64el" "0.20.1" + "@esbuild/linux-ppc64" "0.20.1" + "@esbuild/linux-riscv64" "0.20.1" + "@esbuild/linux-s390x" "0.20.1" + "@esbuild/linux-x64" "0.20.1" + "@esbuild/netbsd-x64" "0.20.1" + "@esbuild/openbsd-x64" "0.20.1" + "@esbuild/sunos-x64" "0.20.1" + "@esbuild/win32-arm64" "0.20.1" + "@esbuild/win32-ia32" "0.20.1" + "@esbuild/win32-x64" "0.20.1" esbuild@^0.19.0: version "0.19.12" @@ -3311,16 +3311,16 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4 resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== -eslint@8.56.0: - version "8.56.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15" - integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ== +eslint@8.57.0: + version "8.57.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668" + integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" "@eslint/eslintrc" "^2.1.4" - "@eslint/js" "8.56.0" - "@humanwhocodes/config-array" "^0.11.13" + "@eslint/js" "8.57.0" + "@humanwhocodes/config-array" "^0.11.14" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" "@ungap/structured-clone" "^1.2.0" @@ -3510,13 +3510,6 @@ find-up@^4.0.0: locate-path "^5.0.0" path-exists "^4.0.0" -find-yarn-workspace-root@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd" - integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ== - dependencies: - micromatch "^4.0.2" - flat-cache@^3.0.4: version "3.2.0" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee" @@ -3532,9 +3525,9 @@ flat@^5.0.2: integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== flatted@^3.2.9: - version "3.2.9" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf" - integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ== + version "3.3.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a" + integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw== for-each@^0.3.3: version "0.3.3" @@ -3672,7 +3665,7 @@ get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2, get-intrinsic@ has-symbols "^1.0.3" hasown "^2.0.0" -get-symbol-description@^1.0.0: +get-symbol-description@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5" integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg== @@ -3723,17 +3716,16 @@ glob@10.3.10, glob@^10.2.2: minipass "^5.0.0 || ^6.0.2 || ^7.0.0" path-scurry "^1.10.1" -glob@7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== +glob@8.1.0, glob@^8.0.1, glob@^8.0.3: + version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.0.4" + minimatch "^5.0.1" once "^1.3.0" - path-is-absolute "^1.0.0" glob@^7.0.3, glob@^7.0.6, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.3: version "7.2.3" @@ -3747,17 +3739,6 @@ glob@^7.0.3, glob@^7.0.6, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.3: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^8.0.1, glob@^8.0.3: - version "8.1.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" - integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^5.0.1" - once "^1.3.0" - globals@^13.19.0: version "13.24.0" resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171" @@ -3797,11 +3778,11 @@ globby@^12.0.2: slash "^4.0.0" globby@^14.0.0: - version "14.0.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-14.0.0.tgz#ea9c062a3614e33f516804e778590fcf055256b9" - integrity sha512-/1WM/LNHRAOH9lZta77uGbq0dAEQM+XjNesWwhlERDVenqothRbnzTrL3/LrIoEPPjeUHC3vrS6TwoyxeHs7MQ== + version "14.0.1" + resolved "https://registry.yarnpkg.com/globby/-/globby-14.0.1.tgz#a1b44841aa7f4c6d8af2bc39951109d77301959b" + integrity sha512-jOMLD2Z7MAhyG8aJpNOpmziMOP4rPLcc95oQPKXBazW82z+CEgPFBQvEpRUa1KeIMUJo4Wsm+q6uzO/Q/4BksQ== dependencies: - "@sindresorhus/merge-streams" "^1.0.0" + "@sindresorhus/merge-streams" "^2.1.0" fast-glob "^3.3.2" ignore "^5.2.4" path-type "^5.0.0" @@ -3887,24 +3868,24 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340" - integrity sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg== +has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.1, has-property-descriptors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" + integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== dependencies: - get-intrinsic "^1.2.2" + es-define-property "^1.0.0" -has-proto@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" - integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== +has-proto@^1.0.1, has-proto@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" + integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== -has-tostringtag@^1.0.0, has-tostringtag@^1.0.1: +has-tostringtag@^1.0.0, has-tostringtag@^1.0.1, has-tostringtag@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc" integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw== @@ -3916,10 +3897,10 @@ has-unicode@^2.0.1: resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== -hasown@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c" - integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA== +hasown@^2.0.0, hasown@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.1.tgz#26f48f039de2c0f8d3356c223fb8d50253519faa" + integrity sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA== dependencies: function-bind "^1.1.2" @@ -4083,10 +4064,10 @@ http-proxy-agent@^5.0.0: agent-base "6" debug "4" -http-proxy-agent@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz#e9096c5afd071a3fce56e6252bb321583c124673" - integrity sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ== +http-proxy-agent@^7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e" + integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig== dependencies: agent-base "^7.1.0" debug "^4.3.4" @@ -4099,10 +4080,10 @@ https-proxy-agent@5.0.1, https-proxy-agent@^5.0.0: agent-base "6" debug "4" -https-proxy-agent@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz#e2645b846b90e96c6e6f347fb5b2e41f1590b09b" - integrity sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA== +https-proxy-agent@^7.0.4: + version "7.0.4" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168" + integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg== dependencies: agent-base "^7.0.2" debug "4" @@ -4213,7 +4194,7 @@ ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -internal-slot@^1.0.5: +internal-slot@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802" integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g== @@ -4239,12 +4220,15 @@ invariant@^2.2.4: dependencies: loose-envify "^1.0.0" -ip@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" - integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== +ip-address@^9.0.5: + version "9.0.5" + resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a" + integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g== + dependencies: + jsbn "1.1.0" + sprintf-js "^1.1.3" -is-array-buffer@^3.0.2, is-array-buffer@^3.0.4: +is-array-buffer@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98" integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw== @@ -4343,9 +4327,9 @@ is-lambda@^1.0.1: integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== is-negative-zero@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" - integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747" + integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw== is-number-object@^1.0.4: version "1.0.7" @@ -4419,11 +4403,11 @@ is-regex@^1.1.4: has-tostringtag "^1.0.0" is-shared-array-buffer@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" - integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688" + integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg== dependencies: - call-bind "^1.0.2" + call-bind "^1.0.7" is-string@^1.0.5, is-string@^1.0.7: version "1.0.7" @@ -4439,7 +4423,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" -is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.13, is-typed-array@^1.1.9: +is-typed-array@^1.1.13: version "1.1.13" resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229" integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw== @@ -4542,6 +4526,11 @@ js-yaml@4.1.0, js-yaml@^4.1.0: dependencies: argparse "^2.0.1" +jsbn@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040" + integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A== + json-buffer@3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" @@ -4751,10 +4740,10 @@ lie@~3.3.0: dependencies: immediate "~3.0.5" -lilconfig@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.0.0.tgz#f8067feb033b5b74dab4602a5f5029420be749bc" - integrity sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g== +lilconfig@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.1.tgz#9d8a246fa753106cfc205fd2d77042faca56e5e3" + integrity sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ== lines-and-columns@^1.1.6: version "1.2.4" @@ -4998,7 +4987,7 @@ microbuffer@^1.0.0: resolved "https://registry.yarnpkg.com/microbuffer/-/microbuffer-1.0.0.tgz#8b3832ed40c87d51f47bb234913a698a756d19d2" integrity sha512-O/SUXauVN4x6RaEJFqSPcXNtLFL+QzJHKZlyDVYFwcDDRVca3Fa/37QXXC+4zAGGa4YhHrHxKXuuHvLDIQECtA== -micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4: +micromatch@^4.0.0, micromatch@^4.0.4: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== @@ -5157,10 +5146,10 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mocha@10.2.0: - version "10.2.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.2.0.tgz#1fd4a7c32ba5ac372e03a17eef435bd00e5c68b8" - integrity sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg== +mocha@10.3.0: + version "10.3.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.3.0.tgz#0e185c49e6dccf582035c05fa91084a4ff6e3fe9" + integrity sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg== dependencies: ansi-colors "4.1.1" browser-stdout "1.3.1" @@ -5169,13 +5158,12 @@ mocha@10.2.0: diff "5.0.0" escape-string-regexp "4.0.0" find-up "5.0.0" - glob "7.2.0" + glob "8.1.0" he "1.2.0" js-yaml "4.1.0" log-symbols "4.1.0" minimatch "5.0.1" ms "2.1.3" - nanoid "3.3.3" serialize-javascript "6.0.0" strip-json-comments "3.1.1" supports-color "8.1.1" @@ -5230,11 +5218,6 @@ nan@^2.14.2: resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554" integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w== -nanoid@3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" - integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== - nanoid@^3.3.7: version "3.3.7" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" @@ -5269,9 +5252,9 @@ no-case@^3.0.4: tslib "^2.0.3" node-abi@^3.3.0: - version "3.54.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.54.0.tgz#f6386f7548817acac6434c6cba02999c9aebcc69" - integrity sha512-p7eGEiQil0YUV3ItH4/tBb781L5impVmmx2E9FRKF7d18XXzp4PGT2tdYMFY6wQqgxD0IwNZOiSJ0/K0fSi/OA== + version "3.56.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.56.0.tgz#ca807d5ff735ac6bbbd684ae3ff2debc1c2a40a7" + integrity sha512-fZjdhDOeRcaS+rcpve7XuwHBmktS1nS1gzgghwKUQQ8nTy2FdSDr6ZT8k6YhvlJeHmmQMYiT/IH9hfco5zeW2Q== dependencies: semver "^7.3.5" @@ -5395,7 +5378,7 @@ object-keys@^1.1.1: resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -object.assign@^4.1.4: +object.assign@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ== @@ -5733,7 +5716,7 @@ playwright-core@1.41.2: resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.41.2.tgz#db22372c708926c697acc261f0ef8406606802d9" integrity sha512-VaTvwCA4Y8kxEe+kfm2+uUUw5Lubf38RxF7FpBxLPmGe5sdNkSg5e3ChEigaGrX7qdqT3pt2m/98LiyvU2x6CA== -playwright@^1.41.1: +playwright@^1.41.2: version "1.41.2" resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.41.2.tgz#4e760b1c79f33d9129a8c65cc27953be6dd35042" integrity sha512-v0bOa6H2GJChDL8pAeLa/LZC4feoAMbSQm1/jF/ySsWWoaNItvrMP7GEkvEEFyCTUYKMxjQKaTSg5up7nR6/8A== @@ -5749,6 +5732,11 @@ plimit-lit@^1.2.6: dependencies: queue-lit "^1.5.1" +possible-typed-array-names@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" + integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q== + postcss-calc@^9.0.1: version "9.0.1" resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-9.0.1.tgz#a744fd592438a93d6de0f1434c572670361eb6c6" @@ -5757,22 +5745,22 @@ postcss-calc@^9.0.1: postcss-selector-parser "^6.0.11" postcss-value-parser "^4.2.0" -postcss-colormin@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-6.0.2.tgz#2af9ce753937b08e058dbc6879e4aedfab42806b" - integrity sha512-TXKOxs9LWcdYo5cgmcSHPkyrLAh86hX1ijmyy6J8SbOhyv6ua053M3ZAM/0j44UsnQNIWdl8gb5L7xX2htKeLw== +postcss-colormin@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-6.0.3.tgz#d33f444299e490e8b0914bd347ca8010983e935c" + integrity sha512-ECpkS+UZRyAtu/kjive2/1mihP+GNtgC8kcdU8ueWZi1ZVxMNnRziCLdhrWECJhEtSWijfX2Cl9XTTCK/hjGaA== dependencies: - browserslist "^4.22.2" + browserslist "^4.23.0" caniuse-api "^3.0.0" - colord "^2.9.1" + colord "^2.9.3" postcss-value-parser "^4.2.0" -postcss-convert-values@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-6.0.2.tgz#c4a7509aeb1cc7ac3f6948fcbffc2bf8cac7c56a" - integrity sha512-aeBmaTnGQ+NUSVQT8aY0sKyAD/BaLJenEKZ03YK0JnDE1w1Rr8XShoxdal2V2H26xTJKr3v5haByOhJuyT4UYw== +postcss-convert-values@^6.0.4: + version "6.0.4" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-6.0.4.tgz#1f4cc51197f0f8bd85d6b5df4206df470f3a3df0" + integrity sha512-YT2yrGzPXoQD3YeA2kBo/696qNwn7vI+15AOS2puXWEvSWqdCqlOyDWRy5GNnOc9ACRGOkuQ4ESQEqPJBWt/GA== dependencies: - browserslist "^4.22.2" + browserslist "^4.23.0" postcss-value-parser "^4.2.0" postcss-discard-comments@^6.0.1: @@ -5780,76 +5768,76 @@ postcss-discard-comments@^6.0.1: resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-6.0.1.tgz#46176212bd9c3e5f48aa4b8b4868786726c41d36" integrity sha512-f1KYNPtqYLUeZGCHQPKzzFtsHaRuECe6jLakf/RjSRqvF5XHLZnM2+fXLhb8Qh/HBFHs3M4cSLb1k3B899RYIg== -postcss-discard-duplicates@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.1.tgz#112b1a95948e69b3484fdd43584dda6930977939" - integrity sha512-1hvUs76HLYR8zkScbwyJ8oJEugfPV+WchpnA+26fpJ7Smzs51CzGBHC32RS03psuX/2l0l0UKh2StzNxOrKCYg== +postcss-discard-duplicates@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.2.tgz#11f389e6af55099b928dca34b10734360b34bc93" + integrity sha512-U2rsj4w6pAGROCCcD13LP2eBIi1whUsXs4kgE6xkIuGfkbxCBSKhkCTWyowFd66WdVlLv0uM1euJKIgmdmZObg== -postcss-discard-empty@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-6.0.1.tgz#b34cb45ec891246da4506b53e352390fdef126c4" - integrity sha512-yitcmKwmVWtNsrrRqGJ7/C0YRy53i0mjexBDQ9zYxDwTWVBgbU4+C9jIZLmQlTDT9zhml+u0OMFJh8+31krmOg== +postcss-discard-empty@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-6.0.2.tgz#9c4ca61f949dede0f7a1dfe3959e1003d0454500" + integrity sha512-rj6pVC2dVCJrP0Y2RkYTQEbYaCf4HEm+R/2StQgJqGHxAa3+KcYslNQhcRqjLHtl/4wpzipJluaJLqBj6d5eDQ== postcss-discard-overridden@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-6.0.1.tgz#c63c559237758d74bc505452393a64dda9b19ef4" integrity sha512-qs0ehZMMZpSESbRkw1+inkf51kak6OOzNRaoLd/U7Fatp0aN2HQ1rxGOrJvYcRAN9VpX8kUF13R2ofn8OlvFVA== -postcss-discard-unused@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-6.0.2.tgz#9741fc4f2f0a1ae21f3a93de4a10ddb5a5c870d0" - integrity sha512-wr3lRPahxARmjow5BWML+9bD9D1u6FpfxlWg4lZqCIwvQLBZQD/S0Rq6A/juQwVFVXvMeRGa9TX1vpXuQ6FhTQ== +postcss-discard-unused@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-6.0.3.tgz#e21de9bc3c0291b9f5a3883667e6f8c09cca5318" + integrity sha512-f0m/zO6BONjcZmp2VQe5CwCQvrcm89DJxYhOgV/nXbMY59j/gxyyx/utMJ18SKSRzutaQd66o+0cj0/yGfNenA== dependencies: postcss-selector-parser "^6.0.15" -postcss-merge-idents@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-6.0.1.tgz#b2d3bb45ba7131cbb3952389b46fad2f8cf6a422" - integrity sha512-ApqNUkzl3MJP+43DIIvoer98t7tcDVAcnLeAKjuTIM7HkMk8NXB6eqscMIjwQISwoSeE0WrEyIqVy+HoHAVcZw== +postcss-merge-idents@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-6.0.2.tgz#c7c06e8105f0a6ac5c644364a2867b27775e272f" + integrity sha512-1fJqEzpgyjuec8UR9WdUDvCU0NhHVwKm4JK2Vk2Xv7RB+zpssSGFNE5Xwa0fmQYFxAwfb824monvKAyqLTGsSw== dependencies: cssnano-utils "^4.0.1" postcss-value-parser "^4.2.0" -postcss-merge-longhand@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-6.0.2.tgz#cd4e83014851da59545e9a906b245615550f4064" - integrity sha512-+yfVB7gEM8SrCo9w2lCApKIEzrTKl5yS1F4yGhV3kSim6JzbfLGJyhR1B6X+6vOT0U33Mgx7iv4X9MVWuaSAfw== +postcss-merge-longhand@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-6.0.3.tgz#862ec759face52b7b33e6a6ee72b1d7dbdee0268" + integrity sha512-kF/y3DU8CRt+SX3tP/aG+2gkZI2Z7OXDsPU7FgxIJmuyhQQ1EHceIYcsp/alvzCm2P4c37Sfdu8nNrHc+YeyLg== dependencies: postcss-value-parser "^4.2.0" - stylehacks "^6.0.2" + stylehacks "^6.0.3" -postcss-merge-rules@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-6.0.3.tgz#08fcf714faaad75b1980ecd961b080ae2f8ddeb3" - integrity sha512-yfkDqSHGohy8sGYIJwBmIGDv4K4/WrJPX355XrxQb/CSsT4Kc/RxDi6akqn5s9bap85AWgv21ArcUWwWdGNSHA== +postcss-merge-rules@^6.0.4: + version "6.0.4" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-6.0.4.tgz#a4ac3ed63502428d846f8b71b2c880dba58c78f1" + integrity sha512-97iF3UJ5v8N1BWy38y+0l+Z8o5/9uGlEgtWic2PJPzoRrLB6Gxg8TVG93O0EK52jcLeMsywre26AUlX1YAYeHA== dependencies: - browserslist "^4.22.2" + browserslist "^4.23.0" caniuse-api "^3.0.0" cssnano-utils "^4.0.1" postcss-selector-parser "^6.0.15" -postcss-minify-font-values@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-6.0.1.tgz#788eb930168be90225f3937f0b70aa19d8b532b2" - integrity sha512-tIwmF1zUPoN6xOtA/2FgVk1ZKrLcCvE0dpZLtzyyte0j9zUeB8RTbCqrHZGjJlxOvNWKMYtunLrrl7HPOiR46w== +postcss-minify-font-values@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-6.0.2.tgz#fbaad399635ed9fd21078114b5c1109d43a714ed" + integrity sha512-IedzbVMoX0a7VZWjSYr5qJ6C37rws8kl8diPBeMZLJfWKkgXuMFY5R/OxPegn/q9tK9ztd0XRH3aR0u2t+A7uQ== dependencies: postcss-value-parser "^4.2.0" -postcss-minify-gradients@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-6.0.1.tgz#4faf1880b483dc37016658aa186b42194ff9b5bc" - integrity sha512-M1RJWVjd6IOLPl1hYiOd5HQHgpp6cvJVLrieQYS9y07Yo8itAr6jaekzJphaJFR0tcg4kRewCk3kna9uHBxn/w== +postcss-minify-gradients@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-6.0.2.tgz#9efc9e3cf026ca2b4d33bce70a167b8416315868" + integrity sha512-vP5mF7iI6/5fcpv+rSfwWQekOE+8I1i7/7RjZPGuIjj6eUaZVeG4XZYZrroFuw1WQd51u2V32wyQFZ+oYdE7CA== dependencies: - colord "^2.9.1" + colord "^2.9.3" cssnano-utils "^4.0.1" postcss-value-parser "^4.2.0" -postcss-minify-params@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-6.0.2.tgz#bd64af642fa5610281b8a9461598bbb91f92ae05" - integrity sha512-zwQtbrPEBDj+ApELZ6QylLf2/c5zmASoOuA4DzolyVGdV38iR2I5QRMsZcHkcdkZzxpN8RS4cN7LPskOkTwTZw== +postcss-minify-params@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-6.0.3.tgz#c7e10f924350ae4a3d9698e4d56cc2ec02d65689" + integrity sha512-j4S74d3AAeCK5eGdQndXSrkxusV2ekOxbXGnlnZthMyZBBvSDiU34CihTASbJxuVB3bugudmwolS7+Dgs5OyOQ== dependencies: - browserslist "^4.22.2" + browserslist "^4.23.0" cssnano-utils "^4.0.1" postcss-value-parser "^4.2.0" @@ -5928,12 +5916,12 @@ postcss-normalize-timing-functions@^6.0.1: dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-unicode@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.2.tgz#361026744ff11baebaec771b60c2a5f36f274fd0" - integrity sha512-Ff2VdAYCTGyMUwpevTZPZ4w0+mPjbZzLLyoLh/RMpqUqeQKZ+xMm31hkxBavDcGKcxm6ACzGk0nBfZ8LZkStKA== +postcss-normalize-unicode@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.3.tgz#86ca57e765d841ecc0c1c4f2a86182e728bbcf20" + integrity sha512-T2Bb3gXz0ASgc3ori2dzjv6j/P2IantreaC6fT8tWjqYUiqMAh5jGIkdPwEV2FaucjQlCLeFJDJh2BeSugE1ig== dependencies: - browserslist "^4.22.2" + browserslist "^4.23.0" postcss-value-parser "^4.2.0" postcss-normalize-url@^6.0.1: @@ -5965,12 +5953,12 @@ postcss-reduce-idents@^6.0.2: dependencies: postcss-value-parser "^4.2.0" -postcss-reduce-initial@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-6.0.2.tgz#763d25902406c872264041df69f182eb15a5d9be" - integrity sha512-YGKalhNlCLcjcLvjU5nF8FyeCTkCO5UtvJEt0hrPZVCTtRLSOH4z00T1UntQPj4dUmIYZgMj8qK77JbSX95hSw== +postcss-reduce-initial@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-6.0.3.tgz#112b039079ca96faeb0c5bbd8bfab6cf38e8177d" + integrity sha512-w4QIR9pEa1N4xMx3k30T1vLZl6udVK2RmNqrDXhBXX9L0mBj2a8ADs8zkbaEH7eUy1m30Wyr5EBgHN31Yq1JvA== dependencies: - browserslist "^4.22.2" + browserslist "^4.23.0" caniuse-api "^3.0.0" postcss-reduce-transforms@^6.0.1: @@ -6362,14 +6350,15 @@ regenerator-runtime@^0.14.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== -regexp.prototype.flags@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e" - integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg== +regexp.prototype.flags@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334" + integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - set-function-name "^2.0.0" + call-bind "^1.0.6" + define-properties "^1.2.1" + es-errors "^1.3.0" + set-function-name "^2.0.1" relateurl@^0.2.7: version "0.2.7" @@ -6432,7 +6421,7 @@ resolve-pkg-maps@^1.0.0: resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f" integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw== -resolve@^1.20.0, resolve@^1.22.4, resolve@^1.22.6, resolve@^1.3.3: +resolve@^1.20.0, resolve@^1.22.4, resolve@^1.22.8, resolve@^1.3.3: version "1.22.8" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== @@ -6477,14 +6466,14 @@ rw@1: resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ== -rxjs@^7.4.0, rxjs@^7.8.1: +rxjs@^7.8.1: version "7.8.1" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== dependencies: tslib "^2.1.0" -safe-array-concat@^1.0.1: +safe-array-concat@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.0.tgz#8d0cae9cb806d6d1c06e08ab13d847293ebe0692" integrity sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg== @@ -6504,7 +6493,7 @@ safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-regex-test@^1.0.0: +safe-regex-test@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377" integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw== @@ -6518,126 +6507,17 @@ safe-regex-test@^1.0.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sass-embedded-android-arm64@1.70.0: - version "1.70.0" - resolved "https://registry.yarnpkg.com/sass-embedded-android-arm64/-/sass-embedded-android-arm64-1.70.0.tgz#3bdc0591239a0c4c45313e949883a87bb37e07a2" - integrity sha512-vMr7fruLUv/VvF7CPVF1z7Bc28a8K9Ps5nyN3UatOj+irxN1LbZIbeQua6neX2eFUsXvcg7hLZwvV3+T96Fhrw== - -sass-embedded-android-arm@1.70.0: - version "1.70.0" - resolved "https://registry.yarnpkg.com/sass-embedded-android-arm/-/sass-embedded-android-arm-1.70.0.tgz#e003444e41e1ac2f85cbaa662a7e39df510286e6" - integrity sha512-Vog4Z+tsDYGv7m9sZisr/P6KvqDioCMu0cinexdnXhHXReo+X6CFe79yv/zA/Xfq5HtAAmFjGD6CO/nTjoydtw== - -sass-embedded-android-ia32@1.70.0: - version "1.70.0" - resolved "https://registry.yarnpkg.com/sass-embedded-android-ia32/-/sass-embedded-android-ia32-1.70.0.tgz#3051a973b902be3ec66a2b24549273e23484b08f" - integrity sha512-RWEJ7sBGBCd101oSBPuePPU8yXb1iB/ME4sRhgI5xjjyIsldiuvX48saW25u1ZqCo2AVA0BTXfWpNJnhKB3b4Q== - -sass-embedded-android-x64@1.70.0: - version "1.70.0" - resolved "https://registry.yarnpkg.com/sass-embedded-android-x64/-/sass-embedded-android-x64-1.70.0.tgz#86f4e7d1c91d35443cb9c06566e9a61efb4cf6e1" - integrity sha512-u+ijV6AQR/84kjjGb3mp0aibPiXkFKqfmHxqYBMN7h2xV7EM70Yz054nVifaBr8nfC0E8aT/DurSI4nkkQ6Uvg== - -sass-embedded-darwin-arm64@1.70.0: - version "1.70.0" - resolved "https://registry.yarnpkg.com/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.70.0.tgz#6fca5c9925e70b85ae2008b5cb9d5359c7f0b80d" - integrity sha512-qMs08h0nwRA1B/Ieakcg/Y6lcCEnuBnPTNEkFkBlnfj3PFVPTb50wQvDr9JLpcjXWznlBxyFrz1nZM+pXDix7Q== - -sass-embedded-darwin-x64@1.70.0: - version "1.70.0" - resolved "https://registry.yarnpkg.com/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.70.0.tgz#c618be025ddc47515f4cb7e25c71ac1cb21551c2" - integrity sha512-Vf8UQY3IBmsaz9L5DeJDjn19N//1n3rTquH69x29zPCd3zF2gnay38atxIZ+6h7VsZT3C6evm0y58JUJDWN1CA== - -sass-embedded-linux-arm64@1.70.0: - version "1.70.0" - resolved "https://registry.yarnpkg.com/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.70.0.tgz#24ca8d8ed74611cb9f9efbf76ecd65908387a99e" - integrity sha512-PzhBg5xlyXcZ8FgyjqAcVtfaq462l3KeEid2OxrsOzBQgdgJb0La1tAEOpP9jz7YOOTr9A96vm609W9fRLI2Iw== - -sass-embedded-linux-arm@1.70.0: - version "1.70.0" - resolved "https://registry.yarnpkg.com/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.70.0.tgz#017085c42a2060e36f629c22f9daaa5491dd866f" - integrity sha512-U9e+k0XHwubeSIwsBYTNrTVH+0zF/ErSfuHfgTfuvlcKlhoGtFgAb7W8Qfe9FDF6TYTt0fJAJhSV2MdoExsgRA== - -sass-embedded-linux-ia32@1.70.0: - version "1.70.0" - resolved "https://registry.yarnpkg.com/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.70.0.tgz#cf6bc32beda3c8fc8c6886fb1b796de925c5f201" - integrity sha512-UOxTJywQRC/HzFQthlyNWJ07MX8EzKuTgH0N5T3XyXQTNuGeJQ8EPWY9fv1weLCjydVOEwm853F3djtUNmkCtg== - -sass-embedded-linux-musl-arm64@1.70.0: - version "1.70.0" - resolved "https://registry.yarnpkg.com/sass-embedded-linux-musl-arm64/-/sass-embedded-linux-musl-arm64-1.70.0.tgz#cc81f56d2e14cdf412133a5ae2ed9d62f5b1dcac" - integrity sha512-DJl1AV9W7T3SHzXFqAtyjPZy4O2g4AC6QctY5/aM42DTY/xpWOmwUBgsDzDoRbNqP7qDl+GtHLlggrLWCBP9fg== - -sass-embedded-linux-musl-arm@1.70.0: - version "1.70.0" - resolved "https://registry.yarnpkg.com/sass-embedded-linux-musl-arm/-/sass-embedded-linux-musl-arm-1.70.0.tgz#4e22f7dc127b6920a784b0acb9a59efb465f1d1f" - integrity sha512-8zudDFpAoNrQDujNYBKkq8nwl4i0jMmXcysO9Ou0llrzdY7Keok2z1aS3IbZy7AvUXtGaeYSHUi5lXdOalJ/QQ== - -sass-embedded-linux-musl-ia32@1.70.0: - version "1.70.0" - resolved "https://registry.yarnpkg.com/sass-embedded-linux-musl-ia32/-/sass-embedded-linux-musl-ia32-1.70.0.tgz#c0a7278d542870a8114134b9bd1829d6fd16828e" - integrity sha512-CcAvT3KPc7cCJfTu1E0HzsAjE/dPQsKaXQD/nsBXNZo081R+lLR2u22wpXM2pnzMNJETRV/pDwozHoYEcPkPqQ== - -sass-embedded-linux-musl-x64@1.70.0: - version "1.70.0" - resolved "https://registry.yarnpkg.com/sass-embedded-linux-musl-x64/-/sass-embedded-linux-musl-x64-1.70.0.tgz#5c0710733cf98b309e72f82b6b17bf53f3c9b230" - integrity sha512-g3i9PKmqTxuyrM1Yeju1s4Fj6fzAGyyfzw/LiZZtq0ZZGhJXJMVvEDog/OxQ37eYxWqq9XHFTW2PphMvukVK0g== - -sass-embedded-linux-x64@1.70.0: - version "1.70.0" - resolved "https://registry.yarnpkg.com/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.70.0.tgz#1ceae4677f7dc9052727d08aa6f54dee2cf6c0b2" - integrity sha512-F9F2CA7C6z/ROfF0U/jtYWknbDe9S/TJoCJ5TlHafwS+SrZE1A+Czf2MWJ+8mc2NFiRjYzYxt4Ad29cuc6rrhw== - -sass-embedded-win32-ia32@1.70.0: - version "1.70.0" - resolved "https://registry.yarnpkg.com/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.70.0.tgz#b67e4a66548deca91eb75a9c467d40b1ad080e95" - integrity sha512-TITx2QwJouhMwA0CAjCmnTNeCDL9g2fkLe9z+5rf39OdmcX9CEBrY4CNaO5REnMpgoa+o82u272ZR3oWrsUs8Q== - -sass-embedded-win32-x64@1.70.0: - version "1.70.0" - resolved "https://registry.yarnpkg.com/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.70.0.tgz#5a07423cf1370c302e6d44105358f6591b675b1e" - integrity sha512-rPe8WUdARhlfgIhGcCTGbTNgd6OppcmjtBrxUNoGs3AENSREQCpaNv5d+HBOMhGUfYgXIHUSiipilFUhLWpsrQ== - -sass-embedded@^1.70.0: - version "1.70.0" - resolved "https://registry.yarnpkg.com/sass-embedded/-/sass-embedded-1.70.0.tgz#558f5e9776c6e4b91d9859a4dd325ac7c2b91391" - integrity sha512-1sVSh5MlSdktkwC2zG9WuaVR6j7AlDxadPmZBN0wP4GhznMQTvpwNIAFhAqgjwJYhwdWFOKEdIHSQK4V8K434Q== - dependencies: - "@bufbuild/protobuf" "^1.0.0" - buffer-builder "^0.2.0" - immutable "^4.0.0" - rxjs "^7.4.0" - supports-color "^8.1.1" - varint "^6.0.0" - optionalDependencies: - sass-embedded-android-arm "1.70.0" - sass-embedded-android-arm64 "1.70.0" - sass-embedded-android-ia32 "1.70.0" - sass-embedded-android-x64 "1.70.0" - sass-embedded-darwin-arm64 "1.70.0" - sass-embedded-darwin-x64 "1.70.0" - sass-embedded-linux-arm "1.70.0" - sass-embedded-linux-arm64 "1.70.0" - sass-embedded-linux-ia32 "1.70.0" - sass-embedded-linux-musl-arm "1.70.0" - sass-embedded-linux-musl-arm64 "1.70.0" - sass-embedded-linux-musl-ia32 "1.70.0" - sass-embedded-linux-musl-x64 "1.70.0" - sass-embedded-linux-x64 "1.70.0" - sass-embedded-win32-ia32 "1.70.0" - sass-embedded-win32-x64 "1.70.0" - -sass-loader@14.1.0: - version "14.1.0" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-14.1.0.tgz#43ba90e0cd8a15a1e932e818c525b0115a0ce8a3" - integrity sha512-LS2mLeFWA+orYxHNu+O18Xe4jR0kyamNOOUsE3NyBP4DvIL+8stHpNX0arYTItdPe80kluIiJ7Wfe/9iHSRO0Q== +sass-loader@14.1.1: + version "14.1.1" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-14.1.1.tgz#2c9d2277c5b1c5fe789cd0570c046d8ad23cb7ca" + integrity sha512-QX8AasDg75monlybel38BZ49JP5Z+uSKfKwF2rO7S74BywaRmGQMUBw9dtkS+ekyM/QnP+NOrRYq8ABMZ9G8jw== dependencies: neo-async "^2.6.2" -sass@1.70.0: - version "1.70.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.70.0.tgz#761197419d97b5358cb25f9dd38c176a8a270a75" - integrity sha512-uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ== +sass@1.71.1, sass@^1.71.1: + version "1.71.1" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.71.1.tgz#dfb09c63ce63f89353777bbd4a88c0a38386ee54" + integrity sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -6734,7 +6614,7 @@ set-blocking@^2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== -set-function-length@^1.2.0: +set-function-length@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.1.tgz#47cc5945f2c771e2cf261c6737cf9684a2a5e425" integrity sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g== @@ -6746,14 +6626,15 @@ set-function-length@^1.2.0: gopd "^1.0.1" has-property-descriptors "^1.0.1" -set-function-name@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a" - integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA== +set-function-name@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985" + integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ== dependencies: - define-data-property "^1.0.1" + define-data-property "^1.1.4" + es-errors "^1.3.0" functions-have-names "^1.2.3" - has-property-descriptors "^1.0.0" + has-property-descriptors "^1.0.2" setimmediate@^1.0.5: version "1.0.5" @@ -6906,11 +6787,11 @@ socks-proxy-agent@^7.0.0: socks "^2.6.2" socks@^2.6.2: - version "2.7.1" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" - integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== + version "2.8.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.1.tgz#22c7d9dd7882649043cba0eafb49ae144e3457af" + integrity sha512-B6w7tkwNid7ToxjZ08rQMT8M9BJAf8DKx8Ft4NivzH0zBUfd6jldGcisJn/RLgxcX3FPNDdNQCUEMMT79b+oCQ== dependencies: - ip "^2.0.0" + ip-address "^9.0.5" smart-buffer "^4.2.0" sortablejs@1.15.0: @@ -6969,9 +6850,9 @@ spdx-correct@^3.0.0, spdx-correct@^3.1.1: spdx-license-ids "^3.0.0" spdx-exceptions@^2.1.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.4.0.tgz#c07a4ede25b16e4f78e6707bbd84b15a45c19c1b" - integrity sha512-hcjppoJ68fhxA/cjbN4T8N6uCUejN8yFw69ttpqtBeCbF3u13n7mb31NB9jKwGTTWWnt9IbRA/mf1FprYS8wfw== + version "2.5.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz#5d607d27fc806f66d7b64a766650fa890f04ed66" + integrity sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w== spdx-expression-parse@^3.0.0, spdx-expression-parse@^3.0.1: version "3.0.1" @@ -7000,6 +6881,11 @@ spdx-satisfies@^5.0.1: spdx-expression-parse "^3.0.0" spdx-ranges "^2.0.0" +sprintf-js@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a" + integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA== + ssri@^9.0.0: version "9.0.1" resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057" @@ -7023,9 +6909,9 @@ stream-shift@^1.0.0: integrity sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ== streamx@^2.13.0, streamx@^2.15.0: - version "2.15.8" - resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.8.tgz#5471145b54ee43b5088877023d8d0a2a77f95d8d" - integrity sha512-6pwMeMY/SuISiRsuS8TeIrAzyFbG5gGPHFQsYjUr/pbBadaL1PCWmzKw+CHZSwainfvcF6Si6cVLq4XTEwswFQ== + version "2.16.1" + resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.16.1.tgz#2b311bd34832f08aa6bb4d6a80297c9caef89614" + integrity sha512-m9QYj6WygWyWa3H1YY69amr4nVgy61xfjys7xO7kviL5rfIEc2naf+ewFiOA+aEJD7y0JO3h2GoiUv4TDwEGzQ== dependencies: fast-fifo "^1.1.0" queue-tick "^1.0.1" @@ -7127,12 +7013,12 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== -stylehacks@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-6.0.2.tgz#5bf2654561752547d4548765f35c9a49659b3742" - integrity sha512-00zvJGnCu64EpMjX8b5iCZ3us2Ptyw8+toEkb92VdmkEaRaSGBNKAoK6aWZckhXxmQP8zWiTaFaiMGIU8Ve8sg== +stylehacks@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-6.0.3.tgz#3cb7d4ceae5f310b9d211fd49bfda18984e89b9f" + integrity sha512-KzBqjnqktc8/I0ERCb+lGq06giF/JxDbw2r9kEVhen9noHeIDRtMWUp9r62sOk+/2bbX6sFG1GhsS7ToXG0PEg== dependencies: - browserslist "^4.22.2" + browserslist "^4.23.0" postcss-selector-parser "^6.0.15" supports-color@8.1.1, supports-color@^8.0.0, supports-color@^8.1.1: @@ -7231,7 +7117,7 @@ tar-fs@^2.0.0: pump "^3.0.0" tar-stream "^2.1.4" -tar-fs@^3.0.4: +tar-fs@^3.0.4, tar-fs@^3.0.5: version "3.0.5" resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.0.5.tgz#f954d77767e4e6edf973384e1eb95f8f81d64ed9" integrity sha512-JOgGAmZyMgbqpLwct7ZV8VzkEB6pxXFBVErLtb+XCOqzc6w1xiWKI9GVd6bwk68EX7eJ4DWmfXVmq8K2ziZTGg== @@ -7286,9 +7172,9 @@ terser-webpack-plugin@5.3.10, terser-webpack-plugin@^5.3.10: terser "^5.26.0" terser@^5.10.0, terser@^5.15.1, terser@^5.26.0: - version "5.27.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.27.0.tgz#70108689d9ab25fef61c4e93e808e9fd092bf20c" - integrity sha512-bi1HRwVRskAjheeYl291n3JC4GgO/Ty4z1nVs5AAsmonJulGxpSektecnNedrwK9C7vpvVtcX3cw00VSLt7U2A== + version "5.28.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.28.1.tgz#bf00f7537fd3a798c352c2d67d67d65c915d1b28" + integrity sha512-wM+bZp54v/E9eRRGXb5ZFDvinrJIOaTapx3WUokyVGZu5ucVCK55zEgGd5Dl2fSr3jUo5sDiERErUWLY6QPFyA== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -7472,44 +7358,49 @@ type-is@^1.6.16: media-typer "0.3.0" mime-types "~2.1.24" -typed-array-buffer@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.1.tgz#0608ffe6bca71bf15a45bff0ca2604107a1325f5" - integrity sha512-RSqu1UEuSlrBhHTWC8O9FnPjOduNs4M7rJ4pRKoEjtx1zUNOPN2sSXHLDX+Y2WPbHIxbvg4JFo2DNAEfPIKWoQ== +typed-array-buffer@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3" + integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ== dependencies: - call-bind "^1.0.6" + call-bind "^1.0.7" es-errors "^1.3.0" is-typed-array "^1.1.13" typed-array-byte-length@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0" - integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA== + version "1.0.1" + resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67" + integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw== dependencies: - call-bind "^1.0.2" + call-bind "^1.0.7" for-each "^0.3.3" - has-proto "^1.0.1" - is-typed-array "^1.1.10" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" typed-array-byte-offset@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b" - integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg== + version "1.0.2" + resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063" + integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA== dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" for-each "^0.3.3" - has-proto "^1.0.1" - is-typed-array "^1.1.10" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" typed-array-length@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" - integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng== + version "1.0.5" + resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.5.tgz#57d44da160296d8663fd63180a1802ebf25905d5" + integrity sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA== dependencies: - call-bind "^1.0.2" + call-bind "^1.0.7" for-each "^0.3.3" - is-typed-array "^1.1.9" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" + possible-typed-array-names "^1.0.0" typed-rest-client@^1.8.4: version "1.8.11" @@ -7648,11 +7539,6 @@ validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -varint@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/varint/-/varint-6.0.0.tgz#9881eb0ce8feaea6512439d19ddf84bf551661d0" - integrity sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg== - vary@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" @@ -7760,10 +7646,10 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@5.90.1, webpack@^5: - version "5.90.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.90.1.tgz#62ab0c097d7cbe83d32523dbfbb645cdb7c3c01c" - integrity sha512-SstPdlAC5IvgFnhiRok8hqJo/+ArAbNv7rhU4fnWGHNVfN59HSQFaxZDSAL3IFG2YmqxuRs+IU33milSxbPlog== +webpack@5.90.3, webpack@^5: + version "5.90.3" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.90.3.tgz#37b8f74d3ded061ba789bb22b31e82eed75bd9ac" + integrity sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.5" @@ -7809,7 +7695,7 @@ which-boxed-primitive@^1.0.2: is-string "^1.0.5" is-symbol "^1.0.3" -which-typed-array@^1.1.13, which-typed-array@^1.1.14: +which-typed-array@^1.1.14: version "1.1.14" resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.14.tgz#1f78a111aee1e131ca66164d8bdc3ab062c95a06" integrity sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg== From fc1bc1e0a5e7ff3c7ffbf9c01cd6b4b2bdede481 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sun, 25 Feb 2024 11:45:29 -0500 Subject: [PATCH 0538/1012] Updates dependencies --- ThirdPartyNotices.txt | 14 +- package.json | 14 +- yarn.lock | 288 ++++++++++++++++++++---------------------- 3 files changed, 150 insertions(+), 166 deletions(-) diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index 0c7bff7c7da92..5c94c22d4fc4f 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -5,18 +5,18 @@ This project incorporates components from the projects listed below. 1. @lit/react version 1.0.2 (https://github.com/lit/lit) 2. @microsoft/fast-element version 1.12.0 (https://github.com/Microsoft/fast) -3. @octokit/graphql version 7.0.2 (https://github.com/octokit/graphql.js) -4. @octokit/request version 8.1.6 (https://github.com/octokit/request.js) +3. @octokit/graphql version 8.0.0 (https://github.com/octokit/graphql.js) +4. @octokit/request version 9.0.0 (https://github.com/octokit/request.js) 5. @opentelemetry/api version 1.7.0 (https://github.com/open-telemetry/opentelemetry-js) -6. @opentelemetry/exporter-trace-otlp-http version 0.45.1 (https://github.com/open-telemetry/opentelemetry-js) -7. @opentelemetry/sdk-trace-base version 1.18.1 (https://github.com/open-telemetry/opentelemetry-js) +6. @opentelemetry/exporter-trace-otlp-http version 0.48.0 (https://github.com/open-telemetry/opentelemetry-js) +7. @opentelemetry/sdk-trace-base version 1.21.0 (https://github.com/open-telemetry/opentelemetry-js) 8. @vscode/codicons version 0.0.35 (https://github.com/microsoft/vscode-codicons) -9. @vscode/webview-ui-toolkit version 1.2.2 (https://github.com/microsoft/vscode-webview-ui-toolkit) +9. @vscode/webview-ui-toolkit version 1.4.0 (https://github.com/microsoft/vscode-webview-ui-toolkit) 10. ansi-regex version 6.0.1 (https://github.com/chalk/ansi-regex) -11. billboard.js version 3.10.3 (https://github.com/naver/billboard.js) +11. billboard.js version 3.11.2 (https://github.com/naver/billboard.js) 12. https-proxy-agent version 5.0.1 (https://github.com/TooTallNate/node-https-proxy-agent) 13. iconv-lite version 0.6.3 (https://github.com/ashtuchkin/iconv-lite) -14. lit version 3.1.1 (https://github.com/lit/lit) +14. lit version 3.1.2 (https://github.com/lit/lit) 15. microsoft/vscode (https://github.com/microsoft/vscode) 16. node-fetch version 2.7.0 (https://github.com/bitinn/node-fetch) 17. os-browserify version 0.3.0 (https://github.com/CoderPuppy/os-browserify) diff --git a/package.json b/package.json index d2a9173b4d058..13689301bb05c 100644 --- a/package.json +++ b/package.json @@ -16545,18 +16545,18 @@ "@gitkraken/shared-web-components": "0.1.1-rc.15", "@lit/react": "1.0.2", "@microsoft/fast-element": "1.12.0", - "@octokit/graphql": "7.0.2", - "@octokit/request": "8.1.6", + "@octokit/graphql": "8.0.0", + "@octokit/request": "9.0.0", "@opentelemetry/api": "1.7.0", - "@opentelemetry/exporter-trace-otlp-http": "0.45.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/exporter-trace-otlp-http": "0.48.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "@vscode/codicons": "0.0.35", - "@vscode/webview-ui-toolkit": "1.2.2", + "@vscode/webview-ui-toolkit": "1.4.0", "ansi-regex": "6.0.1", - "billboard.js": "3.10.3", + "billboard.js": "3.11.2", "https-proxy-agent": "5.0.1", "iconv-lite": "0.6.3", - "lit": "3.1.1", + "lit": "3.1.2", "node-fetch": "2.7.0", "os-browserify": "0.3.0", "path-browserify": "1.0.1", diff --git a/yarn.lock b/yarn.lock index 99995bb7b5f03..25116cfe60968 100644 --- a/yarn.lock +++ b/yarn.lock @@ -505,19 +505,19 @@ resolved "https://registry.yarnpkg.com/@lit/react/-/react-1.0.2.tgz#4951ff1590d69aad912d0a950b3518d19eb7e220" integrity sha512-UJ5TQ46DPcJDIzyjbwbj6Iye0XcpCxL2yb03zcWq1BpWchpXS3Z0BPVhg7zDfZLF6JemPml8u/gt/+KwJ/23sg== -"@lit/reactive-element@^2.0.0", "@lit/reactive-element@^2.0.4": +"@lit/reactive-element@^2.0.4": version "2.0.4" resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-2.0.4.tgz#8f2ed950a848016383894a26180ff06c56ae001b" integrity sha512-GFn91inaUa2oHLak8awSIigYz0cU0Payr1rcFsrkf5OJ5eSPxElyZfKh0f2p9FsTiZWXQdWGJeXZICEfXXYSXQ== dependencies: "@lit-labs/ssr-dom-shim" "^1.2.0" -"@microsoft/fast-element@1.12.0", "@microsoft/fast-element@^1.12.0", "@microsoft/fast-element@^1.6.2", "@microsoft/fast-element@^1.9.0": +"@microsoft/fast-element@1.12.0", "@microsoft/fast-element@^1.12.0": version "1.12.0" resolved "https://registry.yarnpkg.com/@microsoft/fast-element/-/fast-element-1.12.0.tgz#aabfc75518c3a9000710cce5f66dfc677de8c254" integrity sha512-gQutuDHPKNxUEcQ4pypZT4Wmrbapus+P9s3bR/SEOLsMbNqNoXigGImITygI5zhb+aA5rzflM6O8YWkmRbGkPA== -"@microsoft/fast-foundation@^2.38.0", "@microsoft/fast-foundation@^2.41.1": +"@microsoft/fast-foundation@^2.49.4", "@microsoft/fast-foundation@^2.49.5": version "2.49.5" resolved "https://registry.yarnpkg.com/@microsoft/fast-foundation/-/fast-foundation-2.49.5.tgz#be77c71c1405e154cf39b1256bdae8be3a7a1f6f" integrity sha512-3PpG1BNmZ5kUM1goYU3SsxjsM2H7Rk0ZmpDJ7mnRhWDgKiM5SzJ02KvALRUqDrJQoeDnkW0Q2Q+r9SkEd68Gpg== @@ -527,13 +527,13 @@ tabbable "^5.2.0" tslib "^1.13.0" -"@microsoft/fast-react-wrapper@^0.1.18": - version "0.1.48" - resolved "https://registry.yarnpkg.com/@microsoft/fast-react-wrapper/-/fast-react-wrapper-0.1.48.tgz#aa89c0dfb703c2f71619c536de2342e28b40b8c9" - integrity sha512-9NvEjru9Kn5ZKjomAMX6v+eF0DR+eDkxKDwDfi+Wb73kTbrNzcnmlwd4diN15ygH97kldgj2+lpvI4CKLQQWLg== +"@microsoft/fast-react-wrapper@^0.3.22": + version "0.3.23" + resolved "https://registry.yarnpkg.com/@microsoft/fast-react-wrapper/-/fast-react-wrapper-0.3.23.tgz#f9ac5c106b454122cb66733a1b64c5b3b9d7ac2f" + integrity sha512-iuL+J2AFKJ1mwUBxSp+bqzt4X93kQwj1jpVgHgw2VRzCOTl7wzta6X+lvRIVg4eoyLfmeVSMkB+q3PD87T/MyQ== dependencies: - "@microsoft/fast-element" "^1.9.0" - "@microsoft/fast-foundation" "^2.41.1" + "@microsoft/fast-element" "^1.12.0" + "@microsoft/fast-foundation" "^2.49.5" "@microsoft/fast-web-utilities@^5.4.1": version "5.4.1" @@ -586,56 +586,44 @@ mkdirp "^1.0.4" rimraf "^3.0.2" -"@octokit/endpoint@^9.0.0": - version "9.0.4" - resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-9.0.4.tgz#8afda5ad1ffc3073d08f2b450964c610b821d1ea" - integrity sha512-DWPLtr1Kz3tv8L0UvXTDP1fNwM0S+z6EJpRcvH66orY6Eld4XBMCSYsaWp4xIm61jTWxK68BrR7ibO+vSDnZqw== +"@octokit/endpoint@^10.0.0": + version "10.0.0" + resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-10.0.0.tgz#18519d9a296a581af54dac5d7d3dba1b2e8022c8" + integrity sha512-emBcNDxBdC1y3+knJonS5zhUB/CG6TihubxM2U1/pG/Z1y3a4oV0Gzz3lmkCvWWQI6h3tqBAX9MgCBFp+M68Jw== dependencies: "@octokit/types" "^12.0.0" - universal-user-agent "^6.0.0" + universal-user-agent "^7.0.2" -"@octokit/graphql@7.0.2": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-7.0.2.tgz#3df14b9968192f9060d94ed9e3aa9780a76e7f99" - integrity sha512-OJ2iGMtj5Tg3s6RaXH22cJcxXRi7Y3EBqbHTBRq+PQAqfaS8f/236fUrWhfSn8P4jovyzqucxme7/vWSSZBX2Q== +"@octokit/graphql@8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-8.0.0.tgz#2720a3b54eac6a15040f7ae166b7a66197179018" + integrity sha512-9B2HwWSb12ldwrp6pC8BFTsSCeidW7do0lMgWNH65IXRVteN503JJSWPH1VEM+qP8+/Ka1pw3MTs+3Q6Bjqukw== dependencies: - "@octokit/request" "^8.0.1" + "@octokit/request" "^9.0.0" "@octokit/types" "^12.0.0" - universal-user-agent "^6.0.0" + universal-user-agent "^7.0.0" "@octokit/openapi-types@^20.0.0": version "20.0.0" resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-20.0.0.tgz#9ec2daa0090eeb865ee147636e0c00f73790c6e5" integrity sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA== -"@octokit/request-error@^5.0.0": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-5.0.1.tgz#277e3ce3b540b41525e07ba24c5ef5e868a72db9" - integrity sha512-X7pnyTMV7MgtGmiXBwmO6M5kIPrntOXdyKZLigNfQWSEQzVxR4a4vo49vJjTWX70mPndj8KhfT4Dx+2Ng3vnBQ== - dependencies: - "@octokit/types" "^12.0.0" - deprecation "^2.0.0" - once "^1.4.0" - -"@octokit/request@8.1.6": - version "8.1.6" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-8.1.6.tgz#a76a859c30421737a3918b40973c2ff369009571" - integrity sha512-YhPaGml3ncZC1NfXpP3WZ7iliL1ap6tLkAp6MvbK2fTTPytzVUyUesBBogcdMm86uRYO5rHaM1xIWxigWZ17MQ== +"@octokit/request-error@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-6.0.1.tgz#165debcaab268a107b1d4ac0f7732bc96eabd409" + integrity sha512-EPeILOAEGqwmEG6g7dYlbvqkjJ5nWNcZvQpgeLEn1MieIcJ0xK0CJtvVcIMXqzIM8DOWzvI6zL5FQAwjTvk/Tg== dependencies: - "@octokit/endpoint" "^9.0.0" - "@octokit/request-error" "^5.0.0" "@octokit/types" "^12.0.0" - universal-user-agent "^6.0.0" -"@octokit/request@^8.0.1": - version "8.2.0" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-8.2.0.tgz#125c547bc3f4c0e2dfa38c6829a1cf00027fbd98" - integrity sha512-exPif6x5uwLqv1N1irkLG1zZNJkOtj8bZxuVHd71U5Ftuxf2wGNvAJyNBcPbPC+EBzwYEbBDdSFb8EPcjpYxPQ== +"@octokit/request@9.0.0", "@octokit/request@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-9.0.0.tgz#a117fb69185c4f6c40a7e84584297533e76569c1" + integrity sha512-hShsrZ40W8dz3TkyD5ifHNcrYfYpYF7Sh2x+ZKafA+eO0zNeKDTsbF1E0xrUf0mVYGeKL+NLMO5SnfAP22l05Q== dependencies: - "@octokit/endpoint" "^9.0.0" - "@octokit/request-error" "^5.0.0" + "@octokit/endpoint" "^10.0.0" + "@octokit/request-error" "^6.0.1" "@octokit/types" "^12.0.0" - universal-user-agent "^6.0.0" + universal-user-agent "^7.0.2" "@octokit/types@^12.0.0": version "12.6.0" @@ -644,10 +632,10 @@ dependencies: "@octokit/openapi-types" "^20.0.0" -"@opentelemetry/api-logs@0.45.1": - version "0.45.1" - resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.45.1.tgz#9e4f2c652dcce798c5627939b22304c2b5ce19c5" - integrity sha512-zVGq/k70l+kB/Wuv3O/zhptP2hvDhEbhDu9EtHde1iWZJf3FedeYS/nWVcMBkkyPAjS/JKNk86WN4CBQLGUuOw== +"@opentelemetry/api-logs@0.48.0": + version "0.48.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.48.0.tgz#9521a0c1e920ed536f31cda117164c4afff44caf" + integrity sha512-1/aMiU4Eqo3Zzpfwu51uXssp5pzvHFObk8S9pKAiXb1ne8pvg1qxBQitYL1XUiAMEXFzgjaidYG2V6624DRhhw== dependencies: "@opentelemetry/api" "^1.0.0" @@ -656,81 +644,81 @@ resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.7.0.tgz#b139c81999c23e3c8d3c0a7234480e945920fc40" integrity sha512-AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw== -"@opentelemetry/core@1.18.1": - version "1.18.1" - resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.18.1.tgz#d2e45f6bd6be4f00d20d18d4f1b230ec33805ae9" - integrity sha512-kvnUqezHMhsQvdsnhnqTNfAJs3ox/isB0SVrM1dhVFw7SsB7TstuVa6fgWnN2GdPyilIFLUvvbTZoVRmx6eiRg== - dependencies: - "@opentelemetry/semantic-conventions" "1.18.1" - -"@opentelemetry/exporter-trace-otlp-http@0.45.1": - version "0.45.1" - resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.45.1.tgz#2265181bd4787dc6660bdac33d658490a883283a" - integrity sha512-a6CGqSG66n5R1mghzLMzyzn3iGap1b0v+0PjKFjfYuwLtpHQBxh2PHxItu+m2mXSwnM4R0GJlk9oUW5sQkCE0w== - dependencies: - "@opentelemetry/core" "1.18.1" - "@opentelemetry/otlp-exporter-base" "0.45.1" - "@opentelemetry/otlp-transformer" "0.45.1" - "@opentelemetry/resources" "1.18.1" - "@opentelemetry/sdk-trace-base" "1.18.1" - -"@opentelemetry/otlp-exporter-base@0.45.1": - version "0.45.1" - resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.45.1.tgz#7170ec200152f89d74b2cf82fcf21fd32deebf03" - integrity sha512-Jvd6x8EwWGKEPWF4tkP4LpTPXiIkkafMNMvMJUfJd5DyNAftL1vAz+48jmi3URL2LMPkGryrvWPz8Tdu917gQw== - dependencies: - "@opentelemetry/core" "1.18.1" - -"@opentelemetry/otlp-transformer@0.45.1": - version "0.45.1" - resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-transformer/-/otlp-transformer-0.45.1.tgz#8f6590b93f177510983bea3055e5a3f3d30faad2" - integrity sha512-FhIHgfC0b0XtoBrS5ISfva939yWffNl47ypXR8I7Ru+dunlySpmf2TLocKHYLHGcWiuoeSNO5O4dZCmSKOtpXw== - dependencies: - "@opentelemetry/api-logs" "0.45.1" - "@opentelemetry/core" "1.18.1" - "@opentelemetry/resources" "1.18.1" - "@opentelemetry/sdk-logs" "0.45.1" - "@opentelemetry/sdk-metrics" "1.18.1" - "@opentelemetry/sdk-trace-base" "1.18.1" - -"@opentelemetry/resources@1.18.1": - version "1.18.1" - resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.18.1.tgz#e27bdc4715bccc8cd4a72d4aca3995ad0a496fe7" - integrity sha512-JjbcQLYMttXcIabflLRuaw5oof5gToYV9fuXbcsoOeQ0BlbwUn6DAZi++PNsSz2jjPeASfDls10iaO/8BRIPRA== - dependencies: - "@opentelemetry/core" "1.18.1" - "@opentelemetry/semantic-conventions" "1.18.1" - -"@opentelemetry/sdk-logs@0.45.1": - version "0.45.1" - resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-logs/-/sdk-logs-0.45.1.tgz#d59a99147ab15eb36757932517dfc9a10e1645e9" - integrity sha512-z0RRgW4LeKEKnhXS4F/HnqB6+7gsy63YK47F4XAJYHs4s1KKg8XnQ2RkbuL31i/a9nXkylttYtvsT50CGr487g== - dependencies: - "@opentelemetry/core" "1.18.1" - "@opentelemetry/resources" "1.18.1" - -"@opentelemetry/sdk-metrics@1.18.1": - version "1.18.1" - resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-metrics/-/sdk-metrics-1.18.1.tgz#1dd334744a1e5d2eec27e9e9765c73cd2f43aef3" - integrity sha512-TEFgeNFhdULBYiCoHbz31Y4PDsfjjxRp8Wmdp6ybLQZPqMNEb+dRq+XN8Xw3ivIgTaf9gYsomgV5ensX99RuEQ== - dependencies: - "@opentelemetry/core" "1.18.1" - "@opentelemetry/resources" "1.18.1" +"@opentelemetry/core@1.21.0": + version "1.21.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.21.0.tgz#8c16faf16edf861b073c03c9d45977b3f4003ee1" + integrity sha512-KP+OIweb3wYoP7qTYL/j5IpOlu52uxBv5M4+QhSmmUfLyTgu1OIS71msK3chFo1D6Y61BIH3wMiMYRCxJCQctA== + dependencies: + "@opentelemetry/semantic-conventions" "1.21.0" + +"@opentelemetry/exporter-trace-otlp-http@0.48.0": + version "0.48.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.48.0.tgz#10e719ec7fec0797a3e325964da8f08ca8d903d9" + integrity sha512-QEZKbfWqXrbKVpr2PHd4KyKI0XVOhUYC+p2RPV8s+2K5QzZBE3+F9WlxxrXDfkrvGmpQAZytBoHQQYA3AGOtpw== + dependencies: + "@opentelemetry/core" "1.21.0" + "@opentelemetry/otlp-exporter-base" "0.48.0" + "@opentelemetry/otlp-transformer" "0.48.0" + "@opentelemetry/resources" "1.21.0" + "@opentelemetry/sdk-trace-base" "1.21.0" + +"@opentelemetry/otlp-exporter-base@0.48.0": + version "0.48.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.48.0.tgz#72b4efc548de9a0a7121c37669e052ded619bcc3" + integrity sha512-T4LJND+Ugl87GUONoyoQzuV9qCn4BFIPOnCH1biYqdGhc2JahjuLqVD9aefwLzGBW638iLAo88Lh68h2F1FLiA== + dependencies: + "@opentelemetry/core" "1.21.0" + +"@opentelemetry/otlp-transformer@0.48.0": + version "0.48.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-transformer/-/otlp-transformer-0.48.0.tgz#969d52a767c7538552b88f7baaa001d3f88feb17" + integrity sha512-yuoS4cUumaTK/hhxW3JUy3wl2U4keMo01cFDrUOmjloAdSSXvv1zyQ920IIH4lymp5Xd21Dj2/jq2LOro56TJg== + dependencies: + "@opentelemetry/api-logs" "0.48.0" + "@opentelemetry/core" "1.21.0" + "@opentelemetry/resources" "1.21.0" + "@opentelemetry/sdk-logs" "0.48.0" + "@opentelemetry/sdk-metrics" "1.21.0" + "@opentelemetry/sdk-trace-base" "1.21.0" + +"@opentelemetry/resources@1.21.0": + version "1.21.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.21.0.tgz#e773e918cc8ca26493a987dfbfc6b8a315a2ab45" + integrity sha512-1Z86FUxPKL6zWVy2LdhueEGl9AHDJcx+bvHStxomruz6Whd02mE3lNUMjVJ+FGRoktx/xYQcxccYb03DiUP6Yw== + dependencies: + "@opentelemetry/core" "1.21.0" + "@opentelemetry/semantic-conventions" "1.21.0" + +"@opentelemetry/sdk-logs@0.48.0": + version "0.48.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-logs/-/sdk-logs-0.48.0.tgz#5248e4cbfc99bbee555ffd1a23b5db53d6553f2c" + integrity sha512-lRcA5/qkSJuSh4ItWCddhdn/nNbVvnzM+cm9Fg1xpZUeTeozjJDBcHnmeKoOaWRnrGYBdz6UTY6bynZR9aBeAA== + dependencies: + "@opentelemetry/core" "1.21.0" + "@opentelemetry/resources" "1.21.0" + +"@opentelemetry/sdk-metrics@1.21.0": + version "1.21.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-metrics/-/sdk-metrics-1.21.0.tgz#40d71aaec5b696e58743889ce6d5bf2593f9a23d" + integrity sha512-on1jTzIHc5DyWhRP+xpf+zrgrREXcHBH4EDAfaB5mIG7TWpKxNXooQ1JCylaPsswZUv4wGnVTinr4HrBdGARAQ== + dependencies: + "@opentelemetry/core" "1.21.0" + "@opentelemetry/resources" "1.21.0" lodash.merge "^4.6.2" -"@opentelemetry/sdk-trace-base@1.18.1": - version "1.18.1" - resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.18.1.tgz#256605d90b202002d5672305c66dbcf377132379" - integrity sha512-tRHfDxN5dO+nop78EWJpzZwHsN1ewrZRVVwo03VJa3JQZxToRDH29/+MB24+yoa+IArerdr7INFJiX/iN4gjqg== +"@opentelemetry/sdk-trace-base@1.21.0": + version "1.21.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.21.0.tgz#ffad912e453a92044fb220bd5d2f6743bf37bb8a" + integrity sha512-yrElGX5Fv0umzp8Nxpta/XqU71+jCAyaLk34GmBzNcrW43nqbrqvdPs4gj4MVy/HcTjr6hifCDCYA3rMkajxxA== dependencies: - "@opentelemetry/core" "1.18.1" - "@opentelemetry/resources" "1.18.1" - "@opentelemetry/semantic-conventions" "1.18.1" + "@opentelemetry/core" "1.21.0" + "@opentelemetry/resources" "1.21.0" + "@opentelemetry/semantic-conventions" "1.21.0" -"@opentelemetry/semantic-conventions@1.18.1": - version "1.18.1" - resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.18.1.tgz#8e47caf57a84b1dcc1722b2025693348cdf443b4" - integrity sha512-+NLGHr6VZwcgE/2lw8zDIufOCGnzsA5CbQIMleXZTrgkBd0TanCX+MiDYJ1TOS4KL/Tqk0nFRxawnaYr6pkZkA== +"@opentelemetry/semantic-conventions@1.21.0": + version "1.21.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.21.0.tgz#83f7479c524ab523ac2df702ade30b9724476c72" + integrity sha512-lkC8kZYntxVKr7b8xmjCVUgE0a8xgDakPyDo9uSWavXPyYqLgYYGdEd2j8NxihRyb6UwpX3G/hFUF4/9q2V+/g== "@pkgjs/parseargs@^0.11.0": version "0.11.0" @@ -871,12 +859,12 @@ ttf2woff "^3.0.0" ttf2woff2 "^5.0.0" -"@types/d3-selection@*", "@types/d3-selection@^3.0.9": +"@types/d3-selection@*", "@types/d3-selection@^3.0.0": version "3.0.10" resolved "https://registry.yarnpkg.com/@types/d3-selection/-/d3-selection-3.0.10.tgz#98cdcf986d0986de6912b5892e7c015a95ca27fe" integrity sha512-cuHoUgS/V3hLdjJOLTT691+G2QoqAjCVLmr4kJXR4ha56w1Zdu8UUQ5TxLRqudgNjwXeQxKMq4j+lyf9sWuslg== -"@types/d3-transition@^3.0.7": +"@types/d3-transition@^3.0.0": version "3.0.8" resolved "https://registry.yarnpkg.com/@types/d3-transition/-/d3-transition-3.0.8.tgz#677707f5eed5b24c66a1918cde05963021351a8f" integrity sha512-ew63aJfQ/ms7QQ4X7pk5NxQ9fZH/z+i24ZfJ6tJSfqxJMrYLiK01EAs2/Rtw/JreGUsS3pLPNV644qXFGnoZNQ== @@ -1213,14 +1201,15 @@ optionalDependencies: keytar "^7.7.0" -"@vscode/webview-ui-toolkit@1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@vscode/webview-ui-toolkit/-/webview-ui-toolkit-1.2.2.tgz#f071ec7434b2733d1c724fa874341ec20998f930" - integrity sha512-xIQoF4FC3Xh6d7KNKIoIezSiFWYFuf6gQMdDyKueKBFGeKwaHWEn+dY2g3makvvEsNMEDji/woEwvg9QSbuUsw== +"@vscode/webview-ui-toolkit@1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@vscode/webview-ui-toolkit/-/webview-ui-toolkit-1.4.0.tgz#abbd5b2f8a08eee6cfb68d47a83778424f926715" + integrity sha512-modXVHQkZLsxgmd5yoP3ptRC/G8NBDD+ob+ngPiWNQdlrH6H1xR/qgOBD85bfU3BhOB5sZzFWBwwhp9/SfoHww== dependencies: - "@microsoft/fast-element" "^1.6.2" - "@microsoft/fast-foundation" "^2.38.0" - "@microsoft/fast-react-wrapper" "^0.1.18" + "@microsoft/fast-element" "^1.12.0" + "@microsoft/fast-foundation" "^2.49.4" + "@microsoft/fast-react-wrapper" "^0.3.22" + tslib "^2.6.2" "@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5": version "1.11.6" @@ -1745,13 +1734,13 @@ big.js@^5.2.2: resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== -billboard.js@3.10.3: - version "3.10.3" - resolved "https://registry.yarnpkg.com/billboard.js/-/billboard.js-3.10.3.tgz#e328d59f7f4cf495bbbfd43d4da1d798e63643bd" - integrity sha512-GtexPEGbN4gkcxKL6/9iU2VK5YBaUUdJ1wcG7eJEtihJMx/LWrAxqKCd2H0Kfrypc557yhs14SFsfhr9xD1BWA== +billboard.js@3.11.2: + version "3.11.2" + resolved "https://registry.yarnpkg.com/billboard.js/-/billboard.js-3.11.2.tgz#d619be53e26a097863c00905b1e59cbcba599686" + integrity sha512-EjrQypnOUP6+D92SSRzj8f54p7cU6rNTfnmmA7vkk0A0IyUuSLk77FCZkSQxBTW3lBad9G/2kQz9erUiSad+yA== dependencies: - "@types/d3-selection" "^3.0.9" - "@types/d3-transition" "^3.0.7" + "@types/d3-selection" "^3.0.0" + "@types/d3-transition" "^3.0.0" d3-axis "^3.0.0" d3-brush "^3.0.0" d3-drag "^3.0.0" @@ -2772,11 +2761,6 @@ depd@~1.1.2: resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== -deprecation@^2.0.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919" - integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ== - destroy@^1.0.4: version "1.2.0" resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" @@ -4757,7 +4741,7 @@ linkify-it@^3.0.1: dependencies: uc.micro "^1.0.1" -lit-element@^4.0.0: +lit-element@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-4.0.4.tgz#e0b37ebbe2394bcb9578d611a409f49475dff361" integrity sha512-98CvgulX6eCPs6TyAIQoJZBCQPo80rgXR+dVBs61cstJXqtI+USQZAbA4gFHh6L/mxBx9MrgPLHLsUgDUHAcCQ== @@ -4766,21 +4750,21 @@ lit-element@^4.0.0: "@lit/reactive-element" "^2.0.4" lit-html "^3.1.2" -lit-html@^3.1.0, lit-html@^3.1.2: +lit-html@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-3.1.2.tgz#6655ce82367472de7680c62b1bcb0beb0e426fa1" integrity sha512-3OBZSUrPnAHoKJ9AMjRL/m01YJxQMf+TMHanNtTHG68ubjnZxK0RFl102DPzsw4mWnHibfZIBJm3LWCZ/LmMvg== dependencies: "@types/trusted-types" "^2.0.2" -lit@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lit/-/lit-3.1.1.tgz#49340c8875019a777cc83904f75a2bf7764617dc" - integrity sha512-hF1y4K58+Gqrz+aAPS0DNBwPqPrg6P04DuWK52eMkt/SM9Qe9keWLcFgRcEKOLuDlRZlDsDbNL37Vr7ew1VCuw== +lit@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/lit/-/lit-3.1.2.tgz#f276258e8a56593f1d834a5fd00a7eb5e891ae73" + integrity sha512-VZx5iAyMtX7CV4K8iTLdCkMaYZ7ipjJZ0JcSdJ0zIdGxxyurjIn7yuuSxNBD7QmjvcNJwr0JS4cAdAtsy7gZ6w== dependencies: - "@lit/reactive-element" "^2.0.0" - lit-element "^4.0.0" - lit-html "^3.1.0" + "@lit/reactive-element" "^2.0.4" + lit-element "^4.0.4" + lit-html "^3.1.2" loader-runner@^4.2.0: version "4.3.0" @@ -7286,7 +7270,7 @@ tslib@^1.13.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.3, tslib@^2.1.0: +tslib@^2.0.3, tslib@^2.1.0, tslib@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== @@ -7477,10 +7461,10 @@ unique-slug@^3.0.0: dependencies: imurmurhash "^0.1.4" -universal-user-agent@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.1.tgz#15f20f55da3c930c57bddbf1734c6654d5fd35aa" - integrity sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ== +universal-user-agent@^7.0.0, universal-user-agent@^7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-7.0.2.tgz#52e7d0e9b3dc4df06cc33cb2b9fd79041a54827e" + integrity sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q== universalify@^2.0.0: version "2.0.1" From 03483055eed2b3f26f719bb3a466e05e92a990d6 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 21 Feb 2024 14:16:22 -0500 Subject: [PATCH 0539/1012] Switches to return items vs quickpick items --- src/commands/remoteProviders.ts | 12 +++--- src/plus/webviews/graph/graphWebview.ts | 2 +- src/plus/workspaces/workspacesService.ts | 4 +- src/quickpicks/repositoryPicker.ts | 52 ++++++++---------------- 4 files changed, 27 insertions(+), 43 deletions(-) diff --git a/src/commands/remoteProviders.ts b/src/commands/remoteProviders.ts index e61782e050e46..ab54e2e7b9fa5 100644 --- a/src/commands/remoteProviders.ts +++ b/src/commands/remoteProviders.ts @@ -71,10 +71,10 @@ export class ConnectRemoteProviderCommand extends Command { 'Choose which repository to connect to the remote provider', [...repos.keys()], ); - if (pick?.item == null) return undefined; + if (pick == null) return undefined; - repoPath = pick.repoPath; - remote = repos.get(pick.item)!; + repoPath = pick.path; + remote = repos.get(pick)!; } } else if (args?.remote == null) { repoPath = args.repoPath; @@ -165,10 +165,10 @@ export class DisconnectRemoteProviderCommand extends Command { 'Choose which repository to disconnect from the remote provider', [...repos.keys()], ); - if (pick?.item == null) return undefined; + if (pick == null) return undefined; - repoPath = pick.repoPath; - remote = repos.get(pick.item)!; + repoPath = pick.path; + remote = repos.get(pick)!; } } else if (args?.remote == null) { repoPath = args.repoPath; diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts index 9d6370378b420..b7dbb5a684a77 100644 --- a/src/plus/webviews/graph/graphWebview.ts +++ b/src/plus/webviews/graph/graphWebview.ts @@ -1235,7 +1235,7 @@ export class GraphWebviewProvider implements WebviewProvider | undefined = diff --git a/src/plus/workspaces/workspacesService.ts b/src/plus/workspaces/workspacesService.ts index 79d831c337699..4e8f653dacfbe 100644 --- a/src/plus/workspaces/workspacesService.ts +++ b/src/plus/workspaces/workspacesService.ts @@ -342,7 +342,7 @@ export class WorkspacesService implements Disposable { repositoriesToAdd, ); if (pick.length === 0) return; - chosenRepoPaths = pick.map(p => p.repoPath); + chosenRepoPaths = pick.map(p => p.path); } else { chosenRepoPaths = repositoriesToAdd.map(r => r.path); } @@ -899,7 +899,7 @@ export class WorkspacesService implements Disposable { validRepos, ); if (pick.length === 0) return; - reposOrRepoPaths = pick.map(p => p.repoPath); + reposOrRepoPaths = pick.map(p => p.path); } if (reposOrRepoPaths == null) return; diff --git a/src/quickpicks/repositoryPicker.ts b/src/quickpicks/repositoryPicker.ts index fe47e2780422e..c1f9e76b01d0f 100644 --- a/src/quickpicks/repositoryPicker.ts +++ b/src/quickpicks/repositoryPicker.ts @@ -25,13 +25,13 @@ export async function getBestRepositoryOrShowPicker( } if (repository != null) return repository; - const pick = await showRepositoryPicker(title, placeholder, options); + const pick = await showRepositoryPicker(title, placeholder, undefined, options); if (pick instanceof CommandQuickPickItem) { await pick.execute(); return undefined; } - return pick?.item; + return pick; } export async function getRepositoryOrShowPicker( @@ -54,50 +54,35 @@ export async function getRepositoryOrShowPicker( } if (repository != null) return repository; - const pick = await showRepositoryPicker(title, placeholder, options); + const pick = await showRepositoryPicker(title, placeholder, undefined, options); if (pick instanceof CommandQuickPickItem) { void (await pick.execute()); return undefined; } - return pick?.item; + return pick; } export async function showRepositoryPicker( title: string | undefined, placeholder?: string, repositories?: Repository[], -): Promise; -export async function showRepositoryPicker( - title: string | undefined, - placeholder?: string, - options?: { filter?: (r: Repository) => Promise }, -): Promise; -export async function showRepositoryPicker( - title: string | undefined, - placeholder: string = 'Choose a repository', - repositoriesOrOptions?: Repository[] | { filter?: (r: Repository) => Promise }, -): Promise { - if ( - repositoriesOrOptions != null && - !Array.isArray(repositoriesOrOptions) && - repositoriesOrOptions.filter == null - ) { - repositoriesOrOptions = undefined; - } + options?: { filter?: (r: Repository) => Promise; picked?: Repository }, +): Promise { + repositories ??= Container.instance.git.openRepositories; let items: RepositoryQuickPickItem[]; - if (repositoriesOrOptions == null || Array.isArray(repositoriesOrOptions)) { + if (options?.filter == null) { items = await Promise.all>( - map(repositoriesOrOptions ?? Container.instance.git.openRepositories, r => - createRepositoryQuickPickItem(r, undefined, { branch: true, status: true }), + map(repositories ?? Container.instance.git.openRepositories, r => + createRepositoryQuickPickItem(r, r === options?.picked, { branch: true, status: true }), ), ); } else { - const { filter } = repositoriesOrOptions; + const { filter } = options; items = await filterMapAsync(Container.instance.git.openRepositories, async r => - (await filter!(r)) - ? createRepositoryQuickPickItem(r, undefined, { branch: true, status: true }) + (await filter(r)) + ? createRepositoryQuickPickItem(r, r === options?.picked, { branch: true, status: true }) : undefined, ); } @@ -128,9 +113,8 @@ export async function showRepositoryPicker( quickpick.show(); }); - if (pick == null) return undefined; - return pick; + return pick?.item; } finally { quickpick.dispose(); disposables.forEach(d => void d.dispose()); @@ -141,17 +125,17 @@ export async function showRepositoriesPicker( title: string | undefined, placeholder?: string, repositories?: Repository[], -): Promise; +): Promise; export async function showRepositoriesPicker( title: string | undefined, placeholder?: string, options?: { filter?: (r: Repository) => Promise }, -): Promise; +): Promise; export async function showRepositoriesPicker( title: string | undefined, placeholder: string = 'Choose a repository', repositoriesOrOptions?: Repository[] | { filter?: (r: Repository) => Promise }, -): Promise { +): Promise { if ( repositoriesOrOptions != null && !Array.isArray(repositoriesOrOptions) && @@ -204,7 +188,7 @@ export async function showRepositoriesPicker( }); if (picks == null) return []; - return picks; + return picks.map(p => p.item); } finally { quickpick.dispose(); disposables.forEach(d => void d.dispose()); From d88cbef2ad5c9174b501e4a952a6ab27065b5b7e Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 26 Feb 2024 16:56:15 -0500 Subject: [PATCH 0540/1012] Adds quick (not-lint) build script --- package.json | 1 + webpack.config.js | 61 ++++++++++++++++++++++++++++------------------- 2 files changed, 37 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 13689301bb05c..78c022159e929 100644 --- a/package.json +++ b/package.json @@ -16495,6 +16495,7 @@ "analyze:bundle": "webpack --mode production --env analyzeBundle", "analyze:deps": "webpack --env analyzeDeps", "build": "webpack --mode development", + "build:quick": "webpack --mode development --env skipLint", "build:extension": "webpack --mode development --config-name extension:node", "build:extension:browser": "webpack --mode development --config-name extension:webworker", "build:webviews": "webpack --mode development --config-name webviews", diff --git a/webpack.config.js b/webpack.config.js index 80bb3bc1c00d8..300438e16ca67 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -24,7 +24,7 @@ const WebpackRequireFromPlugin = require('webpack-require-from'); module.exports = /** - * @param {{ analyzeBundle?: boolean; analyzeDeps?: boolean; esbuild?: boolean } | undefined } env + * @param {{ analyzeBundle?: boolean; analyzeDeps?: boolean; esbuild?: boolean; skipLint?: boolean } | undefined } env * @param {{ mode: 'production' | 'development' | 'none' | undefined }} argv * @returns { WebpackConfig[] } */ @@ -35,6 +35,7 @@ module.exports = analyzeBundle: false, analyzeDeps: false, esbuild: true, + skipLint: false, ...env, }; @@ -48,7 +49,7 @@ module.exports = /** * @param { 'node' | 'webworker' } target * @param { 'production' | 'development' | 'none' } mode - * @param {{ analyzeBundle?: boolean; analyzeDeps?: boolean; esbuild?: boolean }} env + * @param {{ analyzeBundle?: boolean; analyzeDeps?: boolean; esbuild?: boolean; skipLint?: boolean }} env * @returns { WebpackConfig } */ function getExtensionConfig(target, mode, env) { @@ -57,19 +58,6 @@ function getExtensionConfig(target, mode, env) { */ const plugins = [ new CleanPlugin({ cleanOnceBeforeBuildPatterns: ['!dist/webviews/**'] }), - new ESLintLitePlugin({ - files: path.join(__dirname, 'src', '**', '*.ts'), - worker: true, - eslintOptions: { - cache: true, - cacheLocation: path.join(__dirname, '.eslintcache/', target === 'webworker' ? 'browser/' : ''), - cacheStrategy: 'content', - overrideConfigFile: path.join( - __dirname, - target === 'webworker' ? '.eslintrc.browser.json' : '.eslintrc.json', - ), - }, - }), new ForkTsCheckerPlugin({ async: false, formatter: 'basic', @@ -79,6 +67,24 @@ function getExtensionConfig(target, mode, env) { }), ]; + if (!env.skipLint) { + plugins.push( + new ESLintLitePlugin({ + files: path.join(__dirname, 'src', '**', '*.ts'), + worker: true, + eslintOptions: { + cache: true, + cacheLocation: path.join(__dirname, '.eslintcache/', target === 'webworker' ? 'browser/' : ''), + cacheStrategy: 'content', + overrideConfigFile: path.join( + __dirname, + target === 'webworker' ? '.eslintrc.browser.json' : '.eslintrc.json', + ), + }, + }), + ); + } + if (target === 'webworker') { plugins.push(new optimize.LimitChunkCountPlugin({ maxChunks: 1 })); } else { @@ -273,7 +279,7 @@ function getExtensionConfig(target, mode, env) { /** * @param { 'production' | 'development' | 'none' } mode - * @param {{ analyzeBundle?: boolean; analyzeDeps?: boolean; esbuild?: boolean }} env + * @param {{ analyzeBundle?: boolean; analyzeDeps?: boolean; esbuild?: boolean; skipLint?: boolean }} env * @returns { WebpackConfig } */ function getWebviewsConfig(mode, env) { @@ -295,15 +301,6 @@ function getWebviewsConfig(mode, env) { new DefinePlugin({ DEBUG: mode === 'development', }), - new ESLintLitePlugin({ - files: path.join(basePath, '**', '*.ts?(x)'), - worker: true, - eslintOptions: { - cache: true, - cacheLocation: path.join(__dirname, '.eslintcache', 'webviews/'), - cacheStrategy: 'content', - }, - }), new ForkTsCheckerPlugin({ async: false, formatter: 'basic', @@ -348,6 +345,20 @@ function getWebviewsConfig(mode, env) { }), ]; + if (!env.skipLint) { + plugins.push( + new ESLintLitePlugin({ + files: path.join(basePath, '**', '*.ts?(x)'), + worker: true, + eslintOptions: { + cache: true, + cacheLocation: path.join(__dirname, '.eslintcache', 'webviews/'), + cacheStrategy: 'content', + }, + }), + ); + } + const imageGeneratorConfig = getImageMinimizerConfig(mode, env); if (mode !== 'production') { From cda99c5bd5aca91f2b394b4fd43d7ead199f1a87 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 26 Feb 2024 16:56:31 -0500 Subject: [PATCH 0541/1012] Adopts new string width calc (better perf/accuracy) --- package.json | 1 + src/system/string.ts | 132 +++++++------------------------------------ yarn.lock | 5 ++ 3 files changed, 25 insertions(+), 113 deletions(-) diff --git a/package.json b/package.json index 78c022159e929..a7ca312da0eba 100644 --- a/package.json +++ b/package.json @@ -16555,6 +16555,7 @@ "@vscode/webview-ui-toolkit": "1.4.0", "ansi-regex": "6.0.1", "billboard.js": "3.11.2", + "fast-string-width": "1.0.4", "https-proxy-agent": "5.0.1", "iconv-lite": "0.6.3", "lit": "3.1.2", diff --git a/src/system/string.ts b/src/system/string.ts index f92bfb1575d8a..04c52c2e32ed8 100644 --- a/src/system/string.ts +++ b/src/system/string.ts @@ -1,4 +1,6 @@ -import ansiRegex from 'ansi-regex'; +// import ansiRegex from 'ansi-regex'; +import type { Options as FastStringWidthOptions } from 'fast-string-width'; +import getStringWidth from 'fast-string-width'; import { hrtime } from '@env/hrtime'; import { CharCode } from '../constants'; @@ -209,6 +211,22 @@ export function* getLines(data: string | string[], char: string = '\n'): Iterabl } } +const defaultWidthOptions: FastStringWidthOptions = { + ansiWidth: 0, + controlWidth: 0, + ambiguousWidth: 1, + emojiWidth: 2, + fullWidthWidth: 2, + regularWidth: 1, + wideWidth: 2, +}; + +export function getWidth(s: string): number { + if (s == null || s.length === 0) return 0; + + return getStringWidth(s, defaultWidthOptions); +} + const superscripts = ['\u00B9', '\u00B2', '\u00B3', '\u2074', '\u2075', '\u2076', '\u2077', '\u2078', '\u2079']; export function getSuperscript(num: number) { @@ -597,118 +615,6 @@ export function truncateMiddle(s: string, truncateTo: number, ellipsis: string = return `${s.slice(0, Math.floor(truncateTo / 2) - 1)}${ellipsis}${s.slice(width - Math.ceil(truncateTo / 2))}`; } -let cachedAnsiRegex: RegExp | undefined; -const containsNonAsciiRegex = /[^\x20-\x7F\u00a0\u2026]/; - -// See sindresorhus/string-width -export function getWidth(s: string): number { - if (s == null || s.length === 0) return 0; - - // Shortcut to avoid needless string `RegExp`s, replacements, and allocations - if (!containsNonAsciiRegex.test(s)) return s.length; - - if (cachedAnsiRegex == null) { - cachedAnsiRegex = ansiRegex(); - } - s = s.replace(cachedAnsiRegex, ''); - - if (s.length === 0) return 0; - - let count = 0; - let emoji = 0; - let joiners = 0; - - const graphemes = [...s]; - for (let i = 0; i < graphemes.length; i++) { - const code = graphemes[i].codePointAt(0)!; - - // Ignore control characters - if (code <= 0x1f || (code >= 0x7f && code <= 0x9f)) continue; - - // Ignore combining characters - if (code >= 0x300 && code <= 0x36f) continue; - - if ( - (code >= 0x1f600 && code <= 0x1f64f) || // Emoticons - (code >= 0x1f300 && code <= 0x1f5ff) || // Misc Symbols and Pictographs - (code >= 0x1f680 && code <= 0x1f6ff) || // Transport and Map - (code >= 0x2600 && code <= 0x26ff) || // Misc symbols - (code >= 0x2700 && code <= 0x27bf) || // Dingbats - (code >= 0xfe00 && code <= 0xfe0f) || // Variation Selectors - (code >= 0x1f900 && code <= 0x1f9ff) || // Supplemental Symbols and Pictographs - (code >= 65024 && code <= 65039) || // Variation selector - (code >= 8400 && code <= 8447) // Combining Diacritical Marks for Symbols - ) { - if (code >= 0x1f3fb && code <= 0x1f3ff) continue; // emoji modifier fitzpatrick type - - emoji++; - count += 2; - continue; - } - - // Ignore zero-width joiners '\u200d' - if (code === 8205) { - joiners++; - count -= 2; - continue; - } - - // Surrogates - if (code > 0xffff) { - i++; - } - - count += isFullwidthCodePoint(code) ? 2 : 1; - } - - const offset = emoji - joiners; - if (offset > 1) { - count += offset - 1; - } - return count; -} - -// See sindresorhus/is-fullwidth-code-point -function isFullwidthCodePoint(cp: number) { - // code points are derived from: - // http://www.unix.org/Public/UNIDATA/EastAsianWidth.txt - if ( - cp >= 0x1100 && - (cp <= 0x115f || // Hangul Jamo - cp === 0x2329 || // LEFT-POINTING ANGLE BRACKET - cp === 0x232a || // RIGHT-POINTING ANGLE BRACKET - // CJK Radicals Supplement .. Enclosed CJK Letters and Months - (cp >= 0x2e80 && cp <= 0x3247 && cp !== 0x303f) || - // Enclosed CJK Letters and Months .. CJK Unified Ideographs Extension A - (cp >= 0x3250 && cp <= 0x4dbf) || - // CJK Unified Ideographs .. Yi Radicals - (cp >= 0x4e00 && cp <= 0xa4c6) || - // Hangul Jamo Extended-A - (cp >= 0xa960 && cp <= 0xa97c) || - // Hangul Syllables - (cp >= 0xac00 && cp <= 0xd7a3) || - // CJK Compatibility Ideographs - (cp >= 0xf900 && cp <= 0xfaff) || - // Vertical Forms - (cp >= 0xfe10 && cp <= 0xfe19) || - // CJK Compatibility Forms .. Small Form Variants - (cp >= 0xfe30 && cp <= 0xfe6b) || - // Halfwidth and Fullwidth Forms - (cp >= 0xff01 && cp <= 0xff60) || - (cp >= 0xffe0 && cp <= 0xffe6) || - // Kana Supplement - (cp >= 0x1b000 && cp <= 0x1b001) || - // Enclosed Ideographic Supplement - (cp >= 0x1f200 && cp <= 0x1f251) || - // CJK Unified Ideographs Extension B .. Tertiary Ideographic Plane - (cp >= 0x20000 && cp <= 0x3fffd)) - ) { - return true; - } - - return false; -} - // Below adapted from https://github.com/pieroxy/lz-string const keyStrBase64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='; diff --git a/yarn.lock b/yarn.lock index 25116cfe60968..9f514a78cabac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3433,6 +3433,11 @@ fast-memoize@^2.5.1: resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz#79e3bb6a4ec867ea40ba0e7146816f6cdce9b57e" integrity sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw== +fast-string-width@1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/fast-string-width/-/fast-string-width-1.0.4.tgz#2be6909809f1c3195b7a9c5693e5209222794b07" + integrity sha512-LNP+TPEioODMdFEdjq/h1Ck4220TnS7pgI5fzHMtzfbP6kGkereW1KgeBAAazMEa4M2MvqEibnY4lrIvVn6JmA== + fastest-levenshtein@^1.0.12: version "1.0.16" resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" From 42d7e0928c522b00c5451a59590da8cc46cce26c Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Mon, 26 Feb 2024 16:15:21 -0700 Subject: [PATCH 0542/1012] Passes repo state to worktree command on switch --- src/commands/git/switch.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/commands/git/switch.ts b/src/commands/git/switch.ts index d98ca4e562330..f3ecc68ed89da 100644 --- a/src/commands/git/switch.ts +++ b/src/commands/git/switch.ts @@ -224,6 +224,7 @@ export class SwitchGitCommand extends QuickCommand { })} is linked to a worktree`, }, }, + repo: state.repos[0], }, }, this.pickedVia, @@ -299,6 +300,7 @@ export class SwitchGitCommand extends QuickCommand { : state.reference, createBranch: result === 'switchToNewBranchViaWorktree' ? state.createBranch : undefined, + repo: state.repos[0], }, }, this.pickedVia, From f6b953c705c9e02feb1714a69c2084206c966317 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 27 Feb 2024 12:13:06 -0500 Subject: [PATCH 0543/1012] Ensures secure upload/download headers are provided --- src/gk/models/drafts.ts | 8 ++------ src/plus/drafts/draftsService.ts | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/gk/models/drafts.ts b/src/gk/models/drafts.ts index 5c43e3dcab466..2bc84968f75ee 100644 --- a/src/gk/models/drafts.ts +++ b/src/gk/models/drafts.ts @@ -208,9 +208,7 @@ export interface DraftPatchCreateResponse { readonly gitRepositoryId: GkRepositoryId; readonly secureUploadData: { - readonly headers: { - readonly Host: string[]; - }; + readonly headers: Record; readonly method: string; readonly url: string; }; @@ -229,9 +227,7 @@ export interface DraftPatchResponse { readonly gitRepositoryId: GkRepositoryId; readonly secureDownloadData: { - readonly headers: { - readonly Host: string[]; - }; + readonly headers: Record; readonly method: string; readonly url: string; }; diff --git a/src/plus/drafts/draftsService.ts b/src/plus/drafts/draftsService.ts index bab36ee9b6c5e..8473e0e18b73e 100644 --- a/src/plus/drafts/draftsService.ts +++ b/src/plus/drafts/draftsService.ts @@ -136,7 +136,7 @@ export class DraftService implements Disposable { method: method, headers: { 'Content-Type': 'text/plain', - Host: headers?.['Host']?.['0'] ?? '', + ...headers, }, body: contents, }); @@ -592,7 +592,7 @@ export class DraftService implements Disposable { method: method, headers: { Accept: 'text/plain', - Host: headers?.['Host']?.['0'] ?? '', + ...headers, }, }); From a52322aece50a6f8b69681a524a1f608ebf09c22 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Tue, 27 Feb 2024 15:30:55 -0500 Subject: [PATCH 0544/1012] Adds debouncing to create patch fields --- .../plus/patchDetails/components/gl-patch-create.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts b/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts index 9e3fbd7749885..9cb0b8dc1141c 100644 --- a/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts +++ b/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts @@ -12,6 +12,7 @@ import type { FileActionParams, State, } from '../../../../../plus/webviews/patchDetails/protocol'; +import { debounce } from '../../../../../system/function'; import { flatCount } from '../../../../../system/iterable'; import type { Serialized } from '../../../../../system/serialize'; import type { @@ -233,16 +234,16 @@ export class GlPatchCreate extends GlTreeBase {
    + } @input=${(e: InputEvent) => this.onDebounceTitleInput(e)}>
    + } @input=${(e: InputEvent) => this.onDebounceDescriptionInput(e)}>

    - Create Cloud Patch + this.onDebouncedCreateAll(e)}>Create Cloud Patch

    ${when( @@ -525,6 +526,8 @@ export class GlPatchCreate extends GlTreeBase { this.createPatch(); } + private onDebouncedCreateAll = debounce(this.onCreateAll.bind(this), 250); + private onSelectCreateOption(_e: CustomEvent<{ target: MenuItem }>) { // const target = e.detail?.target; // const value = target?.dataset?.value as 'staged' | 'unstaged' | undefined; @@ -583,6 +586,8 @@ export class GlPatchCreate extends GlTreeBase { }); } + private onDebounceTitleInput = debounce(this.onTitleInput.bind(this), 500); + private onDescriptionInput(e: InputEvent) { this.create.description = (e.target as HTMLInputElement).value; this.fireEvent('gl-patch-create-update-metadata', { @@ -592,6 +597,8 @@ export class GlPatchCreate extends GlTreeBase { }); } + private onDebounceDescriptionInput = debounce(this.onDescriptionInput.bind(this), 500); + private onInviteUsers(_e: Event) { this.fireEvent('gl-patch-create-invite-users'); } From 1536a9c913711bccefae77c9a77064d3d3414a09 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 27 Feb 2024 15:35:39 -0500 Subject: [PATCH 0545/1012] Fixes const to fit in V8 SMI --- src/annotations/blameAnnotationProvider.ts | 2 +- src/annotations/gutterBlameAnnotationProvider.ts | 2 +- src/annotations/gutterChangesAnnotationProvider.ts | 2 +- src/annotations/lineAnnotationController.ts | 2 +- src/api/actionRunners.ts | 2 +- src/avatars.ts | 2 +- src/hovers/lineHoverController.ts | 2 +- src/system/logger.scope.ts | 2 +- src/webviews/apps/shared/ipc.ts | 2 +- src/webviews/rebase/rebaseEditor.ts | 2 +- src/webviews/webviewController.ts | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/annotations/blameAnnotationProvider.ts b/src/annotations/blameAnnotationProvider.ts index 23b3a8ddd09ae..ae51bc1156537 100644 --- a/src/annotations/blameAnnotationProvider.ts +++ b/src/annotations/blameAnnotationProvider.ts @@ -13,7 +13,7 @@ import { AnnotationProviderBase } from './annotationProvider'; import type { ComputedHeatmap } from './annotations'; import { getHeatmapColors } from './annotations'; -const maxSmallIntegerV8 = 2 ** 30; // Max number that can be stored in V8's smis (small integers) +const maxSmallIntegerV8 = 2 ** 30 - 1; // Max number that can be stored in V8's smis (small integers) export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase { protected blame: Promise; diff --git a/src/annotations/gutterBlameAnnotationProvider.ts b/src/annotations/gutterBlameAnnotationProvider.ts index 91675261cf14b..931e5f2defcad 100644 --- a/src/annotations/gutterBlameAnnotationProvider.ts +++ b/src/annotations/gutterBlameAnnotationProvider.ts @@ -20,7 +20,7 @@ import { applyHeatmap, getGutterDecoration, getGutterRenderOptions } from './ann import { BlameAnnotationProviderBase } from './blameAnnotationProvider'; import { Decorations } from './fileAnnotationController'; -const maxSmallIntegerV8 = 2 ** 30; // Max number that can be stored in V8's smis (small integers) +const maxSmallIntegerV8 = 2 ** 30 - 1; // Max number that can be stored in V8's smis (small integers) export interface BlameFontOptions { family: string; diff --git a/src/annotations/gutterChangesAnnotationProvider.ts b/src/annotations/gutterChangesAnnotationProvider.ts index 9037051f248cb..568c47cf0a70e 100644 --- a/src/annotations/gutterChangesAnnotationProvider.ts +++ b/src/annotations/gutterChangesAnnotationProvider.ts @@ -15,7 +15,7 @@ import { AnnotationProviderBase } from './annotationProvider'; import type { Decoration } from './annotations'; import { Decorations } from './fileAnnotationController'; -const maxSmallIntegerV8 = 2 ** 30; // Max number that can be stored in V8's smis (small integers) +const maxSmallIntegerV8 = 2 ** 30 - 1; // Max number that can be stored in V8's smis (small integers) export interface ChangesAnnotationContext extends AnnotationContext { sha?: string; diff --git a/src/annotations/lineAnnotationController.ts b/src/annotations/lineAnnotationController.ts index 55c51b4d39c5f..44a426c857ffe 100644 --- a/src/annotations/lineAnnotationController.ts +++ b/src/annotations/lineAnnotationController.ts @@ -25,7 +25,7 @@ const annotationDecoration: TextEditorDecorationType = window.createTextEditorDe }, rangeBehavior: DecorationRangeBehavior.OpenOpen, }); -const maxSmallIntegerV8 = 2 ** 30; // Max number that can be stored in V8's smis (small integers) +const maxSmallIntegerV8 = 2 ** 30 - 1; // Max number that can be stored in V8's smis (small integers) export class LineAnnotationController implements Disposable { private _cancellation: CancellationTokenSource | undefined; diff --git a/src/api/actionRunners.ts b/src/api/actionRunners.ts index dd7b3e3e6411a..11ee28c0fad36 100644 --- a/src/api/actionRunners.ts +++ b/src/api/actionRunners.ts @@ -10,7 +10,7 @@ import { sortCompare } from '../system/string'; import { getQuickPickIgnoreFocusOut } from '../system/utils'; import type { Action, ActionContext, ActionRunner } from './gitlens'; -const maxSmallIntegerV8 = 2 ** 30; // Max number that can be stored in V8's smis (small integers) +const maxSmallIntegerV8 = 2 ** 30 - 1; // Max number that can be stored in V8's smis (small integers) type Actions = ActionContext['type']; const actions: Actions[] = ['createPullRequest', 'openPullRequest', 'hover.commands']; diff --git a/src/avatars.ts b/src/avatars.ts index 62a9ec234fb08..c1d599df89e83 100644 --- a/src/avatars.ts +++ b/src/avatars.ts @@ -11,7 +11,7 @@ import { filterMap } from './system/iterable'; import { base64, equalsIgnoreCase } from './system/string'; import type { ContactPresenceStatus } from './vsls/vsls'; -const maxSmallIntegerV8 = 2 ** 30; // Max number that can be stored in V8's smis (small integers) +const maxSmallIntegerV8 = 2 ** 30 - 1; // Max number that can be stored in V8's smis (small integers) let avatarCache: Map | undefined; const avatarQueue = new Map>(); diff --git a/src/hovers/lineHoverController.ts b/src/hovers/lineHoverController.ts index b33fc154fd50d..c0f482527f92a 100644 --- a/src/hovers/lineHoverController.ts +++ b/src/hovers/lineHoverController.ts @@ -9,7 +9,7 @@ import { Logger } from '../system/logger'; import type { LinesChangeEvent } from '../trackers/lineTracker'; import { changesMessage, detailsMessage } from './hovers'; -const maxSmallIntegerV8 = 2 ** 30; // Max number that can be stored in V8's smis (small integers) +const maxSmallIntegerV8 = 2 ** 30 - 1; // Max number that can be stored in V8's smis (small integers) export class LineHoverController implements Disposable { private readonly _disposable: Disposable; diff --git a/src/system/logger.scope.ts b/src/system/logger.scope.ts index 48e55b0243e2d..73ac0e18175ce 100644 --- a/src/system/logger.scope.ts +++ b/src/system/logger.scope.ts @@ -1,4 +1,4 @@ -const maxSmallIntegerV8 = 2 ** 30; // Max number that can be stored in V8's smis (small integers) +const maxSmallIntegerV8 = 2 ** 30 - 1; // Max number that can be stored in V8's smis (small integers) const scopes = new Map(); let scopeCounter = 0; diff --git a/src/webviews/apps/shared/ipc.ts b/src/webviews/apps/shared/ipc.ts index 3cae1631d4916..a6039cf0b185f 100644 --- a/src/webviews/apps/shared/ipc.ts +++ b/src/webviews/apps/shared/ipc.ts @@ -22,7 +22,7 @@ export function getHostIpcApi() { return (_api ??= acquireVsCodeApi()); } -const maxSmallIntegerV8 = 2 ** 30; // Max number that can be stored in V8's smis (small integers) +const maxSmallIntegerV8 = 2 ** 30 - 1; // Max number that can be stored in V8's smis (small integers) let ipcSequence = 0; export function nextIpcId() { diff --git a/src/webviews/rebase/rebaseEditor.ts b/src/webviews/rebase/rebaseEditor.ts index 65a0b79db3d77..f04052669d897 100644 --- a/src/webviews/rebase/rebaseEditor.ts +++ b/src/webviews/rebase/rebaseEditor.ts @@ -48,7 +48,7 @@ import { UpdateSelectionCommandType, } from './protocol'; -const maxSmallIntegerV8 = 2 ** 30; // Max number that can be stored in V8's smis (small integers) +const maxSmallIntegerV8 = 2 ** 30 - 1; // Max number that can be stored in V8's smis (small integers) const utf8TextDecoder = new TextDecoder('utf8'); let ipcSequence = 0; diff --git a/src/webviews/webviewController.ts b/src/webviews/webviewController.ts index 97ed52fe58bec..e53673392dd4d 100644 --- a/src/webviews/webviewController.ts +++ b/src/webviews/webviewController.ts @@ -25,7 +25,7 @@ import type { WebviewCommandCallback, WebviewCommandRegistrar } from './webviewC import type { WebviewHost, WebviewProvider, WebviewShowingArgs } from './webviewProvider'; import type { WebviewPanelDescriptor, WebviewShowOptions, WebviewViewDescriptor } from './webviewsController'; -const maxSmallIntegerV8 = 2 ** 30; // Max number that can be stored in V8's smis (small integers) +const maxSmallIntegerV8 = 2 ** 30 - 1; // Max number that can be stored in V8's smis (small integers) const utf8TextDecoder = new TextDecoder('utf8'); const utf8TextEncoder = new TextEncoder(); From aeda3b5c0921671dda9ca9f43f3901a6bf5c781f Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 28 Feb 2024 01:06:36 -0500 Subject: [PATCH 0546/1012] Improves perf of template formatting --- package.json | 2 +- .../gutterBlameAnnotationProvider.ts | 9 ++- src/git/formatters/formatter.ts | 81 ++++++++++--------- src/system/string.ts | 66 +++++++-------- yarn.lock | 8 +- 5 files changed, 81 insertions(+), 85 deletions(-) diff --git a/package.json b/package.json index a7ca312da0eba..80554d3825e2e 100644 --- a/package.json +++ b/package.json @@ -16555,7 +16555,7 @@ "@vscode/webview-ui-toolkit": "1.4.0", "ansi-regex": "6.0.1", "billboard.js": "3.11.2", - "fast-string-width": "1.0.4", + "fast-string-truncated-width": "1.1.0", "https-proxy-agent": "5.0.1", "iconv-lite": "0.6.3", "lit": "3.1.2", diff --git a/src/annotations/gutterBlameAnnotationProvider.ts b/src/annotations/gutterBlameAnnotationProvider.ts index 931e5f2defcad..69eadd91c7284 100644 --- a/src/annotations/gutterBlameAnnotationProvider.ts +++ b/src/annotations/gutterBlameAnnotationProvider.ts @@ -106,6 +106,8 @@ export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase { computedHeatmap = this.getComputedHeatmap(blame); } + let emptyLine: string | undefined; + for (const l of blame.lines) { // editor lines are 0-based const editorLine = l.line - 1; @@ -117,11 +119,16 @@ export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase { gutter = { ...gutter }; if (cfg.compact && !compacted) { + // Since the line length is the same just generate a single new empty line + if (emptyLine == null) { + emptyLine = GlyphChars.Space.repeat(getWidth(gutter.renderOptions!.before!.contentText!)); + } + // Since we are wiping out the contextText make sure to copy the objects gutter.renderOptions = { before: { ...gutter.renderOptions!.before, - contentText: GlyphChars.Space.repeat(getWidth(gutter.renderOptions!.before!.contentText!)), + contentText: emptyLine, }, }; diff --git a/src/git/formatters/formatter.ts b/src/git/formatters/formatter.ts index af95cd6b673d0..af1c17b50ca7b 100644 --- a/src/git/formatters/formatter.ts +++ b/src/git/formatters/formatter.ts @@ -1,13 +1,5 @@ import type { TokenOptions } from '../../system/string'; -import { - getTokensFromTemplate, - getWidth, - interpolate, - interpolateAsync, - padLeft, - padRight, - truncate, -} from '../../system/string'; +import { getTokensFromTemplate, getTruncatedWidth, getWidth, interpolate, interpolateAsync } from '../../system/string'; export interface FormatOptions { dateFormat?: string | null; @@ -22,6 +14,14 @@ const spaceReplacementRegex = / /g; export declare type RequiredTokenOptions = Options & Required>; +const defaultTokenOptions: Required = { + collapseWhitespace: false, + padDirection: 'left', + prefix: undefined, + suffix: undefined, + truncateTo: undefined, +}; + export abstract class Formatter { protected _item!: Item; protected _options!: RequiredTokenOptions; @@ -57,51 +57,52 @@ export abstract class Formatter 0) { - if (options.collapseWhitespace) { - this.collapsableWhitespace = diff; - } + max += this.collapsableWhitespace; + this.collapsableWhitespace = 0; + + const r = getTruncatedWidth(s, max, suffixWidth + 1); + if (r.truncated) return `${s.slice(0, r.index)}${options.suffix ?? ''}${r.ellipsed ? '\u2026' : ''}`; + + let width = r.width; + if (options.suffix) { + s += options.suffix; + width += suffixWidth; + } + + if (width === max) return s; - if (options.padDirection === 'left') { - s = padLeft(s, max, undefined, width); - } else { - if (options.collapseWhitespace) { - max -= diff; - } - s = padRight(s, max, undefined, width); - } - } else if (diff < 0) { - s = truncate(s, max, undefined, width); - } + if (options.collapseWhitespace) { + this.collapsableWhitespace = max - width; } - if (options.prefix || options.suffix) { - s = `${options.prefix ?? ''}${s}${options.suffix ?? ''}`; + if (options.padDirection === 'left') { + return s.padStart(max, '\u00a0'); } - return s; + if (options.collapseWhitespace) return s; + + return s.padEnd(max, '\u00a0'); } private static _formatter: Formatter | undefined = undefined; diff --git a/src/system/string.ts b/src/system/string.ts index 04c52c2e32ed8..b18261508eb59 100644 --- a/src/system/string.ts +++ b/src/system/string.ts @@ -1,6 +1,9 @@ -// import ansiRegex from 'ansi-regex'; -import type { Options as FastStringWidthOptions } from 'fast-string-width'; -import getStringWidth from 'fast-string-width'; +import type { + WidthOptions as StringWidthOptions, + TruncationOptions as StringWidthTruncationOptions, + Result as TruncatedStringWidthResult, +} from 'fast-string-truncated-width'; +import getTruncatedStringWidth from 'fast-string-truncated-width'; import { hrtime } from '@env/hrtime'; import { CharCode } from '../constants'; @@ -211,7 +214,12 @@ export function* getLines(data: string | string[], char: string = '\n'): Iterabl } } -const defaultWidthOptions: FastStringWidthOptions = { +const defaultTruncationOptions: StringWidthTruncationOptions = { + ellipsisWidth: 0, + limit: 2 ** 30 - 1, +}; + +const defaultWidthOptions: StringWidthOptions = { ansiWidth: 0, controlWidth: 0, ambiguousWidth: 1, @@ -221,10 +229,24 @@ const defaultWidthOptions: FastStringWidthOptions = { wideWidth: 2, }; +export function getTruncatedWidth(s: string, limit: number, ellipsisWidth: number): TruncatedStringWidthResult { + if (s == null || s.length === 0) { + return { + truncated: false, + ellipsed: false, + width: 0, + index: 0, + }; + } + + return getTruncatedStringWidth(s, { limit: limit, ellipsisWidth: ellipsisWidth ?? 0 }, defaultWidthOptions); +} + export function getWidth(s: string): number { if (s == null || s.length === 0) return 0; - return getStringWidth(s, defaultWidthOptions); + const result = getTruncatedStringWidth(s, defaultTruncationOptions, defaultWidthOptions); + return result.width; } const superscripts = ['\u00B9', '\u00B2', '\u00B3', '\u2074', '\u2075', '\u2076', '\u2077', '\u2078', '\u2079']; @@ -478,40 +500,6 @@ export function pad(s: string, before: number = 0, after: number = 0, padding: s return `${before === 0 ? '' : padding.repeat(before)}${s}${after === 0 ? '' : padding.repeat(after)}`; } -export function padLeft(s: string, padTo: number, padding: string = '\u00a0', width?: number) { - const diff = padTo - (width ?? getWidth(s)); - return diff <= 0 ? s : padding.repeat(diff) + s; -} - -export function padLeftOrTruncate(s: string, max: number, padding?: string, width?: number) { - width = width ?? getWidth(s); - if (width < max) return padLeft(s, max, padding, width); - if (width > max) return truncate(s, max, undefined, width); - return s; -} - -export function padRight(s: string, padTo: number, padding: string = '\u00a0', width?: number) { - const diff = padTo - (width ?? getWidth(s)); - return diff <= 0 ? s : s + padding.repeat(diff); -} - -export function padOrTruncate(s: string, max: number, padding?: string, width?: number) { - const left = max < 0; - max = Math.abs(max); - - width = width ?? getWidth(s); - if (width < max) return left ? padLeft(s, max, padding, width) : padRight(s, max, padding, width); - if (width > max) return truncate(s, max, undefined, width); - return s; -} - -export function padRightOrTruncate(s: string, max: number, padding?: string, width?: number) { - width = width ?? getWidth(s); - if (width < max) return padRight(s, max, padding, width); - if (width > max) return truncate(s, max); - return s; -} - export function pluralize( s: string, count: number, diff --git a/yarn.lock b/yarn.lock index 9f514a78cabac..398efd361d875 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3433,10 +3433,10 @@ fast-memoize@^2.5.1: resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz#79e3bb6a4ec867ea40ba0e7146816f6cdce9b57e" integrity sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw== -fast-string-width@1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/fast-string-width/-/fast-string-width-1.0.4.tgz#2be6909809f1c3195b7a9c5693e5209222794b07" - integrity sha512-LNP+TPEioODMdFEdjq/h1Ck4220TnS7pgI5fzHMtzfbP6kGkereW1KgeBAAazMEa4M2MvqEibnY4lrIvVn6JmA== +fast-string-truncated-width@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fast-string-truncated-width/-/fast-string-truncated-width-1.1.0.tgz#ebc811d7b1d8c86eed50f412fffcbe31fe5ee17f" + integrity sha512-FfsFREOllHpnSl6cxpLi6wvqd9UebrZPxWlOJCCcWoOJzy02xyjPbafF9tyg2Usnf3GLmRr5Q6s7n+GO+6VB5A== fastest-levenshtein@^1.0.12: version "1.0.16" From bdae0de5b66a214381add22c57f5c5489d904447 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 28 Feb 2024 01:08:10 -0500 Subject: [PATCH 0547/1012] Updates CHANGELOG --- CHANGELOG.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 540dc1994ddf4..f0fe8706e4307 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,23 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] +### Added + +- Adds the repository name as a prefix to worktree name when adding to the current workspace +- Adds a better message when stashing only untracked files without including untracked files + +### Changed + +- Re-adds _Add to Workspace_ option when creating a worktree — closes [#3160](https://github.com/gitkraken/vscode-gitlens/issues/3160) +- Changes _Commit Graph_ date style to default to the default date style — refs [#3153](https://github.com/gitkraken/vscode-gitlens/issues/3153) +- Improves _File Blame_ annotations performance and layout accuracy with certain character sets +- Improves string formatting performance + +### Fixed + +- Fixes double encoding of redirect URLs during account sign-in which affects certain environments +- Fixes issue when switching to a worktree via branch switch when there are multiple repos in the workspace + ## [14.8.2] - 2024-02-16 ### Fixed From cf345c342601bf551c6a583170b17f07db02f899 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Tue, 27 Feb 2024 15:53:15 -0500 Subject: [PATCH 0548/1012] Closes #3153 adds defaultDateStyle preference to commit details --- .../commitDetails/components/gl-commit-details.ts | 9 ++++++--- .../apps/shared/components/commit/commit-identity.ts | 9 ++++++++- .../apps/shared/components/formatted-date.ts | 10 +++++++--- .../shared/components/rich/issue-pull-request.ts | 12 +++++++++++- src/webviews/commitDetails/commitDetailsWebview.ts | 2 ++ src/webviews/commitDetails/protocol.ts | 3 ++- 6 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/webviews/apps/commitDetails/components/gl-commit-details.ts b/src/webviews/apps/commitDetails/components/gl-commit-details.ts index e418dc1472072..614e79cbddc43 100644 --- a/src/webviews/apps/commitDetails/components/gl-commit-details.ts +++ b/src/webviews/apps/commitDetails/components/gl-commit-details.ts @@ -273,7 +273,8 @@ export class GlCommitDetails extends GlDetailsBase { key="#${pr.id}" status="${pr.state}" date=${pr.date} - dateFormat="${this.state!.preferences.dateFormat}" + .dateFormat="${this.state!.preferences.dateFormat}" + .dateStyle="${this.state!.preferences.dateStyle}" >

    `, @@ -293,7 +294,8 @@ export class GlCommitDetails extends GlDetailsBase { key="${issue.id}" status="${issue.state}" date="${issue.closed ? issue.closedDate : issue.date}" - dateFormat="${this.state!.preferences.dateFormat}" + .dateFormat="${this.state!.preferences.dateFormat}" + .dateStyle="${this.state!.preferences.dateStyle}" > `, )} @@ -490,8 +492,9 @@ export class GlCommitDetails extends GlDetailsBase { email="${details.author.email}" date=${details.author.date} dateFormat="${this.preferences?.dateFormat}" + dateStyle="${this.preferences?.dateStyle}" avatarUrl="${details.author.avatar ?? ''}" - showAvatar="${this.preferences?.avatars ?? true}" + .showAvatar="${this.preferences?.avatars ?? true}" actionLabel="${details.sha === uncommittedSha ? 'modified' : 'committed'}" > diff --git a/src/webviews/apps/shared/components/commit/commit-identity.ts b/src/webviews/apps/shared/components/commit/commit-identity.ts index 3a071a471ac33..a3899c306ee69 100644 --- a/src/webviews/apps/shared/components/commit/commit-identity.ts +++ b/src/webviews/apps/shared/components/commit/commit-identity.ts @@ -61,6 +61,9 @@ export class CommitIdentity extends LitElement { @property() dateFormat = 'MMMM Do, YYYY h:mma'; + @property() + dateStyle: 'relative' | 'absolute' = 'relative'; + @property({ type: Boolean }) committer = false; @@ -78,7 +81,11 @@ export class CommitIdentity extends LitElement { ${this.name} ${this.actionLabel} - + `; } diff --git a/src/webviews/apps/shared/components/formatted-date.ts b/src/webviews/apps/shared/components/formatted-date.ts index 1d38316f94a11..d74ac25661a3b 100644 --- a/src/webviews/apps/shared/components/formatted-date.ts +++ b/src/webviews/apps/shared/components/formatted-date.ts @@ -6,14 +6,18 @@ import { dateConverter } from './converters/date-converter'; @customElement('formatted-date') export class FormattedDate extends LitElement { @property() - format = 'MMMM Do, YYYY h:mma'; + format?: string; + + @property({ attribute: 'date-style' }) + dateStyle: 'relative' | 'absolute' = 'relative'; @property({ converter: dateConverter(), reflect: true }) date = new Date(); override render() { - return html`${this.dateStyle === 'relative' ? fromNow(this.date) : formattedDate}`; } } diff --git a/src/webviews/apps/shared/components/rich/issue-pull-request.ts b/src/webviews/apps/shared/components/rich/issue-pull-request.ts index 5580e9c918c64..6ba4b76a82471 100644 --- a/src/webviews/apps/shared/components/rich/issue-pull-request.ts +++ b/src/webviews/apps/shared/components/rich/issue-pull-request.ts @@ -49,6 +49,12 @@ export class IssuePullRequest extends LitElement { @property() date = ''; + @property() + dateFormat?: string; + + @property() + dateStyle?: string; + @property() status: 'opened' | 'closed' | 'merged' = 'merged'; @@ -62,7 +68,11 @@ export class IssuePullRequest extends LitElement { if (this.date === '') { return nothing; } - return html``; + return html``; } override render() { diff --git a/src/webviews/commitDetails/commitDetailsWebview.ts b/src/webviews/commitDetails/commitDetailsWebview.ts index e5c794103c6ab..5952019e83f3b 100644 --- a/src/webviews/commitDetails/commitDetailsWebview.ts +++ b/src/webviews/commitDetails/commitDetailsWebview.ts @@ -401,6 +401,7 @@ export class CommitDetailsWebviewProvider if ( configuration.changed(e, [ 'defaultDateFormat', + 'defaultDateStyle', 'views.commitDetails.files', 'views.commitDetails.avatars', ]) || @@ -431,6 +432,7 @@ export class CommitDetailsWebviewProvider autolinksExpanded: this.container.storage.getWorkspace('views:commitDetails:autolinksExpanded') ?? true, avatars: configuration.get('views.commitDetails.avatars'), dateFormat: configuration.get('defaultDateFormat') ?? 'MMMM Do, YYYY h:mma', + dateStyle: configuration.get('defaultDateStyle') ?? 'relative', files: configuration.get('views.commitDetails.files'), indentGuides: configuration.getCore('workbench.tree.renderIndentGuides') ?? 'onHover', indent: configuration.getCore('workbench.tree.indent'), diff --git a/src/webviews/commitDetails/protocol.ts b/src/webviews/commitDetails/protocol.ts index 0815b035218d1..1133063b4fd55 100644 --- a/src/webviews/commitDetails/protocol.ts +++ b/src/webviews/commitDetails/protocol.ts @@ -1,6 +1,6 @@ import type { TextDocumentShowOptions } from 'vscode'; import type { Autolink } from '../../annotations/autolinks'; -import type { Config } from '../../config'; +import type { Config, DateStyle } from '../../config'; import type { GitCommitIdentityShape, GitCommitStats } from '../../git/models/commit'; import type { GitFileChangeShape } from '../../git/models/file'; import type { IssueOrPullRequest } from '../../git/models/issue'; @@ -36,6 +36,7 @@ export interface Preferences { autolinksExpanded: boolean; avatars: boolean; dateFormat: DateTimeFormat | string; + dateStyle: DateStyle; files: Config['views']['commitDetails']['files']; indent: number | undefined; indentGuides: 'none' | 'onHover' | 'always'; From 67efa3b4d0e286f6bc2d2c8ac85ab2c2383b75a9 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Tue, 27 Feb 2024 16:01:08 -0500 Subject: [PATCH 0549/1012] Updates CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0fe8706e4307..9898e98737fbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Fixes double encoding of redirect URLs during account sign-in which affects certain environments - Fixes issue when switching to a worktree via branch switch when there are multiple repos in the workspace +- Fixes [#3153](https://github.com/gitkraken/vscode-gitlens/issues/3153) - `gitlens.defaultDateStyle` not working in Commit Details view ## [14.8.2] - 2024-02-16 From 01fa090c9359831ce54f8c52734da5b689ce4b31 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Thu, 29 Feb 2024 11:31:16 -0500 Subject: [PATCH 0550/1012] Consolidates id counters --- src/api/actionRunners.ts | 16 +++------------- src/system/counter.ts | 18 ++++++++++++++++++ src/system/decorators/log.ts | 4 ++-- src/system/logger.scope.ts | 20 +++++--------------- src/system/string.ts | 2 +- src/webviews/apps/shared/ipc.ts | 15 ++++----------- src/webviews/rebase/rebaseEditor.ts | 28 +++++----------------------- src/webviews/webviewController.ts | 16 +++------------- 8 files changed, 41 insertions(+), 78 deletions(-) create mode 100644 src/system/counter.ts diff --git a/src/api/actionRunners.ts b/src/api/actionRunners.ts index 11ee28c0fad36..46d3461c2b859 100644 --- a/src/api/actionRunners.ts +++ b/src/api/actionRunners.ts @@ -6,12 +6,11 @@ import type { Container } from '../container'; import { registerCommand } from '../system/command'; import { configuration } from '../system/configuration'; import { setContext } from '../system/context'; +import { getScopedCounter } from '../system/counter'; import { sortCompare } from '../system/string'; import { getQuickPickIgnoreFocusOut } from '../system/utils'; import type { Action, ActionContext, ActionRunner } from './gitlens'; -const maxSmallIntegerV8 = 2 ** 30 - 1; // Max number that can be stored in V8's smis (small integers) - type Actions = ActionContext['type']; const actions: Actions[] = ['createPullRequest', 'openPullRequest', 'hover.commands']; @@ -56,16 +55,7 @@ class NoActionRunnersQuickPickItem implements QuickPickItem { } } -let runnerId = 0; -function nextRunnerId() { - if (runnerId === maxSmallIntegerV8) { - runnerId = 1; - } else { - runnerId++; - } - - return runnerId; -} +const runnerIdGenerator = getScopedCounter(); class RegisteredActionRunner implements ActionRunner, Disposable { readonly id: number; @@ -75,7 +65,7 @@ class RegisteredActionRunner implements private readonly runner: ActionRunner, private readonly unregister: () => void, ) { - this.id = nextRunnerId(); + this.id = runnerIdGenerator.next(); } dispose() { diff --git a/src/system/counter.ts b/src/system/counter.ts new file mode 100644 index 0000000000000..7338fe80f6911 --- /dev/null +++ b/src/system/counter.ts @@ -0,0 +1,18 @@ +const maxSmallIntegerV8 = 2 ** 30 - 1; // Max number that can be stored in V8's smis (small integers) + +export type Counter = { readonly current: number; next(): number }; + +export function getScopedCounter(): Counter { + let counter = 0; + return { + get current() { + return counter; + }, + next: function () { + if (counter === maxSmallIntegerV8) { + counter = 0; + } + return ++counter; + }, + }; +} diff --git a/src/system/decorators/log.ts b/src/system/decorators/log.ts index 00153cad7fca1..3a72cd410d97f 100644 --- a/src/system/decorators/log.ts +++ b/src/system/decorators/log.ts @@ -4,7 +4,7 @@ import { getParameters } from '../function'; import { getLoggableName, Logger } from '../logger'; import { slowCallWarningThreshold } from '../logger.constants'; import type { LogScope } from '../logger.scope'; -import { clearLogScope, getNextLogScopeId, setLogScope } from '../logger.scope'; +import { clearLogScope, logScopeIdGenerator, setLogScope } from '../logger.scope'; import { isPromise } from '../promise'; import { getDurationMilliseconds } from '../string'; @@ -107,7 +107,7 @@ export function log any>(options?: LogOptions, deb return fn!.apply(this, args); } - const scopeId = getNextLogScopeId(); + const scopeId = logScopeIdGenerator.next(); const instanceName = this != null diff --git a/src/system/logger.scope.ts b/src/system/logger.scope.ts index 73ac0e18175ce..5348d79f4cbc9 100644 --- a/src/system/logger.scope.ts +++ b/src/system/logger.scope.ts @@ -1,7 +1,8 @@ -const maxSmallIntegerV8 = 2 ** 30 - 1; // Max number that can be stored in V8's smis (small integers) +import { getScopedCounter } from './counter'; + +export const logScopeIdGenerator = getScopedCounter(); const scopes = new Map(); -let scopeCounter = 0; export interface LogScope { readonly scopeId?: number; @@ -15,30 +16,19 @@ export function clearLogScope(scopeId: number) { } export function getLogScope(): LogScope | undefined { - return scopes.get(scopeCounter); + return scopes.get(logScopeIdGenerator.current); } export function getNewLogScope(prefix: string, scope?: LogScope | undefined): LogScope { if (scope != null) return { scopeId: scope.scopeId, prefix: `${scope.prefix}${prefix}` }; - const scopeId = getNextLogScopeId(); + const scopeId = logScopeIdGenerator.next(); return { scopeId: scopeId, prefix: `[${String(scopeId).padStart(5)}] ${prefix}`, }; } -export function getLogScopeId(): number { - return scopeCounter; -} - -export function getNextLogScopeId(): number { - if (scopeCounter === maxSmallIntegerV8) { - scopeCounter = 0; - } - return ++scopeCounter; -} - export function setLogScope(scopeId: number, scope: LogScope) { scopes.set(scopeId, scope); } diff --git a/src/system/string.ts b/src/system/string.ts index b18261508eb59..97da16c24afd3 100644 --- a/src/system/string.ts +++ b/src/system/string.ts @@ -216,7 +216,7 @@ export function* getLines(data: string | string[], char: string = '\n'): Iterabl const defaultTruncationOptions: StringWidthTruncationOptions = { ellipsisWidth: 0, - limit: 2 ** 30 - 1, + limit: 2 ** 30 - 1, // Max number that can be stored in V8's smis (small integers) }; const defaultWidthOptions: StringWidthOptions = { diff --git a/src/webviews/apps/shared/ipc.ts b/src/webviews/apps/shared/ipc.ts index a6039cf0b185f..c70d1b8671d3c 100644 --- a/src/webviews/apps/shared/ipc.ts +++ b/src/webviews/apps/shared/ipc.ts @@ -1,4 +1,5 @@ /*global window */ +import { getScopedCounter } from '../../../system/counter'; import { debug, logName } from '../../../system/decorators/log'; import { getLogScope, getNewLogScope } from '../../../system/logger.scope'; import type { Serialized } from '../../../system/serialize'; @@ -22,17 +23,9 @@ export function getHostIpcApi() { return (_api ??= acquireVsCodeApi()); } -const maxSmallIntegerV8 = 2 ** 30 - 1; // Max number that can be stored in V8's smis (small integers) - -let ipcSequence = 0; -export function nextIpcId() { - if (ipcSequence === maxSmallIntegerV8) { - ipcSequence = 1; - } else { - ipcSequence++; - } - - return `webview:${ipcSequence}`; +const ipcSequencer = getScopedCounter(); +function nextIpcId() { + return `webview:${ipcSequencer.next()}`; } @logName((c, name) => `${c.appName}(${name})`) diff --git a/src/webviews/rebase/rebaseEditor.ts b/src/webviews/rebase/rebaseEditor.ts index f04052669d897..8165b3f20e3c3 100644 --- a/src/webviews/rebase/rebaseEditor.ts +++ b/src/webviews/rebase/rebaseEditor.ts @@ -16,6 +16,7 @@ import { RepositoryChange, RepositoryChangeComparisonMode } from '../../git/mode import { showRebaseSwitchToTextWarningMessage } from '../../messages'; import { executeCoreCommand } from '../../system/command'; import { configuration } from '../../system/configuration'; +import { getScopedCounter } from '../../system/counter'; import { debug, log } from '../../system/decorators/log'; import type { Deferrable } from '../../system/function'; import { debounce } from '../../system/function'; @@ -51,27 +52,8 @@ import { const maxSmallIntegerV8 = 2 ** 30 - 1; // Max number that can be stored in V8's smis (small integers) const utf8TextDecoder = new TextDecoder('utf8'); -let ipcSequence = 0; -function nextIpcId() { - if (ipcSequence === maxSmallIntegerV8) { - ipcSequence = 1; - } else { - ipcSequence++; - } - - return `host:${ipcSequence}`; -} - -let webviewId = 0; -function nextWebviewId() { - if (webviewId === maxSmallIntegerV8) { - webviewId = 1; - } else { - webviewId++; - } - - return webviewId; -} +const ipcSequencer = getScopedCounter(); +const webviewIdGenerator = getScopedCounter(); const rebaseRegex = /^\s?#\s?Rebase\s([0-9a-f]+)(?:..([0-9a-f]+))?\sonto\s([0-9a-f]+)\s.*$/im; const rebaseCommandsRegex = /^\s?(p|pick|r|reword|e|edit|s|squash|f|fixup|d|drop)\s([0-9a-f]+?)\s(.*)$/gm; @@ -193,7 +175,7 @@ export class RebaseEditorProvider implements CustomTextEditorProvider, Disposabl const context: RebaseEditorContext = { dispose: () => void Disposable.from(...subscriptions).dispose(), - id: nextWebviewId(), + id: webviewIdGenerator.next(), subscriptions: subscriptions, document: document, panel: panel, @@ -528,7 +510,7 @@ export class RebaseEditorProvider implements CustomTextEditorProvider, Disposabl const state = await this.parseState(context); void this.postMessage(context, { - id: nextIpcId(), + id: `host:${ipcSequencer.next()}`, method: DidChangeNotificationType.method, params: { state: state }, }); diff --git a/src/webviews/webviewController.ts b/src/webviews/webviewController.ts index e53673392dd4d..329f7012281eb 100644 --- a/src/webviews/webviewController.ts +++ b/src/webviews/webviewController.ts @@ -6,6 +6,7 @@ import type { Container } from '../container'; import { pauseOnCancelOrTimeout } from '../system/cancellation'; import { executeCommand, executeCoreCommand } from '../system/command'; import { setContext } from '../system/context'; +import { getScopedCounter } from '../system/counter'; import { debug, logName } from '../system/decorators/log'; import { serialize } from '../system/decorators/serialize'; import { Logger } from '../system/logger'; @@ -25,21 +26,10 @@ import type { WebviewCommandCallback, WebviewCommandRegistrar } from './webviewC import type { WebviewHost, WebviewProvider, WebviewShowingArgs } from './webviewProvider'; import type { WebviewPanelDescriptor, WebviewShowOptions, WebviewViewDescriptor } from './webviewsController'; -const maxSmallIntegerV8 = 2 ** 30 - 1; // Max number that can be stored in V8's smis (small integers) +const ipcSequencer = getScopedCounter(); const utf8TextDecoder = new TextDecoder('utf8'); const utf8TextEncoder = new TextEncoder(); -let ipcSequence = 0; -function nextIpcId() { - if (ipcSequence === maxSmallIntegerV8) { - ipcSequence = 1; - } else { - ipcSequence++; - } - - return `host:${ipcSequence}`; -} - type GetParentType = T extends WebviewPanelDescriptor ? WebviewPanel : T extends WebviewViewDescriptor @@ -503,7 +493,7 @@ export class WebviewController< } nextIpcId(): string { - return nextIpcId(); + return `host:${ipcSequencer.next()}`; } async notify>( From 3ec8f26f51b80efe403dcb82ffecbee9dedd9d0d Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Thu, 29 Feb 2024 11:33:22 -0500 Subject: [PATCH 0551/1012] Aligns naming --- src/views/commitsView.ts | 2 +- src/views/nodes/branchNode.ts | 8 ++++---- src/views/nodes/branchOrTagFolderNode.ts | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/commitsView.ts b/src/views/commitsView.ts index a4d6f78699d87..de4704d23f49a 100644 --- a/src/views/commitsView.ts +++ b/src/views/commitsView.ts @@ -51,7 +51,7 @@ export class CommitsRepositoryNode extends RepositoryFolderNode { public readonly repoPath: string, public readonly folderName: string, public readonly relativePath: string | undefined, - private readonly _expanded: boolean = false, + private readonly _expand: boolean = false, ) { super('branch-tag-folder', GitUri.fromRepoPath(repoPath), view, parent); @@ -38,7 +38,7 @@ export class BranchOrTagFolderNode extends ViewNode<'branch-tag-folder'> { for (const folder of this.root.children.values()) { if (folder.value === undefined) { // If the folder contains the current branch, expand it by default - const expanded = folder.descendants?.some(n => n.is('branch') && n.current); + const expand = folder.descendants?.some(n => n.is('branch') && n.current); children.push( new BranchOrTagFolderNode( this.view, @@ -48,7 +48,7 @@ export class BranchOrTagFolderNode extends ViewNode<'branch-tag-folder'> { this.repoPath, folder.name, folder.relativePath, - expanded, + expand, ), ); continue; @@ -65,7 +65,7 @@ export class BranchOrTagFolderNode extends ViewNode<'branch-tag-folder'> { getTreeItem(): TreeItem { const item = new TreeItem( this.label, - this._expanded ? TreeItemCollapsibleState.Expanded : TreeItemCollapsibleState.Collapsed, + this._expand ? TreeItemCollapsibleState.Expanded : TreeItemCollapsibleState.Collapsed, ); item.id = this.id; item.contextValue = ContextValues.Folder; From dd1280a6408abd58ea045a838921359964d5ae81 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Thu, 29 Feb 2024 11:56:54 -0500 Subject: [PATCH 0552/1012] Adds stash all changes to SCM repo toolbar Disabled by default --- package.json | 11 ++++++++++- src/commands/stashSave.ts | 8 ++++++++ src/config.ts | 2 +- src/webviews/apps/settings/partials/menus.html | 14 ++++++++++++++ 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 80554d3825e2e..7966a3de8d2c9 100644 --- a/package.json +++ b/package.json @@ -3688,6 +3688,9 @@ "properties": { "graph": { "type": "boolean" + }, + "stash": { + "type": "boolean" } } } @@ -3845,7 +3848,8 @@ "graph": true }, "scmRepositoryInline": { - "graph": true + "graph": true, + "stash": false }, "scmRepository": { "authors": true, @@ -11732,6 +11736,11 @@ } ], "scm/title": [ + { + "command": "gitlens.stashSave", + "when": "gitlens:enabled && config.gitlens.menus.scmRepositoryInline.stash && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && scmProvider == git", + "group": "navigation@-1001" + }, { "command": "gitlens.showGraph", "when": "gitlens:enabled && config.gitlens.menus.scmRepositoryInline.graph && gitlens:plus:enabled && scmProvider == git && scmProviderRootUri not in gitlens:plus:disallowedRepos", diff --git a/src/commands/stashSave.ts b/src/commands/stashSave.ts index ea505e1aff552..9ee13bebfb341 100644 --- a/src/commands/stashSave.ts +++ b/src/commands/stashSave.ts @@ -42,6 +42,14 @@ export class StashSaveCommand extends Command { } else if (isCommandContextViewNodeHasRepoPath(context)) { args = { ...args }; args.repoPath = context.node.repoPath; + } else if (context.type === 'scm') { + if (context.scm.rootUri != null) { + const repo = this.container.git.getRepository(context.scm.rootUri); + if (repo != null) { + args = { ...args }; + args.repoPath = repo.path; + } + } } else if (context.type === 'scm-states') { args = { ...args }; diff --git a/src/config.ts b/src/config.ts index 797f100b14f06..f376ef62e7858 100644 --- a/src/config.ts +++ b/src/config.ts @@ -450,7 +450,7 @@ export interface MenuConfig { | { readonly graph: boolean; }; - readonly scmRepositoryInline: false | { readonly graph: boolean }; + readonly scmRepositoryInline: false | { readonly graph: boolean; readonly stash: boolean }; readonly scmRepository: | false | { diff --git a/src/webviews/apps/settings/partials/menus.html b/src/webviews/apps/settings/partials/menus.html index dbd006c269bd6..e07603460efc3 100644 --- a/src/webviews/apps/settings/partials/menus.html +++ b/src/webviews/apps/settings/partials/menus.html @@ -465,6 +465,20 @@

    + +
    +
    + + +
    +

    From 04050354998c5e270bb23e6bcf86ff4f6991a929 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 4 Mar 2024 02:49:39 -0500 Subject: [PATCH 0553/1012] Updates CHANGELOG --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9898e98737fbb..a0140bf13e0bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,9 +20,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Fixed -- Fixes double encoding of redirect URLs during account sign-in which affects certain environments -- Fixes issue when switching to a worktree via branch switch when there are multiple repos in the workspace +- Fixes [#3152](https://github.com/gitkraken/vscode-gitlens/issues/3152) - Fixes double encoding of redirect URLs during account sign-in which affects certain environments - Fixes [#3153](https://github.com/gitkraken/vscode-gitlens/issues/3153) - `gitlens.defaultDateStyle` not working in Commit Details view +- Fixes issue when switching to a worktree via branch switch when there are multiple repos in the workspace ## [14.8.2] - 2024-02-16 From 11ee8e7c59a99ade2d6f52a017d9af3df6b7d421 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 4 Mar 2024 02:35:19 -0500 Subject: [PATCH 0554/1012] Fixes pull request comparisons --- CHANGELOG.md | 1 + src/constants.ts | 1 + src/git/actions/commit.ts | 24 +++- src/git/models/pullRequest.ts | 29 +++++ .../integrations/providers/github/models.ts | 4 +- src/plus/webviews/graph/graphWebview.ts | 25 +++-- src/views/nodes/branchNode.ts | 28 ++++- src/views/nodes/compareBranchNode.ts | 21 +++- src/views/nodes/compareResultsNode.ts | 104 ++++++++++-------- src/views/searchAndCompareView.ts | 46 ++------ src/views/viewCommands.ts | 26 +++-- 11 files changed, 194 insertions(+), 115 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0140bf13e0bf..017dfe64475d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Fixes [#3152](https://github.com/gitkraken/vscode-gitlens/issues/3152) - Fixes double encoding of redirect URLs during account sign-in which affects certain environments - Fixes [#3153](https://github.com/gitkraken/vscode-gitlens/issues/3153) - `gitlens.defaultDateStyle` not working in Commit Details view +- Fixes the _Open Pull Request Changes_ & _Compare Pull Request_ commands to scope the changes only to the pull request - Fixes issue when switching to a worktree via branch switch when there are multiple repos in the workspace ## [14.8.2] - 2024-02-16 diff --git a/src/constants.ts b/src/constants.ts index 53f50cccf3440..7383b854d78bd 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -970,6 +970,7 @@ export interface StoredRepoVisibilityInfo { export interface StoredBranchComparison { ref: string; + label?: string; notation: '..' | '...' | undefined; type: Exclude | undefined; checkedFiles?: string[]; diff --git a/src/git/actions/commit.ts b/src/git/actions/commit.ts index 1d1042f9e499e..9d46eaae7bc45 100644 --- a/src/git/actions/commit.ts +++ b/src/git/actions/commit.ts @@ -16,6 +16,7 @@ import { showRevisionFilesPicker } from '../../quickpicks/revisionFilesPicker'; import { executeCommand, executeCoreGitCommand, executeEditorCommand } from '../../system/command'; import { configuration } from '../../system/configuration'; import { findOrOpenEditor, findOrOpenEditors, openChangesEditor } from '../../system/utils'; +import { getAheadBehindFilesQuery } from '../../views/nodes/compareResultsNode'; import { GitUri } from '../gitUri'; import type { GitCommit } from '../models/commit'; import { isCommit } from '../models/commit'; @@ -24,6 +25,7 @@ import type { GitFile } from '../models/file'; import { GitFileChange } from '../models/file'; import type { GitRevisionReference } from '../models/reference'; import { + createRevisionRange, getReferenceFromRevision, getReferenceLabel, isUncommitted, @@ -31,8 +33,8 @@ import { shortenRevision, } from '../models/reference'; -type Ref = { repoPath: string; ref: string }; -type RefRange = { repoPath: string; rhs: string; lhs: string }; +export type Ref = { repoPath: string; ref: string }; +export type RefRange = { repoPath: string; rhs: string; lhs: string }; export interface FilesComparison { files: GitFile[]; @@ -454,6 +456,24 @@ export async function openChangesWithWorking( })); } +export async function openComparisonChanges( + container: Container, + refs: RefRange, + options?: TextDocumentShowOptions & { title?: string }, +): Promise { + refs.lhs = refs.lhs || 'HEAD'; + refs.rhs = refs.rhs || 'HEAD'; + + const { files } = await getAheadBehindFilesQuery( + container, + refs.repoPath, + createRevisionRange(refs.lhs, refs.rhs, '...'), + refs.rhs === '', + ); + + await openAllChangesInChangesEditor(files ?? [], refs, options); +} + export async function openDirectoryCompare( repoPath: string, ref: string, diff --git a/src/git/models/pullRequest.ts b/src/git/models/pullRequest.ts index 3222100a3e679..5c87184632721 100644 --- a/src/git/models/pullRequest.ts +++ b/src/git/models/pullRequest.ts @@ -2,6 +2,7 @@ import { Container } from '../../container'; import { formatDate, fromNow } from '../../system/date'; import { memoize } from '../../system/decorators/memoize'; import type { IssueOrPullRequest, IssueOrPullRequestState as PullRequestState } from './issue'; +import { shortenRevision } from './reference'; import type { RemoteProviderReference } from './remoteProvider'; export type { PullRequestState }; @@ -202,3 +203,31 @@ export class PullRequest implements PullRequestShape { return fromNow(this.date); } } + +export interface PullRequestComparisonRefs { + repoPath: string; + base: { ref: string; label: string }; + head: { ref: string; label: string }; +} + +export async function getComparisonRefsForPullRequest( + container: Container, + repoPath: string, + prRefs: PullRequestRefs, +): Promise { + const refs: PullRequestComparisonRefs = { + repoPath: repoPath, + base: { ref: prRefs.base.sha, label: `${prRefs.base.branch} (${shortenRevision(prRefs.base.sha)})` }, + head: { ref: prRefs.head.sha, label: prRefs.head.branch }, + }; + + // Find the merge base to show a more accurate comparison for the PR + const mergeBase = + (await container.git.getMergeBase(refs.repoPath, refs.base.ref, refs.head.ref, { forkPoint: true })) ?? + (await container.git.getMergeBase(refs.repoPath, refs.base.ref, refs.head.ref)); + if (mergeBase != null) { + refs.base = { ref: mergeBase, label: `${prRefs.base.branch} (${shortenRevision(mergeBase)})` }; + } + + return refs; +} diff --git a/src/plus/integrations/providers/github/models.ts b/src/plus/integrations/providers/github/models.ts index 013a36dd34f01..111cf6da62d46 100644 --- a/src/plus/integrations/providers/github/models.ts +++ b/src/plus/integrations/providers/github/models.ts @@ -185,7 +185,7 @@ export function fromGitHubPullRequest(pr: GitHubPullRequest, provider: Provider) head: { exists: pr.headRepository != null, owner: pr.headRepository?.owner.login, - repo: pr.baseRepository?.name, + repo: pr.headRepository?.name, sha: pr.headRefOid, branch: pr.headRefName, url: pr.headRepository?.url, @@ -284,7 +284,7 @@ export function fromGitHubPullRequestDetailed(pr: GitHubDetailedPullRequest, pro head: { exists: pr.headRepository != null, owner: pr.headRepository?.owner.login, - repo: pr.baseRepository?.name, + repo: pr.headRepository?.name, sha: pr.headRefOid, branch: pr.headRefName, url: pr.headRepository?.url, diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts index b7dbb5a684a77..680fb630aa2cf 100644 --- a/src/plus/webviews/graph/graphWebview.ts +++ b/src/plus/webviews/graph/graphWebview.ts @@ -22,6 +22,7 @@ import { openAllChangesIndividually, openAllChangesWithWorking, openAllChangesWithWorkingIndividually, + openComparisonChanges, openFiles, openFilesAtRevision, openOnlyChangedFiles, @@ -39,6 +40,7 @@ import type { GitCommit } from '../../../git/models/commit'; import { uncommitted } from '../../../git/models/constants'; import { GitContributor } from '../../../git/models/contributor'; import type { GitGraph, GitGraphRowType } from '../../../git/models/graph'; +import { getComparisonRefsForPullRequest } from '../../../git/models/pullRequest'; import type { GitBranchReference, GitReference, @@ -2689,14 +2691,18 @@ export class GraphWebviewProvider implements WebviewProvider + n.is('compare-branch'), + ); + if (comparisonNode != null) { + const comparison = getPullRequestComparison(pr); + if (comparison != null) { + await comparisonNode.setDefaultCompareWith(comparison); + } + } + } } // Refresh this node to add the pull request node or remove the spinner @@ -319,6 +344,7 @@ export class BranchNode branch, this.options.showComparison, this.splatted, + getPullRequestComparison(pullRequest), ), ); } diff --git a/src/views/nodes/compareBranchNode.ts b/src/views/nodes/compareBranchNode.ts index d171395d3bbf8..54606c57ba463 100644 --- a/src/views/nodes/compareBranchNode.ts +++ b/src/views/nodes/compareBranchNode.ts @@ -49,12 +49,16 @@ export class CompareBranchNode extends SubscribeableViewNode< private showComparison: ViewShowBranchComparison, // Specifies that the node is shown as a root public readonly root: boolean = false, + defaultCompareWith?: StoredBranchComparison, ) { super('compare-branch', uri, view, parent); this.updateContext({ branch: branch, root: root, storedComparisonId: this.getStorageId() }); this._uniqueId = getViewNodeId(this.type, this.context); this.loadCompareWith(); + if (defaultCompareWith != null) { + void this.setDefaultCompareWith(defaultCompareWith); + } } protected override etag(): number { @@ -199,12 +203,12 @@ export class CompareBranchNode extends SubscribeableViewNode< this.compareWithWorkingTree ? 'Working Tree' : this.branch.name } with a branch, tag, or ref`; } else { - label = `Compare ${this.compareWithWorkingTree ? 'Working Tree' : this.branch.name} with ${shortenRevision( - this._compareWith.ref, - { + label = `Compare ${this.compareWithWorkingTree ? 'Working Tree' : this.branch.name} with ${ + this._compareWith.label ?? + shortenRevision(this._compareWith.ref, { strings: { working: 'Working Tree' }, - }, - )}`; + }) + }`; state = TreeItemCollapsibleState.Collapsed; } @@ -270,6 +274,13 @@ export class CompareBranchNode extends SubscribeableViewNode< this.view.triggerNodeChange(this); } + @log() + async setDefaultCompareWith(compareWith: StoredBranchComparison) { + if (this._compareWith != null) return; + + await this.updateCompareWith(compareWith); + } + private get comparisonType() { return this._compareWith?.type ?? this.showComparison; } diff --git a/src/views/nodes/compareResultsNode.ts b/src/views/nodes/compareResultsNode.ts index b357a7501b7a4..7462e0712216d 100644 --- a/src/views/nodes/compareResultsNode.ts +++ b/src/views/nodes/compareResultsNode.ts @@ -2,6 +2,7 @@ import type { Disposable, TreeCheckboxChangeEvent } from 'vscode'; import { ThemeIcon, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, window } from 'vscode'; import { md5 } from '@env/crypto'; import type { StoredNamedRef } from '../../constants'; +import type { Container } from '../../container'; import type { FilesComparison } from '../../git/actions/commit'; import { GitUri } from '../../git/gitUri'; import { createRevisionRange, shortenRevision } from '../../git/models/reference'; @@ -285,53 +286,7 @@ export class CompareResultsNode extends SubscribeableViewNode< comparison: string, compareWithWorkingTree: boolean, ): Promise { - const [filesResult, workingFilesResult, statsResult, workingStatsResult] = await Promise.allSettled([ - this.view.container.git.getDiffStatus(this.repoPath, comparison), - compareWithWorkingTree ? this.view.container.git.getDiffStatus(this.repoPath, 'HEAD') : undefined, - this.view.container.git.getChangedFilesCount(this.repoPath, comparison), - compareWithWorkingTree ? this.view.container.git.getChangedFilesCount(this.repoPath, 'HEAD') : undefined, - ]); - - let files = getSettledValue(filesResult) ?? []; - let stats: FilesQueryResults['stats'] = getSettledValue(statsResult); - - if (compareWithWorkingTree) { - const workingFiles = getSettledValue(workingFilesResult); - if (workingFiles != null) { - if (files.length === 0) { - files = workingFiles ?? []; - } else { - for (const wf of workingFiles) { - const index = files.findIndex(f => f.path === wf.path); - if (index !== -1) { - files.splice(index, 1, wf); - } else { - files.push(wf); - } - } - } - } - - const workingStats = getSettledValue(workingStatsResult); - if (workingStats != null) { - if (stats == null) { - stats = workingStats; - } else { - stats = { - additions: stats.additions + workingStats.additions, - deletions: stats.deletions + workingStats.deletions, - changedFiles: files.length, - approximated: true, - }; - } - } - } - - return { - label: `${pluralize('file', files.length, { zero: 'No' })} changed`, - files: files, - stats: stats, - }; + return getAheadBehindFilesQuery(this.view.container, this.repoPath, comparison, compareWithWorkingTree); } private getCommitsQuery(range: string): (limit: number | undefined) => Promise { @@ -416,6 +371,61 @@ export class CompareResultsNode extends SubscribeableViewNode< } } +export async function getAheadBehindFilesQuery( + container: Container, + repoPath: string, + comparison: string, + compareWithWorkingTree: boolean, +): Promise { + const [filesResult, workingFilesResult, statsResult, workingStatsResult] = await Promise.allSettled([ + container.git.getDiffStatus(repoPath, comparison), + compareWithWorkingTree ? container.git.getDiffStatus(repoPath, 'HEAD') : undefined, + container.git.getChangedFilesCount(repoPath, comparison), + compareWithWorkingTree ? container.git.getChangedFilesCount(repoPath, 'HEAD') : undefined, + ]); + + let files = getSettledValue(filesResult) ?? []; + let stats: FilesQueryResults['stats'] = getSettledValue(statsResult); + + if (compareWithWorkingTree) { + const workingFiles = getSettledValue(workingFilesResult); + if (workingFiles != null) { + if (files.length === 0) { + files = workingFiles ?? []; + } else { + for (const wf of workingFiles) { + const index = files.findIndex(f => f.path === wf.path); + if (index !== -1) { + files.splice(index, 1, wf); + } else { + files.push(wf); + } + } + } + } + + const workingStats = getSettledValue(workingStatsResult); + if (workingStats != null) { + if (stats == null) { + stats = workingStats; + } else { + stats = { + additions: stats.additions + workingStats.additions, + deletions: stats.deletions + workingStats.deletions, + changedFiles: files.length, + approximated: true, + }; + } + } + } + + return { + label: `${pluralize('file', files.length, { zero: 'No' })} changed`, + files: files, + stats: stats, + }; +} + export function getComparisonStoragePrefix(storageId: string) { return `${storageId}|`; } diff --git a/src/views/searchAndCompareView.ts b/src/views/searchAndCompareView.ts index 77f50bd0e0a0c..79b6d1f6b41c3 100644 --- a/src/views/searchAndCompareView.ts +++ b/src/views/searchAndCompareView.ts @@ -1,10 +1,9 @@ -import type { ConfigurationChangeEvent, Disposable, TextDocumentShowOptions } from 'vscode'; +import type { ConfigurationChangeEvent, Disposable } from 'vscode'; import { TreeItem, TreeItemCollapsibleState } from 'vscode'; import type { SearchAndCompareViewConfig, ViewFilesLayout } from '../config'; import type { StoredNamedRef, StoredSearchAndCompareItem } from '../constants'; import { Commands } from '../constants'; import type { Container } from '../container'; -import { openAllChangesInChangesEditor } from '../git/actions/commit'; import { unknownGitUri } from '../git/gitUri'; import type { GitLog } from '../git/models/log'; import { isRevisionRange, shortenRevision, splitRevisionRange } from '../git/models/reference'; @@ -377,44 +376,19 @@ export class SearchAndCompareView extends ViewBase< options?: { reveal?: boolean }, ): Promise { return this.addResults( - this.createCompareResultsNode(repoPath, ref1, ref2), + new CompareResultsNode( + this, + this.ensureRoot(), + repoPath, + typeof ref1 === 'string' ? { ref: ref1 } : ref1, + typeof ref2 === 'string' ? { ref: ref2 } : ref2, + // Provide a timestamp so we won't try to add it to our storage prematurely (and end up with a duplicate) + Date.now(), + ), options?.reveal === false ? false : undefined, ); } - private createCompareResultsNode( - repoPath: string, - ref1: string | StoredNamedRef, - ref2: string | StoredNamedRef, - ): CompareResultsNode { - return new CompareResultsNode( - this, - this.ensureRoot(), - repoPath, - typeof ref1 === 'string' ? { ref: ref1 } : ref1, - typeof ref2 === 'string' ? { ref: ref2 } : ref2, - // Provide a timestamp so we won't try to add it to our storage prematurely (and end up with a duplicate) - Date.now(), - ); - } - - async openComparisonChanges( - repoPath: string, - ref1: string | StoredNamedRef, - ref2: string | StoredNamedRef, - options?: TextDocumentShowOptions & { title?: string }, - ): Promise { - // TODO@eamodio this is a total hack but works -- eventually need to extract the functionality out of the CompareResultsNode - const comparison = await this.createCompareResultsNode(repoPath, ref1, ref2).getFilesComparison(); - if (!comparison?.files.length) return undefined; - - await openAllChangesInChangesEditor( - comparison.files, - { repoPath: comparison.repoPath, lhs: comparison.ref1, rhs: comparison.ref2 }, - options, - ); - } - compareWithSelected(repoPath?: string, ref?: string | StoredNamedRef) { void this.ensureRoot().compareWithSelected(repoPath, ref); } diff --git a/src/views/viewCommands.ts b/src/views/viewCommands.ts index c718346ed6a42..7854f51c0958a 100644 --- a/src/views/viewCommands.ts +++ b/src/views/viewCommands.ts @@ -20,6 +20,7 @@ import * as WorktreeActions from '../git/actions/worktree'; import { GitUri } from '../git/gitUri'; import { deletedOrMissing } from '../git/models/constants'; import { matchContributor } from '../git/models/contributor'; +import { getComparisonRefsForPullRequest } from '../git/models/pullRequest'; import { createReference, shortenRevision } from '../git/models/reference'; import { showContributorsPicker } from '../quickpicks/contributorsPicker'; import { @@ -623,24 +624,27 @@ export class ViewCommands { if (!node.is('pullrequest')) return Promise.resolve(); if (node.pullRequest.refs?.base == null || node.pullRequest.refs.head == null) return Promise.resolve(); - return this.container.searchAndCompareView.openComparisonChanges( - node.repoPath, - { ref: node.pullRequest.refs.head.sha, label: node.pullRequest.refs.head.branch }, - { ref: node.pullRequest.refs.base.sha, label: node.pullRequest.refs.base.branch }, - { title: `Changes in Pull Request #${node.pullRequest.id}` }, + const refs = await getComparisonRefsForPullRequest(this.container, node.repoPath, node.pullRequest.refs); + return CommitActions.openComparisonChanges( + this.container, + { + repoPath: refs.repoPath, + lhs: refs.base.ref, + rhs: refs.head.ref, + }, + { + title: `Changes in Pull Request #${node.pullRequest.id}`, + }, ); } @log() - private openPullRequestComparison(node: PullRequestNode) { + private async openPullRequestComparison(node: PullRequestNode) { if (!node.is('pullrequest')) return Promise.resolve(); if (node.pullRequest.refs?.base == null || node.pullRequest.refs.head == null) return Promise.resolve(); - return this.container.searchAndCompareView.compare( - node.repoPath, - { ref: node.pullRequest.refs.head.sha, label: node.pullRequest.refs.head.branch }, - { ref: node.pullRequest.refs.base.sha, label: node.pullRequest.refs.base.branch }, - ); + const refs = await getComparisonRefsForPullRequest(this.container, node.repoPath, node.pullRequest.refs); + return this.container.searchAndCompareView.compare(refs.repoPath, refs.head, refs.base); } @log() From b09d75487897e67db06323fa9b2424a920405343 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 4 Mar 2024 02:44:17 -0500 Subject: [PATCH 0555/1012] Fixes #3146 avoids timing issue adding results --- CHANGELOG.md | 1 + src/views/searchAndCompareView.ts | 37 ++++++++++++++++++------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 017dfe64475d5..1673eb34bcc83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Fixed +- Fixes [#3146](https://github.com/gitkraken/vscode-gitlens/issues/3146) - Search & Compare fails to remember items after restart - Fixes [#3152](https://github.com/gitkraken/vscode-gitlens/issues/3152) - Fixes double encoding of redirect URLs during account sign-in which affects certain environments - Fixes [#3153](https://github.com/gitkraken/vscode-gitlens/issues/3153) - `gitlens.defaultDateStyle` not working in Commit Details view - Fixes the _Open Pull Request Changes_ & _Compare Pull Request_ commands to scope the changes only to the pull request diff --git a/src/views/searchAndCompareView.ts b/src/views/searchAndCompareView.ts index 79b6d1f6b41c3..1a765bd67eb9f 100644 --- a/src/views/searchAndCompareView.ts +++ b/src/views/searchAndCompareView.ts @@ -375,16 +375,15 @@ export class SearchAndCompareView extends ViewBase< ref2: string | StoredNamedRef, options?: { reveal?: boolean }, ): Promise { - return this.addResults( - new CompareResultsNode( - this, - this.ensureRoot(), - repoPath, - typeof ref1 === 'string' ? { ref: ref1 } : ref1, - typeof ref2 === 'string' ? { ref: ref2 } : ref2, - // Provide a timestamp so we won't try to add it to our storage prematurely (and end up with a duplicate) - Date.now(), - ), + return this.addResultsNode( + () => + new CompareResultsNode( + this, + this.ensureRoot(), + repoPath, + typeof ref1 === 'string' ? { ref: ref1 } : ref1, + typeof ref2 === 'string' ? { ref: ref2 } : ref2, + ), options?.reveal === false ? false : undefined, ); } @@ -433,7 +432,10 @@ export class SearchAndCompareView extends ViewBase< return; } - await this.addResults(new SearchResultsNode(this, this.root!, repoPath, search, labels, results), reveal); + await this.addResultsNode( + () => new SearchResultsNode(this, this.root!, repoPath, search, labels, results), + reveal, + ); } getStoredNodes() { @@ -502,8 +504,8 @@ export class SearchAndCompareView extends ViewBase< return node; } - private async addResults( - results: T, + private async addResultsNode( + resultsNodeFn: () => T, reveal: | { expand?: boolean | number; @@ -517,13 +519,16 @@ export class SearchAndCompareView extends ViewBase< } const root = this.ensureRoot(); - root.addOrReplace(results); + + // Deferred creating the results node until the view is visible (otherwise we will hit a duplicate timing issue when storing the new node, but then loading it from storage during the view's initialization) + const resultsNode = resultsNodeFn(); + root.addOrReplace(resultsNode); if (reveal !== false) { - queueMicrotask(() => this.reveal(results, reveal)); + queueMicrotask(() => this.reveal(resultsNode, reveal)); } - return results; + return resultsNode; } private setFilesLayout(layout: ViewFilesLayout) { From 933fd2ba6b94bd556cb6787ce740db4bf3c5fb19 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 4 Mar 2024 11:45:52 -0500 Subject: [PATCH 0556/1012] Updates CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1673eb34bcc83..59dd5060a7a0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds the repository name as a prefix to worktree name when adding to the current workspace - Adds a better message when stashing only untracked files without including untracked files +- Adds a _Stash All Changes_ command to Source Control repository toolbar (off by default) ### Changed From e31aed43c6a4aee2a0c2058ecb5b592f1b36d7db Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 5 Mar 2024 00:33:43 -0500 Subject: [PATCH 0557/1012] Adds & updates compare with merge base commands - Adds 'Compare with Common (Merge) Base' command to review the changes if the selected branch were to be merged - Renames 'Compare Ancestry with Working Tree' to 'Compare Common (Merge) Base with Working Tree' for consistent terminology and better user understanding - Fixes issue with broken ancestor comparison --- CHANGELOG.md | 5 +++- package.json | 36 ++++++++++++++++++++++--- src/plus/webviews/graph/graphWebview.ts | 30 +++++++++++++++------ src/views/viewCommands.ts | 29 ++++++++++++++------ 4 files changed, 79 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59dd5060a7a0e..11dd7e134e8cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,14 +8,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Added +- Adds a _Compare with Common (Merge) Base_ command to branches in the _Commit Graph_ and views to review the changes if the selected branch were to be merged by comparing the common ancestor (merge base) with the current branch to the selected branch +- Adds a _Stash All Changes_ command to Source Control repository toolbar (off by default) - Adds the repository name as a prefix to worktree name when adding to the current workspace - Adds a better message when stashing only untracked files without including untracked files -- Adds a _Stash All Changes_ command to Source Control repository toolbar (off by default) ### Changed - Re-adds _Add to Workspace_ option when creating a worktree — closes [#3160](https://github.com/gitkraken/vscode-gitlens/issues/3160) - Changes _Commit Graph_ date style to default to the default date style — refs [#3153](https://github.com/gitkraken/vscode-gitlens/issues/3153) +- Renames the _Compare Ancestry with Working Tree_ command on branches to _Compare Common (Merge) Base with Working Tree_ for better clarity - Improves _File Blame_ annotations performance and layout accuracy with certain character sets - Improves string formatting performance @@ -25,6 +27,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Fixes [#3152](https://github.com/gitkraken/vscode-gitlens/issues/3152) - Fixes double encoding of redirect URLs during account sign-in which affects certain environments - Fixes [#3153](https://github.com/gitkraken/vscode-gitlens/issues/3153) - `gitlens.defaultDateStyle` not working in Commit Details view - Fixes the _Open Pull Request Changes_ & _Compare Pull Request_ commands to scope the changes only to the pull request +- Fixes broken _Compare Common (Merge) Base with Working Tree_ (previously _Compare Ancestry with Working Tree_) - Fixes issue when switching to a worktree via branch switch when there are multiple repos in the workspace ## [14.8.2] - 2024-02-16 diff --git a/package.json b/package.json index 7966a3de8d2c9..0ed1153e3d740 100644 --- a/package.json +++ b/package.json @@ -6743,7 +6743,12 @@ }, { "command": "gitlens.views.compareAncestryWithWorking", - "title": "Compare Ancestry with Working Tree", + "title": "Compare Common (Merge) Base with Working Tree", + "category": "GitLens" + }, + { + "command": "gitlens.views.compareWithMergeBase", + "title": "Compare with Common (Merge) Base", "category": "GitLens" }, { @@ -8399,7 +8404,12 @@ }, { "command": "gitlens.graph.compareAncestryWithWorking", - "title": "Compare Ancestry with Working Tree", + "title": "Compare Common (Merge) Base with Working Tree", + "category": "GitLens" + }, + { + "command": "gitlens.graph.compareWithMergeBase", + "title": "Compare with Common (Merge) Base", "category": "GitLens" }, { @@ -10038,6 +10048,10 @@ "command": "gitlens.views.compareAncestryWithWorking", "when": "false" }, + { + "command": "gitlens.views.compareWithMergeBase", + "when": "false" + }, { "command": "gitlens.views.compareWithHead", "when": "false" @@ -11182,6 +11196,10 @@ "command": "gitlens.graph.compareAncestryWithWorking", "when": "false" }, + { + "command": "gitlens.graph.compareWithMergeBase", + "when": "false" + }, { "command": "gitlens.graph.compareWithHead", "when": "false" @@ -12962,10 +12980,15 @@ "group": "4_gitlens_compare@3" }, { - "command": "gitlens.views.compareAncestryWithWorking", + "command": "gitlens.views.compareWithMergeBase", "when": "!gitlens:hasVirtualFolders && viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)/", "group": "4_gitlens_compare@4" }, + { + "command": "gitlens.views.compareAncestryWithWorking", + "when": "!gitlens:hasVirtualFolders && viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)/", + "group": "4_gitlens_compare@5" + }, { "command": "gitlens.views.compareWithSelected", "when": "!gitlens:hasVirtualFolders && viewItem =~ /gitlens:(branch|commit|stash|tag)\\b/ && gitlens:views:canCompare", @@ -14573,10 +14596,15 @@ "group": "4_gitlens_compare@3" }, { - "command": "gitlens.graph.compareAncestryWithWorking", + "command": "gitlens.graph.compareWithMergeBase", "when": "!gitlens:hasVirtualFolders && webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)/", "group": "4_gitlens_compare@4" }, + { + "command": "gitlens.graph.compareAncestryWithWorking", + "when": "!gitlens:hasVirtualFolders && webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)/", + "group": "4_gitlens_compare@5" + }, { "command": "gitlens.graph.addAuthor", "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && webviewItem =~ /gitlens:contributor\\b(?!.*?\\b\\+current\\b)/", diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts index 680fb630aa2cf..641817c03a1b8 100644 --- a/src/plus/webviews/graph/graphWebview.ts +++ b/src/plus/webviews/graph/graphWebview.ts @@ -466,6 +466,7 @@ export class GraphWebviewProvider implements WebviewProvider Date: Tue, 5 Mar 2024 02:27:27 -0500 Subject: [PATCH 0558/1012] Adds support for Claude 3 models --- CHANGELOG.md | 1 + package.json | 8 +- src/ai/aiProviderService.ts | 4 +- src/ai/anthropicProvider.ts | 370 ++++++++++++++++++++++++-------- src/ai/openaiProvider.ts | 4 +- src/quickpicks/aiModelPicker.ts | 7 + 6 files changed, 303 insertions(+), 91 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11dd7e134e8cd..17eb8c6b8a4ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Added +- Adds support for Anthropic's Claude 3 Opus & Sonnet models for GitLens' experimental AI features - Adds a _Compare with Common (Merge) Base_ command to branches in the _Commit Graph_ and views to review the changes if the selected branch were to be merged by comparing the common ancestor (merge base) with the current branch to the selected branch - Adds a _Stash All Changes_ command to Source Control repository toolbar (off by default) - Adds the repository name as a prefix to worktree name when adding to the current workspace diff --git a/package.json b/package.json index 0ed1153e3d740..0e73ae285ec77 100644 --- a/package.json +++ b/package.json @@ -3324,12 +3324,16 @@ "enum": [ "claude-instant-1", "claude-2", - "claude-2.1" + "claude-2.1", + "claude-3-opus-20240229", + "claude-3-sonnet-20240229" ], "enumDescriptions": [ "Claude Instant 1.2", "Claude 2", - "Claude 2.1" + "Claude 2.1", + "Claude 3 Opus", + "Claude 3 Sonnet" ], "markdownDescription": "Specifies the Anthropic model to use for GitLens' experimental AI features", "scope": "window", diff --git a/src/ai/aiProviderService.ts b/src/ai/aiProviderService.ts index c203e672c6750..81a162b723293 100644 --- a/src/ai/aiProviderService.ts +++ b/src/ai/aiProviderService.ts @@ -245,7 +245,9 @@ export function getMaxCharacters(model: OpenAIModels | AnthropicModels, outputLe case 'gpt-3.5-turbo': // Will point to gpt-3.5-turbo-1106 starting Dec 11, 2023 tokens = 4096; break; - case 'claude-2.1': // 200,000 tokens + case 'claude-3-opus-20240229': // 200,000 tokens + case 'claude-3-sonnet-20240229': + case 'claude-2.1': tokens = 200000; break; case 'claude-2': // 100,000 tokens diff --git a/src/ai/anthropicProvider.ts b/src/ai/anthropicProvider.ts index 2ece95246ee6b..b10a161572b25 100644 --- a/src/ai/anthropicProvider.ts +++ b/src/ai/anthropicProvider.ts @@ -39,17 +39,12 @@ export class AnthropicProvider implements AIProvider<'anthropic'> { const model = await this.getOrChooseModel(); if (model == null) return undefined; - let retries = 0; - let maxCodeCharacters = getMaxCharacters(model, 2600); - while (true) { - const code = diff.substring(0, maxCodeCharacters); - - let customPrompt = configuration.get('experimental.generateCommitMessagePrompt'); - if (!customPrompt.endsWith('.')) { - customPrompt += '.'; - } + let customPrompt = configuration.get('experimental.generateCommitMessagePrompt'); + if (!customPrompt.endsWith('.')) { + customPrompt += '.'; + } - const prompt = `\n\nHuman: You are an advanced AI programming assistant tasked with summarizing code changes into a concise and meaningful commit message. Compose a commit message that: + const systemPrompt = `You are an advanced AI programming assistant tasked with summarizing code changes into a concise and meaningful commit message. Compose a commit message that: - Strictly synthesizes meaningful information from the provided code diff - Utilizes any additional user-provided context to comprehend the rationale behind the code changes - Is clear and brief, with an informal yet professional tone, and without superfluous descriptions @@ -57,62 +52,83 @@ export class AnthropicProvider implements AIProvider<'anthropic'> { - Avoids direct mention of specific code identifiers, names, or file names, unless they are crucial for understanding the purpose of the changes - Most importantly emphasizes the 'why' of the change, its benefits, or the problem it addresses rather than only the 'what' that changed -Follow the user's instructions carefully, don't repeat yourself, don't include the code in the output, or make anything up! - -Human: Here is the code diff to use to generate the commit message: - -${code} - -${ - options?.context - ? `Human: Here is additional context which should be taken into account when generating the commit message:\n\n${options.context}` - : '' -} - -Human: ${customPrompt} - -Assistant:`; - - const request: AnthropicCompletionRequest = { - model: model, - prompt: prompt, - stream: false, - max_tokens_to_sample: 5000, - }; - const rsp = await this.fetch(apiKey, request); - if (!rsp.ok) { - let json; - try { - json = (await rsp.json()) as { error?: { type: string; message: string } } | undefined; - } catch {} - - debugger; - - if ( - retries++ < 2 && - json?.error?.type === 'invalid_request_error' && - json?.error?.message?.includes('prompt is too long') - ) { - maxCodeCharacters -= 500 * retries; - continue; - } +Follow the user's instructions carefully, don't repeat yourself, don't include the code in the output, or make anything up!`; - throw new Error( - `Unable to generate commit message: (${this.name}:${rsp.status}) ${ - json?.error?.message || rsp.statusText - })`, + try { + let result: string; + let maxCodeCharacters: number; + + if (model === 'claude-instant-1' || model === 'claude-2') { + [result, maxCodeCharacters] = await this.makeLegacyRequest( + model, + apiKey, + max => { + const code = diff.substring(0, max); + let prompt = `\n\nHuman: ${systemPrompt}\n\nHuman: Here is the code diff to use to generate the commit message:\n\n${code}\n`; + if (options?.context) { + prompt += `\nHuman: Here is additional context which should be taken into account when generating the commit message:\n\n${options.context}\n`; + } + if (customPrompt) { + prompt += `\nHuman: ${customPrompt}\n`; + } + prompt += '\nAssistant:'; + return prompt; + }, + 4096, + ); + } else { + [result, maxCodeCharacters] = await this.makeRequest( + model, + apiKey, + systemPrompt, + max => { + const code = diff.substring(0, max); + const message: Message = { + role: 'user', + content: [ + { + type: 'text', + text: 'Here is the code diff to use to generate the commit message:', + }, + { + type: 'text', + text: code, + }, + ], + }; + if (options?.context) { + message.content.push( + { + type: 'text', + text: 'Here is additional context which should be taken into account when generating the commit message:', + }, + { + type: 'text', + text: options.context, + }, + ); + } + if (customPrompt) { + message.content.push({ + type: 'text', + text: customPrompt, + }); + } + return [message]; + }, + 4096, ); } if (diff.length > maxCodeCharacters) { void window.showWarningMessage( - `The diff of the staged changes had to be truncated to ${maxCodeCharacters} characters to fit within the Anthropic's limits.`, + `The diff of the changes had to be truncated to ${maxCodeCharacters} characters to fit within the Anthropic's limits.`, ); } - const data: AnthropicCompletionResponse = await rsp.json(); - const message = data.completion.trim(); - return message; + return result; + } catch (ex) { + throw new Error(`Unable to generate commit message: ${ex.message}`); } } @@ -123,20 +139,24 @@ Assistant:`; const model = await this.getOrChooseModel(); if (model == null) return undefined; - let retries = 0; - let maxCodeCharacters = getMaxCharacters(model, 3000); - while (true) { - const code = diff.substring(0, maxCodeCharacters); - - // FYI, only Claude 2.1 support system prompts - const prompt = `${ - model !== 'claude-2.1' ? '\n\nHuman: ' : '' - }You are an advanced AI programming assistant tasked with summarizing code changes into an explanation that is both easy to understand and meaningful. Construct an explanation that: + const systemPrompt = `You are an advanced AI programming assistant tasked with summarizing code changes into an explanation that is both easy to understand and meaningful. Construct an explanation that: - Concisely synthesizes meaningful information from the provided code diff - Incorporates any additional context provided by the user to understand the rationale behind the code changes - Places the emphasis on the 'why' of the change, clarifying its benefits or addressing the problem that necessitated the change, beyond just detailing the 'what' has changed -Do not make any assumptions or invent details that are not supported by the code diff or the user-provided context. +Do not make any assumptions or invent details that are not supported by the code diff or the user-provided context.`; + + try { + let result: string; + let maxCodeCharacters: number; + + if (model === 'claude-instant-1' || model === 'claude-2') { + [result, maxCodeCharacters] = await this.makeLegacyRequest( + model, + apiKey, + max => { + const code = diff.substring(0, max); + return `\n\nHuman: ${systemPrompt} Human: Here is additional context provided by the author of the changes, which should provide some explanation to why these changes where made. Please strongly consider this information when generating your explanation: @@ -146,22 +166,85 @@ Human: Now, kindly explain the following code diff in a way that would be clear ${code} -Human: Remember to frame your explanation in a way that is suitable for a reviewer to quickly grasp the essence of the changes, the issues they resolve, and their implications on the codebase. - +Human: Remember to frame your explanation in a way that is suitable for a reviewer to quickly grasp the essence of the changes, the issues they resolve, and their implications on the codebase. And please don't explain how you arrived at the explanation, just provide the explanation. Assistant:`; + }, + 4096, + ); + } else { + [result, maxCodeCharacters] = await this.makeRequest( + model, + apiKey, + systemPrompt, + max => { + const code = diff.substring(0, max); + return [ + { + role: 'user', + content: [ + { + type: 'text', + text: 'Here is additional context provided by the author of the changes, which should provide some explanation to why these changes where made. Please strongly consider this information when generating your explanation:', + }, + { + type: 'text', + text: message, + }, + { + type: 'text', + text: 'Now, kindly explain the following code diff in a way that would be clear to someone reviewing or trying to understand these changes:', + }, + { + type: 'text', + text: code, + }, + { + type: 'text', + text: `Remember to frame your explanation in a way that is suitable for a reviewer to quickly grasp the essence of the changes, the issues they resolve, and their implications on the codebase. And please don't explain how you arrived at the explanation, just provide the explanation`, + }, + ], + }, + ]; + }, + 4096, + ); + } - const request: AnthropicCompletionRequest = { + if (diff.length > maxCodeCharacters) { + void window.showWarningMessage( + `The diff of the changes had to be truncated to ${maxCodeCharacters} characters to fit within the Anthropic's limits.`, + ); + } + + return result; + } catch (ex) { + throw new Error(`Unable to explain changes: ${ex.message}`); + } + } + + private async makeRequest( + model: Exclude, + apiKey: string, + system: string, + messages: (maxCodeCharacters: number) => Message[], + maxTokens: number, + ): Promise<[result: string, maxCodeCharacters: number]> { + let retries = 0; + let maxCodeCharacters = getMaxCharacters(model, 2600); + + while (true) { + const request: AnthropicMessageRequest = { model: model, - prompt: prompt, + messages: messages(maxCodeCharacters), + system: system, stream: false, - max_tokens_to_sample: 5000, + max_tokens: maxTokens, }; - const rsp = await this.fetch(apiKey, request); if (!rsp.ok) { let json; try { - json = (await rsp.json()) as { error?: { type: string; message: string } } | undefined; + json = (await rsp.json()) as AnthropicError | undefined; } catch {} debugger; @@ -175,24 +258,76 @@ Assistant:`; continue; } - throw new Error( - `Unable to explain commit: (${this.name}:${rsp.status}) ${json?.error?.message || rsp.statusText})`, - ); + throw new Error(`(${this.name}:${rsp.status}) ${json?.error?.message || rsp.statusText})`); } - if (diff.length > maxCodeCharacters) { - void window.showWarningMessage( - `The diff of the commit changes had to be truncated to ${maxCodeCharacters} characters to fit within the OpenAI's limits.`, - ); + const data: AnthropicMessageResponse = await rsp.json(); + const result = data.content + .map(c => c.text) + .join('\n') + .trim(); + return [result, maxCodeCharacters]; + } + } + + private fetch(apiKey: string, request: AnthropicMessageRequest) { + return fetch('https://api.anthropic.com/v1/messages', { + headers: { + Accept: 'application/json', + Authorization: `Bearer ${apiKey}`, + 'Content-Type': 'application/json', + 'X-API-Key': apiKey, + 'anthropic-version': '2023-06-01', + }, + method: 'POST', + body: JSON.stringify(request), + }); + } + + private async makeLegacyRequest( + model: Extract, + apiKey: string, + prompt: (maxCodeCharacters: number) => string, + maxTokens: number, + ): Promise<[result: string, maxCodeCharacters: number]> { + let retries = 0; + let maxCodeCharacters = getMaxCharacters(model, 2600); + + while (true) { + const request: AnthropicCompletionRequest = { + model: model, + prompt: prompt(maxCodeCharacters), + stream: false, + max_tokens_to_sample: maxTokens, + }; + const rsp = await this.fetchLegacy(apiKey, request); + if (!rsp.ok) { + let json; + try { + json = (await rsp.json()) as AnthropicError | undefined; + } catch {} + + debugger; + + if ( + retries++ < 2 && + json?.error?.type === 'invalid_request_error' && + json?.error?.message?.includes('prompt is too long') + ) { + maxCodeCharacters -= 500 * retries; + continue; + } + + throw new Error(`(${this.name}:${rsp.status}) ${json?.error?.message || rsp.statusText})`); } const data: AnthropicCompletionResponse = await rsp.json(); - const summary = data.completion.trim(); - return summary; + const result = data.completion.trim(); + return [result, maxCodeCharacters]; } } - private fetch(apiKey: string, request: AnthropicCompletionRequest) { + private fetchLegacy(apiKey: string, request: AnthropicCompletionRequest) { return fetch('https://api.anthropic.com/v1/complete', { headers: { Accept: 'application/json', @@ -270,10 +405,30 @@ async function getApiKey(storage: Storage): Promise { return apiKey; } -export type AnthropicModels = 'claude-instant-1' | 'claude-2' | 'claude-2.1'; +export type AnthropicModels = + | 'claude-instant-1' + | 'claude-2' + | 'claude-2.1' + | 'claude-3-opus-20240229' + | 'claude-3-sonnet-20240229'; + +interface AnthropicError { + type: 'error'; + error: { + type: + | 'invalid_request_error' + | 'authentication_error' + | 'permission_error' + | 'not_found_error' + | 'rate_limit_error' + | 'api_error' + | 'overloaded_error'; + message: string; + }; +} interface AnthropicCompletionRequest { - model: string; + model: Extract; prompt: string; stream: boolean; @@ -294,3 +449,46 @@ interface AnthropicCompletionResponse { exception: string | null; log_id: string; } + +interface Message { + role: 'user' | 'assistant'; + content: ( + | { type: 'text'; text: string } + | { + type: 'image'; + source: { + type: 'base64'; + media_type: `image/${'jpeg' | 'png' | 'gif' | 'webp'}`; + data: string; + }; + } + )[]; +} + +interface AnthropicMessageRequest { + model: Exclude; + messages: Message[]; + system?: string; + + max_tokens: number; + metadata?: object; + stop_sequences?: string[]; + stream?: boolean; + temperature?: number; + top_p?: number; + top_k?: number; +} + +interface AnthropicMessageResponse { + id: string; + type: 'message'; + role: 'assistant'; + content: { type: 'text'; text: string }[]; + model: string; + stop_reason: 'end_turn' | 'max_tokens' | 'stop_sequence'; + stop_sequence: string | null; + usage: { + input_tokens: number; + output_tokens: number; + }; +} diff --git a/src/ai/openaiProvider.ts b/src/ai/openaiProvider.ts index 3d0f00df45e16..e52a162971239 100644 --- a/src/ai/openaiProvider.ts +++ b/src/ai/openaiProvider.ts @@ -121,7 +121,7 @@ Follow the user's instructions carefully, don't repeat yourself, don't include t if (diff.length > maxCodeCharacters) { void window.showWarningMessage( - `The diff of the staged changes had to be truncated to ${maxCodeCharacters} characters to fit within the OpenAI's limits.`, + `The diff of the changes had to be truncated to ${maxCodeCharacters} characters to fit within the OpenAI's limits.`, ); } @@ -203,7 +203,7 @@ Do not make any assumptions or invent details that are not supported by the code if (diff.length > maxCodeCharacters) { void window.showWarningMessage( - `The diff of the commit changes had to be truncated to ${maxCodeCharacters} characters to fit within the OpenAI's limits.`, + `The diff of the changes had to be truncated to ${maxCodeCharacters} characters to fit within the OpenAI's limits.`, ); } diff --git a/src/quickpicks/aiModelPicker.ts b/src/quickpicks/aiModelPicker.ts index 87ff9dceaf6d6..e68e0642304fb 100644 --- a/src/quickpicks/aiModelPicker.ts +++ b/src/quickpicks/aiModelPicker.ts @@ -23,6 +23,13 @@ export async function showAIModelPicker(provider?: AIProviders): Promise Date: Mon, 4 Mar 2024 14:05:04 -0500 Subject: [PATCH 0559/1012] Fixes typo --- src/webviews/apps/shared/dom.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webviews/apps/shared/dom.ts b/src/webviews/apps/shared/dom.ts index 0c5ad114e01b3..b3e5eb0c287ca 100644 --- a/src/webviews/apps/shared/dom.ts +++ b/src/webviews/apps/shared/dom.ts @@ -25,7 +25,7 @@ export namespace DOM { options?: boolean | AddEventListenerOptions, ): Disposable; export function on( - elemtent: T, + element: T, name: string, listener: (e: CustomEvent & { target: HTMLElement | null }, target: T) => void, options?: boolean | AddEventListenerOptions, From 44e264bf6c05af22d5f7794f03863f945caa3e32 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Mon, 4 Mar 2024 17:57:52 -0500 Subject: [PATCH 0560/1012] Adds getting started content for home and welcome --- src/constants.ts | 1 + src/webviews/apps/home/home.html | 45 ++++++++++- src/webviews/apps/home/home.scss | 52 ++++++++++++- src/webviews/apps/home/home.ts | 28 ++++++- src/webviews/apps/welcome/welcome.html | 57 ++++++++++---- src/webviews/apps/welcome/welcome.scss | 103 +++++++++++++++++++++++++ src/webviews/home/homeWebview.ts | 48 +++++++++++- src/webviews/home/protocol.ts | 12 ++- 8 files changed, 322 insertions(+), 24 deletions(-) diff --git a/src/constants.ts b/src/constants.ts index 7383b854d78bd..b5433c868faf7 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -867,6 +867,7 @@ export type GlobalStorage = { preVersion: string; 'views:welcome:visible': boolean; 'confirm:draft:storage': boolean; + 'home:sections:collapsed': string[]; } & { [key in `confirm:ai:tos:${AIProviders}`]: boolean } & { [key in `provider:authentication:skip:${string}`]: boolean; } & { [key in `gk:${string}:checkin`]: Stored } & { diff --git a/src/webviews/apps/home/home.html b/src/webviews/apps/home/home.html index a1f589646033a..9de8c2aa9ee42 100644 --- a/src/webviews/apps/home/home.html +++ b/src/webviews/apps/home/home.html @@ -94,7 +94,9 @@

    No repository detected

    To use GitLens, open a folder containing a git repository or clone from a URL from the Explorer.

    - Open a Folder or Repository + Open a Folder or Repository

    If you have opened a folder with a repository, please let us know by @@ -112,7 +114,9 @@

    Unsafe repository

    not being owned by the current user.

    - Manage in Source Control + Manage in Source Control

    @@ -121,7 +125,9 @@

    Untrusted workspace

    Unable to open repositories in Restricted Mode.

    - Manage Workspace Trust + Manage Workspace Trust

    @@ -149,6 +155,39 @@

    Untrusted workspace

    50% off GitLens Pro (plus entire GitKraken suite) all for only $4/month

    +
    +

    Get Started with GitLens

    +
    +

    Explore all of the powerful features in GitLens

    +

    + + Open Walkthrough + + +

    +
    + + + + +

    -

    Powerful Features

    +
    +

    Get Started

    +

    + GitLens is powerful, feature rich, and highly + customizable to meet your needs. Check out our tutorial video and walkthrough + to get started. +

    +

    + + Get Started Walkthrough + +

    + +

    Tutorial Video

    +

    + + + +

    +
    + +

    Powerful Features

    All features are free to use on all repos, except for features,

    @@ -442,22 +465,24 @@

    GitKraken Labs

    -

    Get Started

    -

    - GitLens is powerful, feature rich, and highly - customizable to meet your needs. Check out our tutorial video and walkthrough to - get started. -

    +
    +

    Get Started

    +

    + GitLens is powerful, feature rich, and highly + customizable to meet your needs. Check out our tutorial video and walkthrough + to get started. +

    +

    + Get Started Walkthrough +

    -

    Tutorial Video

    - +

    Tutorial Video

    + +

    Try Pro ✨

    diff --git a/src/webviews/apps/welcome/welcome.scss b/src/webviews/apps/welcome/welcome.scss index d554713681a07..1656cf2b9165a 100644 --- a/src/webviews/apps/welcome/welcome.scss +++ b/src/webviews/apps/welcome/welcome.scss @@ -187,6 +187,28 @@ li { &-space-half { margin-bottom: 0.65rem; } + + @media (min-width: 744px) { + &-large-mt-0 { + margin-top: 0; + } + } + + &-show-large { + display: none; + + @media (min-width: 744px) { + display: block; + } + } + + &-show-small { + display: block; + + @media (min-width: 744px) { + display: none; + } + } } gk-card p { @@ -438,3 +460,84 @@ body { display: none; } } + +.button-container { + margin: 1rem auto 0; + text-align: left; + max-width: 30rem; + transition: max-width 0.2s ease-out; +} + +@media (min-width: 640px) { + .button-container { + max-width: 100%; + } +} + +.button-group { + display: inline-flex; + gap: 0.1rem; + + &--single { + width: 100%; + max-width: 30rem; + } + + gl-button { + &:not(:first-child) { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + } + &:not(:last-child) { + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + } + + video-button { + width: 100%; + } +} + +.alert { + max-width: 38.4rem; + position: relative; + padding: 0.8rem 1.2rem; + line-height: 1.2; + margin-bottom: 1.2rem; + background-color: var(--color-alert-neutralBackground); + border-left: 0.3rem solid var(--color-alert-neutralBorder); + color: var(--color-alert-foreground); + + &__title { + font-size: 1.4rem; + margin: 0; + } + + &__description { + font-size: 1.2rem; + margin: 0.4rem 0 0; + } + + &__close { + position: absolute; + top: 0.8rem; + right: 0.8rem; + color: inherit; + } + + &--info { + background-color: var(--color-alert-infoBackground); + border-left-color: var(--color-alert-infoBorder); + } + + &--warning { + background-color: var(--color-alert-warningBackground); + border-left-color: var(--color-alert-warningBorder); + } + + &--danger { + background-color: var(--color-alert-errorBackground); + border-left-color: var(--color-alert-errorBorder); + } +} diff --git a/src/webviews/home/homeWebview.ts b/src/webviews/home/homeWebview.ts index 2f5f1896aac1b..00356523e30d0 100644 --- a/src/webviews/home/homeWebview.ts +++ b/src/webviews/home/homeWebview.ts @@ -6,9 +6,16 @@ import { isSubscriptionExpired, isSubscriptionPaid, isSubscriptionTrial } from ' import type { SubscriptionChangeEvent } from '../../plus/gk/account/subscriptionService'; import { registerCommand } from '../../system/command'; import { getContext, onDidChangeContext } from '../../system/context'; +import type { IpcMessage } from '../protocol'; +import { onIpc } from '../protocol'; import type { WebviewHost, WebviewProvider } from '../webviewProvider'; -import type { DidChangeRepositoriesParams, State } from './protocol'; -import { DidChangeOrgSettingsType, DidChangeRepositoriesType, DidChangeSubscriptionType } from './protocol'; +import type { CollapseSectionParams, DidChangeRepositoriesParams, State } from './protocol'; +import { + CollapseSectionCommandType, + DidChangeOrgSettingsType, + DidChangeRepositoriesType, + DidChangeSubscriptionType, +} from './protocol'; const emptyDisposable = Object.freeze({ dispose: () => { @@ -45,6 +52,14 @@ export class HomeWebviewProvider implements WebviewProvider { return [registerCommand(`${this.host.id}.refresh`, () => this.host.refresh(true), this)]; } + onMessageReceived(e: IpcMessage) { + switch (e.method) { + case CollapseSectionCommandType.method: + onIpc(CollapseSectionCommandType, e, params => this.onCollapseSection(params)); + break; + } + } + includeBootstrap(): Promise { return this.getState(); } @@ -53,6 +68,34 @@ export class HomeWebviewProvider implements WebviewProvider { this.notifyDidChangeRepositories(); } + private onCollapseSection(params: CollapseSectionParams) { + const collapsed = this.container.storage.get('home:sections:collapsed'); + if (collapsed == null) { + if (params.collapsed === true) { + void this.container.storage.store('home:sections:collapsed', [params.section]); + } + return; + } + + const idx = collapsed.indexOf(params.section); + if (params.collapsed === true) { + if (idx === -1) { + void this.container.storage.store('home:sections:collapsed', [...collapsed, params.section]); + } + + return; + } + + if (idx !== -1) { + collapsed.splice(idx, 1); + void this.container.storage.store('home:sections:collapsed', collapsed); + } + } + + private getWalkthroughCollapsed() { + return this.container.storage.get('home:sections:collapsed')?.includes('walkthrough') ?? false; + } + private getOrgSettings(): State['orgSettings'] { return { drafts: getContext('gitlens:gk:organization:drafts:enabled', false), @@ -76,6 +119,7 @@ export class HomeWebviewProvider implements WebviewProvider { webroot: this.host.getWebRoot(), promoStates: await this.getCanShowPromos(subscription), orgSettings: this.getOrgSettings(), + walkthroughCollapsed: this.getWalkthroughCollapsed(), }; } diff --git a/src/webviews/home/protocol.ts b/src/webviews/home/protocol.ts index 07fa6c2f86a8c..19a02f693007c 100644 --- a/src/webviews/home/protocol.ts +++ b/src/webviews/home/protocol.ts @@ -1,5 +1,5 @@ import type { WebviewState } from '../protocol'; -import { IpcNotificationType } from '../protocol'; +import { IpcCommandType, IpcNotificationType } from '../protocol'; export interface State extends WebviewState { repositories: DidChangeRepositoriesParams; @@ -8,8 +8,18 @@ export interface State extends WebviewState { orgSettings: { drafts: boolean; }; + walkthroughCollapsed: boolean; } +// COMMANDS +export interface CollapseSectionParams { + section: string; + collapsed: boolean; +} +export const CollapseSectionCommandType = new IpcCommandType('home/section/collapse'); + +// NOTIFICATIONS + export interface DidChangeRepositoriesParams { count: number; openCount: number; From 57b27b888f79b941fa9115799e51b7fed256aab9 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Tue, 5 Mar 2024 10:07:20 -0500 Subject: [PATCH 0561/1012] Adds utm tracking to tutorial video links --- src/webviews/apps/home/home.html | 4 ++-- src/webviews/apps/welcome/components/video-button.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/webviews/apps/home/home.html b/src/webviews/apps/home/home.html index 9de8c2aa9ee42..409ffeabee4e9 100644 --- a/src/webviews/apps/home/home.html +++ b/src/webviews/apps/home/home.html @@ -167,7 +167,7 @@

    Get Started with GitLens

    Getting Started

    > From fd63ab72234104cc56816ae1d99123a975e7c488 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Tue, 5 Mar 2024 10:10:21 -0500 Subject: [PATCH 0562/1012] Fixes alert close hover --- src/webviews/apps/home/home.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/webviews/apps/home/home.scss b/src/webviews/apps/home/home.scss index 971fa536edb6a..e85321b4615c7 100644 --- a/src/webviews/apps/home/home.scss +++ b/src/webviews/apps/home/home.scss @@ -337,6 +337,12 @@ ul { top: 0.8rem; right: 0.8rem; color: inherit; + opacity: 0.64; + + &:hover { + color: inherit; + opacity: 1; + } } &.is-collapsed &__description, From b7e657761ff4b57398e387069f27aeaf723f84b7 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 5 Mar 2024 13:43:32 -0500 Subject: [PATCH 0563/1012] Adds 'Open All Changes with Common Base' command to branches Changes "Common (Merge) Base" to "Common Base" --- CHANGELOG.md | 7 +++-- package.json | 40 +++++++++++++++++++++---- src/plus/webviews/graph/graphWebview.ts | 27 +++++++++++++++++ src/views/viewCommands.ts | 29 +++++++++++++++++- 4 files changed, 94 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17eb8c6b8a4ac..5f2d378cf45b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Added - Adds support for Anthropic's Claude 3 Opus & Sonnet models for GitLens' experimental AI features -- Adds a _Compare with Common (Merge) Base_ command to branches in the _Commit Graph_ and views to review the changes if the selected branch were to be merged by comparing the common ancestor (merge base) with the current branch to the selected branch +- Adds a _Compare with Common Base_ command to branches in the _Commit Graph_ and views to review the changes if the selected branch were to be merged by comparing the common ancestor (merge base) with the current branch to the selected branch +- Adds an _Open All Changes with Common Base_ command to branches in the _Commit Graph_ and views to review the changes if the selected branch were to be merged in the multi-diff editor - Adds a _Stash All Changes_ command to Source Control repository toolbar (off by default) - Adds the repository name as a prefix to worktree name when adding to the current workspace - Adds a better message when stashing only untracked files without including untracked files @@ -18,7 +19,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Re-adds _Add to Workspace_ option when creating a worktree — closes [#3160](https://github.com/gitkraken/vscode-gitlens/issues/3160) - Changes _Commit Graph_ date style to default to the default date style — refs [#3153](https://github.com/gitkraken/vscode-gitlens/issues/3153) -- Renames the _Compare Ancestry with Working Tree_ command on branches to _Compare Common (Merge) Base with Working Tree_ for better clarity +- Renames the _Compare Ancestry with Working Tree_ command on branches to _Compare Common Base with Working Tree_ for better clarity - Improves _File Blame_ annotations performance and layout accuracy with certain character sets - Improves string formatting performance @@ -28,7 +29,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Fixes [#3152](https://github.com/gitkraken/vscode-gitlens/issues/3152) - Fixes double encoding of redirect URLs during account sign-in which affects certain environments - Fixes [#3153](https://github.com/gitkraken/vscode-gitlens/issues/3153) - `gitlens.defaultDateStyle` not working in Commit Details view - Fixes the _Open Pull Request Changes_ & _Compare Pull Request_ commands to scope the changes only to the pull request -- Fixes broken _Compare Common (Merge) Base with Working Tree_ (previously _Compare Ancestry with Working Tree_) +- Fixes broken _Compare Common Base with Working Tree_ (previously _Compare Ancestry with Working Tree_) - Fixes issue when switching to a worktree via branch switch when there are multiple repos in the workspace ## [14.8.2] - 2024-02-16 diff --git a/package.json b/package.json index 0e73ae285ec77..c16d86e8ee1f1 100644 --- a/package.json +++ b/package.json @@ -6747,12 +6747,18 @@ }, { "command": "gitlens.views.compareAncestryWithWorking", - "title": "Compare Common (Merge) Base with Working Tree", + "title": "Compare Common Base with Working Tree", "category": "GitLens" }, { "command": "gitlens.views.compareWithMergeBase", - "title": "Compare with Common (Merge) Base", + "title": "Compare with Common Base", + "category": "GitLens" + }, + { + "command": "gitlens.views.openChangedFileDiffsWithMergeBase", + "title": "Open All Changes with Common Base", + "icon": "$(diff-multiple)", "category": "GitLens" }, { @@ -8408,12 +8414,18 @@ }, { "command": "gitlens.graph.compareAncestryWithWorking", - "title": "Compare Common (Merge) Base with Working Tree", + "title": "Compare Common Base with Working Tree", "category": "GitLens" }, { "command": "gitlens.graph.compareWithMergeBase", - "title": "Compare with Common (Merge) Base", + "title": "Compare with Common Base", + "category": "GitLens" + }, + { + "command": "gitlens.graph.openChangedFileDiffsWithMergeBase", + "title": "Open All Changes with Common Base", + "icon": "$(diff-multiple)", "category": "GitLens" }, { @@ -10056,6 +10068,10 @@ "command": "gitlens.views.compareWithMergeBase", "when": "false" }, + { + "command": "gitlens.views.openChangedFileDiffsWithMergeBase", + "when": "false" + }, { "command": "gitlens.views.compareWithHead", "when": "false" @@ -11204,6 +11220,10 @@ "command": "gitlens.graph.compareWithMergeBase", "when": "false" }, + { + "command": "gitlens.graph.openChangedFileDiffsWithMergeBase", + "when": "false" + }, { "command": "gitlens.graph.compareWithHead", "when": "false" @@ -12963,10 +12983,15 @@ "group": "2_gitlens_quickopen@1", "alt": "gitlens.copyRemoteBranchUrl" }, + { + "command": "gitlens.views.openChangedFileDiffsWithMergeBase", + "when": "!gitlens:hasVirtualFolders && viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)/", + "group": "3_gitlens_explore@11" + }, { "command": "gitlens.views.openDirectoryDiffWithWorking", "when": "!gitlens:hasVirtualFolders && viewItem =~ /gitlens:(branch|tag)\\b/", - "group": "3_gitlens_explore@11" + "group": "3_gitlens_explore@12" }, { "command": "gitlens.views.compareWithUpstream", @@ -14584,6 +14609,11 @@ "when": "webviewItem =~ /gitlens:upstreamStatus\\b/", "group": "1_gitlens_actions@3" }, + { + "command": "gitlens.graph.openChangedFileDiffsWithMergeBase", + "when": "!gitlens:hasVirtualFolders && webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)/", + "group": "3_gitlens_explore@11" + }, { "command": "gitlens.graph.compareWithUpstream", "when": "!gitlens:hasVirtualFolders && webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+tracking\\b)/", diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts index 641817c03a1b8..fb0b237d8199c 100644 --- a/src/plus/webviews/graph/graphWebview.ts +++ b/src/plus/webviews/graph/graphWebview.ts @@ -463,6 +463,11 @@ export class GraphWebviewProvider implements WebviewProvider Date: Wed, 6 Mar 2024 13:50:25 -0500 Subject: [PATCH 0564/1012] Updates PAT requirement message for GH --- src/plus/integrations/authentication/github.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plus/integrations/authentication/github.ts b/src/plus/integrations/authentication/github.ts index ab2875523f3ba..561d40b6cbfc1 100644 --- a/src/plus/integrations/authentication/github.ts +++ b/src/plus/integrations/authentication/github.ts @@ -50,7 +50,7 @@ export class GitHubEnterpriseAuthenticationProvider implements IntegrationAuthen input.password = true; input.title = `GitHub Authentication${descriptor?.domain ? ` \u2022 ${descriptor.domain}` : ''}`; - input.placeholder = `Requires ${descriptor?.scopes.join(', ') ?? 'all'} scopes`; + input.placeholder = `Requires a classic token with ${descriptor?.scopes.join(', ') ?? 'all'} scopes`; input.prompt = supportedInVSCodeVersion('input-prompt-links') ? `Paste your [GitHub Personal Access Token](https://${ descriptor?.domain ?? 'github.com' From 69d88f808a1df88af15b82da180ebb97503a2df9 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 6 Mar 2024 14:50:26 -0500 Subject: [PATCH 0565/1012] Adds Git command palette mode tracking --- src/system/command.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/system/command.ts b/src/system/command.ts index f3aa17bf4d37e..92064eabc7842 100644 --- a/src/system/command.ts +++ b/src/system/command.ts @@ -22,7 +22,17 @@ export function registerCommand(command: string, callback: CommandCallback, this return commands.registerCommand( command, function (this: any, ...args) { - Container.instance.telemetry.sendEvent('command', { command: command }); + let context: any; + if (command === Commands.GitCommands) { + const arg = args?.[0]; + if (arg?.command != null) { + context = { mode: args[0].command }; + if (arg?.state?.subcommand != null) { + context.submode = arg.state.subcommand; + } + } + } + Container.instance.telemetry.sendEvent('command', { command: command, context: context }); callback.call(this, ...args); }, thisArg, From 3f3dad99bb8d21fc4afa04b889786637f74a754e Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Wed, 6 Mar 2024 16:14:12 -0500 Subject: [PATCH 0566/1012] Bumps to v14.9.0 --- CHANGELOG.md | 5 ++++- package.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f2d378cf45b6..8aaa0296354ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] +## [14.9.0] - 2024-03-06 + ### Added - Adds support for Anthropic's Claude 3 Opus & Sonnet models for GitLens' experimental AI features @@ -5254,7 +5256,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Initial release but still heavily a work in progress. -[unreleased]: https://github.com/gitkraken/vscode-gitlens/compare/v14.8.2...HEAD +[unreleased]: https://github.com/gitkraken/vscode-gitlens/compare/v14.9.0...HEAD +[14.9.0]: https://github.com/gitkraken/vscode-gitlens/compare/v14.8.2...gitkraken:v14.9.0 [14.8.2]: https://github.com/gitkraken/vscode-gitlens/compare/v14.8.1...gitkraken:v14.8.2 [14.8.1]: https://github.com/gitkraken/vscode-gitlens/compare/v14.8.0...gitkraken:v14.8.1 [14.8.0]: https://github.com/gitkraken/vscode-gitlens/compare/v14.7.0...gitkraken:v14.8.0 diff --git a/package.json b/package.json index c16d86e8ee1f1..eebb4f9c25328 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "gitlens", "displayName": "GitLens — Git supercharged", "description": "Supercharge Git within VS Code — Visualize code authorship at a glance via Git blame annotations and CodeLens, seamlessly navigate and explore Git repositories, gain valuable insights via rich visualizations and powerful comparison commands, and so much more", - "version": "14.8.2", + "version": "14.9.0", "engines": { "vscode": "^1.82.0" }, From 56d8eb2755a83f835c4c55812e406dcd7579c0e0 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 6 Mar 2024 19:43:51 -0500 Subject: [PATCH 0567/1012] Updates dependencies (Typescript & more) Fixes lint issues given new TS inference --- ThirdPartyNotices.txt | 64 +- package.json | 24 +- src/ai/aiProviderService.ts | 2 +- src/api/actionRunners.ts | 6 +- src/api/api.ts | 2 +- src/commands/diffWithRevision.ts | 4 +- src/commands/openFileAtRevision.ts | 4 +- src/commands/openFileAtRevisionFrom.ts | 4 +- src/git/gitProviderService.ts | 6 +- src/git/models/branch.ts | 16 +- src/git/models/contributor.ts | 4 +- src/git/remotes/remoteProviders.ts | 2 +- src/plus/gk/account/subscriptionService.ts | 2 +- src/plus/gk/checkin.ts | 2 +- .../integrations/providers/github/github.ts | 2 +- src/system/decorators/gate.ts | 2 +- src/system/decorators/log.ts | 6 +- src/system/decorators/memoize.ts | 2 +- src/system/decorators/serialize.ts | 2 +- src/views/nodes/resultsFilesNode.ts | 2 +- src/webviews/apps/plus/graph/GraphWrapper.tsx | 2 +- src/webviews/webviewCommandRegistrar.ts | 6 +- yarn.lock | 1008 ++++++++--------- 23 files changed, 601 insertions(+), 573 deletions(-) diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index 5c94c22d4fc4f..36574667cf1c8 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -3,29 +3,30 @@ GitLens THIRD-PARTY SOFTWARE NOTICES AND INFORMATION This project incorporates components from the projects listed below. -1. @lit/react version 1.0.2 (https://github.com/lit/lit) +1. @lit/react version 1.0.3 (https://github.com/lit/lit) 2. @microsoft/fast-element version 1.12.0 (https://github.com/Microsoft/fast) -3. @octokit/graphql version 8.0.0 (https://github.com/octokit/graphql.js) -4. @octokit/request version 9.0.0 (https://github.com/octokit/request.js) -5. @opentelemetry/api version 1.7.0 (https://github.com/open-telemetry/opentelemetry-js) -6. @opentelemetry/exporter-trace-otlp-http version 0.48.0 (https://github.com/open-telemetry/opentelemetry-js) -7. @opentelemetry/sdk-trace-base version 1.21.0 (https://github.com/open-telemetry/opentelemetry-js) +3. @octokit/graphql version 8.0.1 (https://github.com/octokit/graphql.js) +4. @octokit/request version 9.0.1 (https://github.com/octokit/request.js) +5. @opentelemetry/api version 1.8.0 (https://github.com/open-telemetry/opentelemetry-js) +6. @opentelemetry/exporter-trace-otlp-http version 0.49.1 (https://github.com/open-telemetry/opentelemetry-js) +7. @opentelemetry/sdk-trace-base version 1.22.0 (https://github.com/open-telemetry/opentelemetry-js) 8. @vscode/codicons version 0.0.35 (https://github.com/microsoft/vscode-codicons) 9. @vscode/webview-ui-toolkit version 1.4.0 (https://github.com/microsoft/vscode-webview-ui-toolkit) 10. ansi-regex version 6.0.1 (https://github.com/chalk/ansi-regex) 11. billboard.js version 3.11.2 (https://github.com/naver/billboard.js) -12. https-proxy-agent version 5.0.1 (https://github.com/TooTallNate/node-https-proxy-agent) -13. iconv-lite version 0.6.3 (https://github.com/ashtuchkin/iconv-lite) -14. lit version 3.1.2 (https://github.com/lit/lit) -15. microsoft/vscode (https://github.com/microsoft/vscode) -16. node-fetch version 2.7.0 (https://github.com/bitinn/node-fetch) -17. os-browserify version 0.3.0 (https://github.com/CoderPuppy/os-browserify) -18. path-browserify version 1.0.1 (https://github.com/browserify/path-browserify) -19. react-dom version 16.8.4 (https://github.com/facebook/react) -20. react version 16.8.4 (https://github.com/facebook/react) -21. sindresorhus/is-fullwidth-code-point (https://github.com/sindresorhus/is-fullwidth-code-point) -22. sindresorhus/string-width (https://github.com/sindresorhus/string-width) -23. sortablejs version 1.15.0 (https://github.com/SortableJS/Sortable) +12. fast-string-truncated-width version 1.1.0 (https://github.com/fabiospampinato/fast-string-truncated-width) +13. https-proxy-agent version 5.0.1 (https://github.com/TooTallNate/node-https-proxy-agent) +14. iconv-lite version 0.6.3 (https://github.com/ashtuchkin/iconv-lite) +15. lit version 3.1.2 (https://github.com/lit/lit) +16. microsoft/vscode (https://github.com/microsoft/vscode) +17. node-fetch version 2.7.0 (https://github.com/bitinn/node-fetch) +18. os-browserify version 0.3.0 (https://github.com/CoderPuppy/os-browserify) +19. path-browserify version 1.0.1 (https://github.com/browserify/path-browserify) +20. react-dom version 16.8.4 (https://github.com/facebook/react) +21. react version 16.8.4 (https://github.com/facebook/react) +22. sindresorhus/is-fullwidth-code-point (https://github.com/sindresorhus/is-fullwidth-code-point) +23. sindresorhus/string-width (https://github.com/sindresorhus/string-width) +24. sortablejs version 1.15.0 (https://github.com/SortableJS/Sortable) %% @lit/react NOTICES AND INFORMATION BEGIN HERE ========================================= @@ -1270,6 +1271,33 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ========================================= END OF billboard.js NOTICES AND INFORMATION +%% fast-string-truncated-width NOTICES AND INFORMATION BEGIN HERE +========================================= +The MIT License (MIT) + +Copyright (c) 2024-present Fabio Spampinato + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + +========================================= +END OF fast-string-truncated-width NOTICES AND INFORMATION + %% https-proxy-agent NOTICES AND INFORMATION BEGIN HERE ========================================= https-proxy-agent diff --git a/package.json b/package.json index eebb4f9c25328..b1efb80e267a0 100644 --- a/package.json +++ b/package.json @@ -16615,13 +16615,13 @@ "@gitkraken/gitkraken-components": "10.2.5", "@gitkraken/provider-apis": "0.10.0", "@gitkraken/shared-web-components": "0.1.1-rc.15", - "@lit/react": "1.0.2", + "@lit/react": "1.0.3", "@microsoft/fast-element": "1.12.0", - "@octokit/graphql": "8.0.0", - "@octokit/request": "9.0.0", - "@opentelemetry/api": "1.7.0", - "@opentelemetry/exporter-trace-otlp-http": "0.48.0", - "@opentelemetry/sdk-trace-base": "1.21.0", + "@octokit/graphql": "8.0.1", + "@octokit/request": "9.0.1", + "@opentelemetry/api": "1.8.0", + "@opentelemetry/exporter-trace-otlp-http": "0.49.1", + "@opentelemetry/sdk-trace-base": "1.22.0", "@vscode/codicons": "0.0.35", "@vscode/webview-ui-toolkit": "1.4.0", "ansi-regex": "6.0.1", @@ -16639,7 +16639,7 @@ }, "devDependencies": { "@eamodio/eslint-lite-webpack-plugin": "0.0.8", - "@swc/core": "1.4.2", + "@swc/core": "1.4.5", "@twbs/fantasticon": "2.7.2", "@types/mocha": "10.0.6", "@types/node": "18.15.0", @@ -16647,8 +16647,8 @@ "@types/react-dom": "17.0.21", "@types/sortablejs": "1.15.7", "@types/vscode": "1.82.0", - "@typescript-eslint/eslint-plugin": "7.0.2", - "@typescript-eslint/parser": "7.0.2", + "@typescript-eslint/eslint-plugin": "7.1.1", + "@typescript-eslint/parser": "7.1.1", "@vscode/test-electron": "2.3.9", "@vscode/test-web": "0.0.52", "@vscode/vsce": "2.24.0", @@ -16659,7 +16659,7 @@ "csp-html-webpack-plugin": "5.1.0", "css-loader": "6.10.0", "css-minimizer-webpack-plugin": "6.0.0", - "cssnano-preset-advanced": "6.0.5", + "cssnano-preset-advanced": "6.1.0", "esbuild": "0.20.1", "esbuild-loader": "4.0.3", "esbuild-sass-plugin": "3.1.0", @@ -16677,7 +16677,7 @@ "image-minimizer-webpack-plugin": "4.0.0", "license-checker-rseidelsohn": "4.3.0", "lz-string": "1.5.0", - "mini-css-extract-plugin": "2.8.0", + "mini-css-extract-plugin": "2.8.1", "mocha": "10.3.0", "prettier": "3.1.0", "sass": "1.71.1", @@ -16688,7 +16688,7 @@ "terser-webpack-plugin": "5.3.10", "ts-loader": "9.5.1", "tsc-alias": "1.8.8", - "typescript": "5.3.3", + "typescript": "5.4.2", "webpack": "5.90.3", "webpack-bundle-analyzer": "4.10.1", "webpack-cli": "5.1.4", diff --git a/src/ai/aiProviderService.ts b/src/ai/aiProviderService.ts index 81a162b723293..3d35e9d398ef5 100644 --- a/src/ai/aiProviderService.ts +++ b/src/ai/aiProviderService.ts @@ -132,7 +132,7 @@ export class AIProviderService implements Disposable { if (options?.progress != null) { return window.withProgress(options.progress, async () => - provider.explainChanges(commit!.message!, diff.contents), + provider.explainChanges(commit.message, diff.contents), ); } return provider.explainChanges(commit.message, diff.contents); diff --git a/src/api/actionRunners.ts b/src/api/actionRunners.ts index 46d3461c2b859..1990ec59dea5d 100644 --- a/src/api/actionRunners.ts +++ b/src/api/actionRunners.ts @@ -188,13 +188,13 @@ export class ActionRunners implements Disposable { const runnersMap = this._actionRunners; const registeredRunner = new RegisteredActionRunner(type, runner, function (this: RegisteredActionRunner) { - if (runners!.length === 1) { + if (runners.length === 1) { runnersMap.delete(action); onChanged(action); } else { - const index = runners!.indexOf(this); + const index = runners.indexOf(this); if (index !== -1) { - runners!.splice(index, 1); + runners.splice(index, 1); } } }); diff --git a/src/api/api.ts b/src/api/api.ts index 01632b9e3cd33..7b64287d985b5 100644 --- a/src/api/api.ts +++ b/src/api/api.ts @@ -43,7 +43,7 @@ export function preview() { descriptor.value = function (this: any, ...args: any[]) { // eslint-disable-next-line @typescript-eslint/no-unsafe-return - if (Container.instance.prereleaseOrDebugging) return fn!.apply(this, args); + if (Container.instance.prereleaseOrDebugging) return fn.apply(this, args); console.error('GitLens preview APIs are only available in the pre-release edition'); return emptyDisposable; diff --git a/src/commands/diffWithRevision.ts b/src/commands/diffWithRevision.ts index 573722f81fede..2f213b83a78fc 100644 --- a/src/commands/diffWithRevision.ts +++ b/src/commands/diffWithRevision.ts @@ -121,8 +121,8 @@ export class DiffWithRevisionCommand extends ActiveEditorCommand { sha: '', uri: gitUri, }, - line: args!.line, - showOptions: args!.showOptions, + line: args.line, + showOptions: args.showOptions, }); }, }, diff --git a/src/commands/openFileAtRevision.ts b/src/commands/openFileAtRevision.ts index d9c4b785b0027..7660801fb9a82 100644 --- a/src/commands/openFileAtRevision.ts +++ b/src/commands/openFileAtRevision.ts @@ -193,8 +193,8 @@ export class OpenFileAtRevisionCommand extends ActiveEditorCommand { keys: ['right', 'alt+right', 'ctrl+right'], onDidPressKey: async (key, item) => { await openFileAtRevision(item.item.file!, item.item, { - annotationType: args!.annotationType, - line: args!.line, + annotationType: args.annotationType, + line: args.line, preserveFocus: true, preview: true, }); diff --git a/src/commands/openFileAtRevisionFrom.ts b/src/commands/openFileAtRevisionFrom.ts index c3d348778f151..f8404988ba425 100644 --- a/src/commands/openFileAtRevisionFrom.ts +++ b/src/commands/openFileAtRevisionFrom.ts @@ -71,8 +71,8 @@ export class OpenFileAtRevisionFromCommand extends ActiveEditorCommand { await openFileAtRevision( this.container.git.getRevisionUri(item.ref, gitUri.fsPath, gitUri.repoPath!), { - annotationType: args!.annotationType, - line: args!.line, + annotationType: args.annotationType, + line: args.line, preserveFocus: true, preview: true, }, diff --git a/src/git/gitProviderService.ts b/src/git/gitProviderService.ts index 2631fa071f684..19ae339643489 100644 --- a/src/git/gitProviderService.ts +++ b/src/git/gitProviderService.ts @@ -1364,7 +1364,7 @@ export class GitProviderService implements Disposable { location: ProgressLocation.Notification, title: `Fetching ${repositories.length} repositories`, }, - () => Promise.all(repositories!.map(r => r.fetch({ progress: false, ...options }))), + () => Promise.all(repositories.map(r => r.fetch({ progress: false, ...options }))), ); } @@ -1399,7 +1399,7 @@ export class GitProviderService implements Disposable { location: ProgressLocation.Notification, title: `Pulling ${repositories.length} repositories`, }, - () => Promise.all(repositories!.map(r => r.pull({ progress: false, ...options }))), + () => Promise.all(repositories.map(r => r.pull({ progress: false, ...options }))), ); } @@ -1441,7 +1441,7 @@ export class GitProviderService implements Disposable { location: ProgressLocation.Notification, title: `Pushing ${repositories.length} repositories`, }, - () => Promise.all(repositories!.map(r => r.push({ progress: false, ...options }))), + () => Promise.all(repositories.map(r => r.push({ progress: false, ...options }))), ); } diff --git a/src/git/models/branch.ts b/src/git/models/branch.ts index 2375bb55c94cc..01bae3d5a31fb 100644 --- a/src/git/models/branch.ts +++ b/src/git/models/branch.ts @@ -249,8 +249,8 @@ export function sortBranches(branches: GitBranch[], options?: BranchSortOptions) case 'date:asc': return branches.sort( (a, b) => - (options!.missingUpstream ? (a.upstream?.missing ? -1 : 1) - (b.upstream?.missing ? -1 : 1) : 0) || - (options!.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) || + (options.missingUpstream ? (a.upstream?.missing ? -1 : 1) - (b.upstream?.missing ? -1 : 1) : 0) || + (options.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) || (a.starred ? -1 : 1) - (b.starred ? -1 : 1) || (b.remote ? -1 : 1) - (a.remote ? -1 : 1) || (a.date == null ? -1 : a.date.getTime()) - (b.date == null ? -1 : b.date.getTime()), @@ -258,8 +258,8 @@ export function sortBranches(branches: GitBranch[], options?: BranchSortOptions) case 'name:asc': return branches.sort( (a, b) => - (options!.missingUpstream ? (a.upstream?.missing ? -1 : 1) - (b.upstream?.missing ? -1 : 1) : 0) || - (options!.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) || + (options.missingUpstream ? (a.upstream?.missing ? -1 : 1) - (b.upstream?.missing ? -1 : 1) : 0) || + (options.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) || (a.starred ? -1 : 1) - (b.starred ? -1 : 1) || (a.name === 'main' ? -1 : 1) - (b.name === 'main' ? -1 : 1) || (a.name === 'master' ? -1 : 1) - (b.name === 'master' ? -1 : 1) || @@ -270,8 +270,8 @@ export function sortBranches(branches: GitBranch[], options?: BranchSortOptions) case 'name:desc': return branches.sort( (a, b) => - (options!.missingUpstream ? (a.upstream?.missing ? -1 : 1) - (b.upstream?.missing ? -1 : 1) : 0) || - (options!.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) || + (options.missingUpstream ? (a.upstream?.missing ? -1 : 1) - (b.upstream?.missing ? -1 : 1) : 0) || + (options.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) || (a.starred ? -1 : 1) - (b.starred ? -1 : 1) || (a.name === 'main' ? -1 : 1) - (b.name === 'main' ? -1 : 1) || (a.name === 'master' ? -1 : 1) - (b.name === 'master' ? -1 : 1) || @@ -283,8 +283,8 @@ export function sortBranches(branches: GitBranch[], options?: BranchSortOptions) default: return branches.sort( (a, b) => - (options!.missingUpstream ? (a.upstream?.missing ? -1 : 1) - (b.upstream?.missing ? -1 : 1) : 0) || - (options!.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) || + (options.missingUpstream ? (a.upstream?.missing ? -1 : 1) - (b.upstream?.missing ? -1 : 1) : 0) || + (options.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) || (a.starred ? -1 : 1) - (b.starred ? -1 : 1) || (b.remote ? -1 : 1) - (a.remote ? -1 : 1) || (b.date == null ? -1 : b.date.getTime()) - (a.date == null ? -1 : a.date.getTime()), diff --git a/src/git/models/contributor.ts b/src/git/models/contributor.ts index 63cb05d7985b6..a84f2d2862f0e 100644 --- a/src/git/models/contributor.ts +++ b/src/git/models/contributor.ts @@ -31,14 +31,14 @@ export class GitContributor { case 'date:desc': return contributors.sort( (a, b) => - (options!.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) || + (options.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) || (b.date?.getTime() ?? 0) - (a.date?.getTime() ?? 0) || b.count - a.count, ); case 'date:asc': return contributors.sort( (a, b) => - (options!.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) || + (options.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) || (a.date?.getTime() ?? 0) - (b.date?.getTime() ?? 0) || b.count - a.count, ); diff --git a/src/git/remotes/remoteProviders.ts b/src/git/remotes/remoteProviders.ts index 75d19c9b8409c..c4a61241dfd0a 100644 --- a/src/git/remotes/remoteProviders.ts +++ b/src/git/remotes/remoteProviders.ts @@ -145,7 +145,7 @@ export function getRemoteProviderMatcher( } return (url: string, domain: string, path: string) => - createBestRemoteProvider(container, providers!, url, domain, path); + createBestRemoteProvider(container, providers, url, domain, path); } function createBestRemoteProvider( diff --git a/src/plus/gk/account/subscriptionService.ts b/src/plus/gk/account/subscriptionService.ts index fd639d31c222d..233a63d894f31 100644 --- a/src/plus/gk/account/subscriptionService.ts +++ b/src/plus/gk/account/subscriptionService.ts @@ -128,7 +128,7 @@ export class SubscriptionService implements Disposable { session = await this._sessionPromise; } - if (session != null && e.removed?.some(s => s.id === session!.id)) { + if (session != null && e.removed?.some(s => s.id === session.id)) { this._session = undefined; this._sessionPromise = undefined; void this.logout(); diff --git a/src/plus/gk/checkin.ts b/src/plus/gk/checkin.ts index 4cebd5d75a73d..ca749be3ef756 100644 --- a/src/plus/gk/checkin.ts +++ b/src/plus/gk/checkin.ts @@ -179,7 +179,7 @@ export function getSubscriptionFromCheckIn( if (organizationId != null) { activeOrganization = organizations.find(organization => organization.id === organizationId); } else if (effective?.organizationId != null) { - activeOrganization = organizations.find(organization => organization.id === effective!.organizationId); + activeOrganization = organizations.find(organization => organization.id === effective.organizationId); } else if (organizationsWithNoLicense.length > 0) { activeOrganization = organizationsWithNoLicense[0]; } diff --git a/src/plus/integrations/providers/github/github.ts b/src/plus/integrations/providers/github/github.ts index 64b83c3035c84..693ac0ef74fc4 100644 --- a/src/plus/integrations/providers/github/github.ts +++ b/src/plus/integrations/providers/github/github.ts @@ -2619,7 +2619,7 @@ export class GitHubApi implements Disposable { } const rsp = await wrapForForcedInsecureSSL(provider?.getIgnoreSSLErrors() ?? false, () => - fetch(url!, { method: 'GET', headers: { Authorization: `Bearer ${token}` } }), + fetch(url, { method: 'GET', headers: { Authorization: `Bearer ${token}` } }), ); if (rsp.ok) { diff --git a/src/system/decorators/gate.ts b/src/system/decorators/gate.ts index 3701bfc71113e..131db6030613e 100644 --- a/src/system/decorators/gate.ts +++ b/src/system/decorators/gate.ts @@ -29,7 +29,7 @@ export function gate any>(resolver?: (...args: Parame if (promise === undefined) { let result; try { - result = fn!.apply(this, args); + result = fn.apply(this, args); if (result == null || !isPromise(result)) { return result; } diff --git a/src/system/decorators/log.ts b/src/system/decorators/log.ts index 3a72cd410d97f..f409a2e66875e 100644 --- a/src/system/decorators/log.ts +++ b/src/system/decorators/log.ts @@ -104,7 +104,7 @@ export function log any>(options?: LogOptions, deb descriptor[fnKey] = function (this: any, ...args: Parameters) { if ((!debugging && !Logger.enabled(logLevel)) || (ifFn != null && !ifFn.apply(this, args))) { - return fn!.apply(this, args); + return fn.apply(this, args); } const scopeId = logScopeIdGenerator.next(); @@ -216,7 +216,7 @@ export function log any>(options?: LogOptions, deb let result; try { - result = fn!.apply(this, args); + result = fn.apply(this, args); } catch (ex) { logError(ex); throw ex; @@ -290,7 +290,7 @@ export function log any>(options?: LogOptions, deb return result; } - return fn!.apply(this, args); + return fn.apply(this, args); }; }; } diff --git a/src/system/decorators/memoize.ts b/src/system/decorators/memoize.ts index fec7e56d0ebfa..bd9a3ed2c34dc 100644 --- a/src/system/decorators/memoize.ts +++ b/src/system/decorators/memoize.ts @@ -29,7 +29,7 @@ export function memoize any>(resolver?: (...args: Par return result; } - result = fn!.apply(this, args); + result = fn.apply(this, args); Object.defineProperty(this, prop, { configurable: false, enumerable: false, diff --git a/src/system/decorators/serialize.ts b/src/system/decorators/serialize.ts index 43e2f8127faa1..8d375957bd662 100644 --- a/src/system/decorators/serialize.ts +++ b/src/system/decorators/serialize.ts @@ -22,7 +22,7 @@ export function serialize(): (target: any, key: string, descriptor: PropertyDesc let promise: Promise | undefined = this[serializeKey]; // eslint-disable-next-line no-return-await, @typescript-eslint/no-unsafe-return - const run = async () => await fn!.apply(this, args); + const run = async () => await fn.apply(this, args); if (promise == null) { promise = run(); } else { diff --git a/src/views/nodes/resultsFilesNode.ts b/src/views/nodes/resultsFilesNode.ts index 0e06c6c02b045..715d0815ea32f 100644 --- a/src/views/nodes/resultsFilesNode.ts +++ b/src/views/nodes/resultsFilesNode.ts @@ -260,6 +260,6 @@ export class ResultsFilesNode extends ViewNode<'results-files', ViewsWithCommits if (results.filtered == null) { results.filtered = new Map(); } - results.filtered.set(filter, filterTo == null ? [] : results.files!.filter(f => filterTo!.has(f.path))); + results.filtered.set(filter, filterTo == null ? [] : results.files!.filter(f => filterTo.has(f.path))); } } diff --git a/src/webviews/apps/plus/graph/GraphWrapper.tsx b/src/webviews/apps/plus/graph/GraphWrapper.tsx index 7efde72adb8c7..e95d13b22f5be 100644 --- a/src/webviews/apps/plus/graph/GraphWrapper.tsx +++ b/src/webviews/apps/plus/graph/GraphWrapper.tsx @@ -847,7 +847,7 @@ export function GraphWrapper({ } if (id != null) { - queueMicrotask(() => graphRef.current?.selectCommits([id!], false, true)); + queueMicrotask(() => graphRef.current?.selectCommits([id], false, true)); } }; diff --git a/src/webviews/webviewCommandRegistrar.ts b/src/webviews/webviewCommandRegistrar.ts index 46fac93c17a51..6dc34fbc18a96 100644 --- a/src/webviews/webviewCommandRegistrar.ts +++ b/src/webviews/webviewCommandRegistrar.ts @@ -62,10 +62,10 @@ export class WebviewCommandRegistrar implements Disposable { return { dispose: () => { - registration!.handlers.delete(key); - if (registration!.handlers.size === 0) { + registration.handlers.delete(key); + if (registration.handlers.size === 0) { this._commandRegistrations.delete(command); - registration!.subscription.dispose(); + registration.subscription.dispose(); } }, }; diff --git a/yarn.lock b/yarn.lock index 398efd361d875..ff9fe007c1152 100644 --- a/yarn.lock +++ b/yarn.lock @@ -42,17 +42,17 @@ js-tokens "^4.0.0" "@babel/runtime-corejs2@^7.0.0": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.23.9.tgz#4d0271da21aa67093786301a4627defed8fce56b" - integrity sha512-lwwDy5QfMkO2rmSz9AvLj6j2kWt5a4ulMi1t21vWQEO0kNCFslHoszat8reU/uigIQSUDF31zraZG/qMkcqAlw== + version "7.24.0" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.24.0.tgz#23c12d76ac8a7a0ec223c4b0c3b937f9c203fa33" + integrity sha512-RZVGq1it0GA1K8rb+z7v7NzecP6VYCMedN7yHsCCIQUMmRXFCPJD8GISdf6uIGj7NDDihg7ieQEzpdpQbUL75Q== dependencies: core-js "^2.6.12" regenerator-runtime "^0.14.0" "@babel/runtime@^7.1.2", "@babel/runtime@^7.21.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.9.tgz#47791a15e4603bb5f905bc0753801cf21d6345f7" - integrity sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw== + version "7.24.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e" + integrity sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw== dependencies: regenerator-runtime "^0.14.0" @@ -438,23 +438,23 @@ chalk "^4.0.0" "@jridgewell/gen-mapping@^0.3.0": - version "0.3.4" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.4.tgz#9b18145d26cf33d08576cf4c7665b28554480ed7" - integrity sha512-Oud2QPM5dHviZNn4y/WhhYKSXksv+1xLEIsNrAbGcFzUN3ubqWRFT5gwPchNc5NuzILOU4tPBDTZ4VwhL8Y7cw== + version "0.3.5" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36" + integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg== dependencies: - "@jridgewell/set-array" "^1.0.1" + "@jridgewell/set-array" "^1.2.1" "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" + "@jridgewell/trace-mapping" "^0.3.24" "@jridgewell/resolve-uri@^3.1.0": version "3.1.2" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw== -"@jridgewell/set-array@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" - integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== +"@jridgewell/set-array@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280" + integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A== "@jridgewell/source-map@^0.3.3": version "0.3.5" @@ -469,10 +469,10 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== -"@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.21", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.23" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.23.tgz#afc96847f3f07841477f303eed687707a5aacd80" - integrity sha512-9/4foRoUKp8s96tSkh8DlAAc5A0Ty8vLXld+l9gjKKY6ckwI8G15f0hskGmuLZu78ZlGa1vtsfOa+lnB4vG6Jg== +"@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.21", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.9": + version "0.3.25" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" + integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== dependencies: "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" @@ -500,10 +500,10 @@ resolved "https://registry.yarnpkg.com/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.2.0.tgz#353ce4a76c83fadec272ea5674ede767650762fd" integrity sha512-yWJKmpGE6lUURKAaIltoPIE/wrbY3TEkqQt+X0m+7fQNnAv0keydnYvbiJFP1PnMhizmIWRWOG5KLhYyc/xl+g== -"@lit/react@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@lit/react/-/react-1.0.2.tgz#4951ff1590d69aad912d0a950b3518d19eb7e220" - integrity sha512-UJ5TQ46DPcJDIzyjbwbj6Iye0XcpCxL2yb03zcWq1BpWchpXS3Z0BPVhg7zDfZLF6JemPml8u/gt/+KwJ/23sg== +"@lit/react@1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@lit/react/-/react-1.0.3.tgz#2e4e7d3ecc8def238c4d2f5c9bef95a23d4ed7bc" + integrity sha512-RGoPMrAPbFjQFXFbfmYdotw000DyChehTim+d562HRXvFGw//KxouI8jNOcc3Kw/1uqUA1SJqXFtKKxK0NUrww== "@lit/reactive-element@^2.0.4": version "2.0.4" @@ -594,10 +594,10 @@ "@octokit/types" "^12.0.0" universal-user-agent "^7.0.2" -"@octokit/graphql@8.0.0": - version "8.0.0" - resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-8.0.0.tgz#2720a3b54eac6a15040f7ae166b7a66197179018" - integrity sha512-9B2HwWSb12ldwrp6pC8BFTsSCeidW7do0lMgWNH65IXRVteN503JJSWPH1VEM+qP8+/Ka1pw3MTs+3Q6Bjqukw== +"@octokit/graphql@8.0.1": + version "8.0.1" + resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-8.0.1.tgz#75d0778fb2fdeb0229d1861c3ba3b9ca7bcf4a37" + integrity sha512-lLDb6LhC1gBj2CxEDa5Xk10+H/boonhs+3Mi6jpRyetskDKNHe6crMeKmUE2efoLofMP8ruannLlCUgpTFmVzQ== dependencies: "@octokit/request" "^9.0.0" "@octokit/types" "^12.0.0" @@ -609,16 +609,16 @@ integrity sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA== "@octokit/request-error@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-6.0.1.tgz#165debcaab268a107b1d4ac0f7732bc96eabd409" - integrity sha512-EPeILOAEGqwmEG6g7dYlbvqkjJ5nWNcZvQpgeLEn1MieIcJ0xK0CJtvVcIMXqzIM8DOWzvI6zL5FQAwjTvk/Tg== + version "6.0.2" + resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-6.0.2.tgz#b8060d8b31d5f92b0a88ab01df5a097c771723b4" + integrity sha512-WtRVpoHcNXs84+s9s/wqfHaxM68NGMg8Av7h59B50OVO0PwwMx+2GgQ/OliUd0iQBSNWgR6N8afi/KjSHbXHWw== dependencies: "@octokit/types" "^12.0.0" -"@octokit/request@9.0.0", "@octokit/request@^9.0.0": - version "9.0.0" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-9.0.0.tgz#a117fb69185c4f6c40a7e84584297533e76569c1" - integrity sha512-hShsrZ40W8dz3TkyD5ifHNcrYfYpYF7Sh2x+ZKafA+eO0zNeKDTsbF1E0xrUf0mVYGeKL+NLMO5SnfAP22l05Q== +"@octokit/request@9.0.1", "@octokit/request@^9.0.0": + version "9.0.1" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-9.0.1.tgz#628bc5b21243289b8e656dc43eb199d2a2ad1570" + integrity sha512-kL+cAcbSl3dctYLuJmLfx6Iku2MXXy0jszhaEIjQNaCp4zjHXrhVAHeuaRdNvJjW9qjl3u1MJ72+OuBP0YW/pg== dependencies: "@octokit/endpoint" "^10.0.0" "@octokit/request-error" "^6.0.1" @@ -632,93 +632,93 @@ dependencies: "@octokit/openapi-types" "^20.0.0" -"@opentelemetry/api-logs@0.48.0": - version "0.48.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.48.0.tgz#9521a0c1e920ed536f31cda117164c4afff44caf" - integrity sha512-1/aMiU4Eqo3Zzpfwu51uXssp5pzvHFObk8S9pKAiXb1ne8pvg1qxBQitYL1XUiAMEXFzgjaidYG2V6624DRhhw== +"@opentelemetry/api-logs@0.49.1": + version "0.49.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.49.1.tgz#51a66ed5eb5eeeafffbd36c1713aa91cbfdd5259" + integrity sha512-kaNl/T7WzyMUQHQlVq7q0oV4Kev6+0xFwqzofryC66jgGMacd0QH5TwfpbUwSTby+SdAdprAe5UKMvBw4tKS5Q== dependencies: "@opentelemetry/api" "^1.0.0" -"@opentelemetry/api@1.7.0", "@opentelemetry/api@^1.0.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.7.0.tgz#b139c81999c23e3c8d3c0a7234480e945920fc40" - integrity sha512-AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw== - -"@opentelemetry/core@1.21.0": - version "1.21.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.21.0.tgz#8c16faf16edf861b073c03c9d45977b3f4003ee1" - integrity sha512-KP+OIweb3wYoP7qTYL/j5IpOlu52uxBv5M4+QhSmmUfLyTgu1OIS71msK3chFo1D6Y61BIH3wMiMYRCxJCQctA== - dependencies: - "@opentelemetry/semantic-conventions" "1.21.0" - -"@opentelemetry/exporter-trace-otlp-http@0.48.0": - version "0.48.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.48.0.tgz#10e719ec7fec0797a3e325964da8f08ca8d903d9" - integrity sha512-QEZKbfWqXrbKVpr2PHd4KyKI0XVOhUYC+p2RPV8s+2K5QzZBE3+F9WlxxrXDfkrvGmpQAZytBoHQQYA3AGOtpw== - dependencies: - "@opentelemetry/core" "1.21.0" - "@opentelemetry/otlp-exporter-base" "0.48.0" - "@opentelemetry/otlp-transformer" "0.48.0" - "@opentelemetry/resources" "1.21.0" - "@opentelemetry/sdk-trace-base" "1.21.0" - -"@opentelemetry/otlp-exporter-base@0.48.0": - version "0.48.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.48.0.tgz#72b4efc548de9a0a7121c37669e052ded619bcc3" - integrity sha512-T4LJND+Ugl87GUONoyoQzuV9qCn4BFIPOnCH1biYqdGhc2JahjuLqVD9aefwLzGBW638iLAo88Lh68h2F1FLiA== - dependencies: - "@opentelemetry/core" "1.21.0" - -"@opentelemetry/otlp-transformer@0.48.0": - version "0.48.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-transformer/-/otlp-transformer-0.48.0.tgz#969d52a767c7538552b88f7baaa001d3f88feb17" - integrity sha512-yuoS4cUumaTK/hhxW3JUy3wl2U4keMo01cFDrUOmjloAdSSXvv1zyQ920IIH4lymp5Xd21Dj2/jq2LOro56TJg== - dependencies: - "@opentelemetry/api-logs" "0.48.0" - "@opentelemetry/core" "1.21.0" - "@opentelemetry/resources" "1.21.0" - "@opentelemetry/sdk-logs" "0.48.0" - "@opentelemetry/sdk-metrics" "1.21.0" - "@opentelemetry/sdk-trace-base" "1.21.0" - -"@opentelemetry/resources@1.21.0": - version "1.21.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.21.0.tgz#e773e918cc8ca26493a987dfbfc6b8a315a2ab45" - integrity sha512-1Z86FUxPKL6zWVy2LdhueEGl9AHDJcx+bvHStxomruz6Whd02mE3lNUMjVJ+FGRoktx/xYQcxccYb03DiUP6Yw== - dependencies: - "@opentelemetry/core" "1.21.0" - "@opentelemetry/semantic-conventions" "1.21.0" - -"@opentelemetry/sdk-logs@0.48.0": - version "0.48.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-logs/-/sdk-logs-0.48.0.tgz#5248e4cbfc99bbee555ffd1a23b5db53d6553f2c" - integrity sha512-lRcA5/qkSJuSh4ItWCddhdn/nNbVvnzM+cm9Fg1xpZUeTeozjJDBcHnmeKoOaWRnrGYBdz6UTY6bynZR9aBeAA== - dependencies: - "@opentelemetry/core" "1.21.0" - "@opentelemetry/resources" "1.21.0" - -"@opentelemetry/sdk-metrics@1.21.0": - version "1.21.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-metrics/-/sdk-metrics-1.21.0.tgz#40d71aaec5b696e58743889ce6d5bf2593f9a23d" - integrity sha512-on1jTzIHc5DyWhRP+xpf+zrgrREXcHBH4EDAfaB5mIG7TWpKxNXooQ1JCylaPsswZUv4wGnVTinr4HrBdGARAQ== - dependencies: - "@opentelemetry/core" "1.21.0" - "@opentelemetry/resources" "1.21.0" +"@opentelemetry/api@1.8.0", "@opentelemetry/api@^1.0.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.8.0.tgz#5aa7abb48f23f693068ed2999ae627d2f7d902ec" + integrity sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w== + +"@opentelemetry/core@1.22.0": + version "1.22.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.22.0.tgz#a9f33689acd4703ac780c6595497374e2113c7e5" + integrity sha512-0VoAlT6x+Xzik1v9goJ3pZ2ppi6+xd3aUfg4brfrLkDBHRIVjMP0eBHrKrhB+NKcDyMAg8fAbGL3Npg/F6AwWA== + dependencies: + "@opentelemetry/semantic-conventions" "1.22.0" + +"@opentelemetry/exporter-trace-otlp-http@0.49.1": + version "0.49.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.49.1.tgz#032967960815d46bed32e5b231efe5114ab2a73b" + integrity sha512-KOLtZfZvIrpGZLVvblKsiVQT7gQUZNKcUUH24Zz6Xbi7LJb9Vt6xtUZFYdR5IIjvt47PIqBKDWUQlU0o1wAsRw== + dependencies: + "@opentelemetry/core" "1.22.0" + "@opentelemetry/otlp-exporter-base" "0.49.1" + "@opentelemetry/otlp-transformer" "0.49.1" + "@opentelemetry/resources" "1.22.0" + "@opentelemetry/sdk-trace-base" "1.22.0" + +"@opentelemetry/otlp-exporter-base@0.49.1": + version "0.49.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.49.1.tgz#a99d527e5fd7f02f3cb50f27a97a0ba6d72af2e9" + integrity sha512-z6sHliPqDgJU45kQatAettY9/eVF58qVPaTuejw9YWfSRqid9pXPYeegDCSdyS47KAUgAtm+nC28K3pfF27HWg== + dependencies: + "@opentelemetry/core" "1.22.0" + +"@opentelemetry/otlp-transformer@0.49.1": + version "0.49.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-transformer/-/otlp-transformer-0.49.1.tgz#ede99939c85ae246f211ca0051cdac802cdcdb3a" + integrity sha512-Z+koA4wp9L9e3jkFacyXTGphSWTbOKjwwXMpb0CxNb0kjTHGUxhYRN8GnkLFsFo5NbZPjP07hwAqeEG/uCratQ== + dependencies: + "@opentelemetry/api-logs" "0.49.1" + "@opentelemetry/core" "1.22.0" + "@opentelemetry/resources" "1.22.0" + "@opentelemetry/sdk-logs" "0.49.1" + "@opentelemetry/sdk-metrics" "1.22.0" + "@opentelemetry/sdk-trace-base" "1.22.0" + +"@opentelemetry/resources@1.22.0": + version "1.22.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.22.0.tgz#5b597cdf9fb6e1cd22d7891bd8e72e487929a813" + integrity sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A== + dependencies: + "@opentelemetry/core" "1.22.0" + "@opentelemetry/semantic-conventions" "1.22.0" + +"@opentelemetry/sdk-logs@0.49.1": + version "0.49.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-logs/-/sdk-logs-0.49.1.tgz#dd30d1b05951a0d6bc017d99aaa0965792b357f9" + integrity sha512-gCzYWsJE0h+3cuh3/cK+9UwlVFyHvj3PReIOCDOmdeXOp90ZjKRoDOJBc3mvk1LL6wyl1RWIivR8Rg9OToyesw== + dependencies: + "@opentelemetry/core" "1.22.0" + "@opentelemetry/resources" "1.22.0" + +"@opentelemetry/sdk-metrics@1.22.0": + version "1.22.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-metrics/-/sdk-metrics-1.22.0.tgz#b94c62403013e4c72b96dc747d71d786073efafc" + integrity sha512-k6iIx6H3TZ+BVMr2z8M16ri2OxWaljg5h8ihGJxi/KQWcjign6FEaEzuigXt5bK9wVEhqAcWLCfarSftaNWkkg== + dependencies: + "@opentelemetry/core" "1.22.0" + "@opentelemetry/resources" "1.22.0" lodash.merge "^4.6.2" -"@opentelemetry/sdk-trace-base@1.21.0": - version "1.21.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.21.0.tgz#ffad912e453a92044fb220bd5d2f6743bf37bb8a" - integrity sha512-yrElGX5Fv0umzp8Nxpta/XqU71+jCAyaLk34GmBzNcrW43nqbrqvdPs4gj4MVy/HcTjr6hifCDCYA3rMkajxxA== +"@opentelemetry/sdk-trace-base@1.22.0": + version "1.22.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.22.0.tgz#7833bf2493a7b49461915ca32aa2884c87afd78c" + integrity sha512-pfTuSIpCKONC6vkTpv6VmACxD+P1woZf4q0K46nSUvXFvOFqjBYKFaAMkKD3M1mlKUUh0Oajwj35qNjMl80m1Q== dependencies: - "@opentelemetry/core" "1.21.0" - "@opentelemetry/resources" "1.21.0" - "@opentelemetry/semantic-conventions" "1.21.0" + "@opentelemetry/core" "1.22.0" + "@opentelemetry/resources" "1.22.0" + "@opentelemetry/semantic-conventions" "1.22.0" -"@opentelemetry/semantic-conventions@1.21.0": - version "1.21.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.21.0.tgz#83f7479c524ab523ac2df702ade30b9724476c72" - integrity sha512-lkC8kZYntxVKr7b8xmjCVUgE0a8xgDakPyDo9uSWavXPyYqLgYYGdEd2j8NxihRyb6UwpX3G/hFUF4/9q2V+/g== +"@opentelemetry/semantic-conventions@1.22.0": + version "1.22.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.22.0.tgz#d7502533a7c96e25baab86bac965468e0703a8b4" + integrity sha512-CAOgFOKLybd02uj/GhCdEeeBjOS0yeoDeo/CA7ASBSmenpZHAKGB3iDm/rv3BQLcabb/OprDEsSQ1y0P8A7Siw== "@pkgjs/parseargs@^0.11.0": version "0.11.0" @@ -726,11 +726,11 @@ integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== "@playwright/browser-chromium@^1.41.2": - version "1.41.2" - resolved "https://registry.yarnpkg.com/@playwright/browser-chromium/-/browser-chromium-1.41.2.tgz#f6b2e51b95bb98e916e7c42c9a6f885923cfcd4b" - integrity sha512-vzobqNg2K6cJPyXCVaUxq8uDV54l3pEJvkO58XK0CBV2nl9IBySXvEqcgwsQc8PmQ930yVDrz0oCrMR6H/Qv3A== + version "1.42.1" + resolved "https://registry.yarnpkg.com/@playwright/browser-chromium/-/browser-chromium-1.42.1.tgz#6ed710b10e613a57012fd522a8c86b4cbc18bde5" + integrity sha512-A7pcZIZQIiiafO2UCR/OEdkvGM8Hr2gsjcK0cQ7WStF28HUpPBbJiwR9qmo+rjxaEaK7c9XD1qNXOng8Q+eI0Q== dependencies: - playwright-core "1.41.2" + playwright-core "1.42.1" "@polka/url@^1.0.0-next.24": version "1.0.0-next.24" @@ -747,74 +747,74 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz#719df7fb41766bc143369eaa0dd56d8dc87c9958" integrity sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg== -"@swc/core-darwin-arm64@1.4.2": - version "1.4.2" - resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.4.2.tgz#3b5677c5b9c5a7a91d953b96cd603c94064e2835" - integrity sha512-1uSdAn1MRK5C1m/TvLZ2RDvr0zLvochgrZ2xL+lRzugLlCTlSA+Q4TWtrZaOz+vnnFVliCpw7c7qu0JouhgQIw== - -"@swc/core-darwin-x64@1.4.2": - version "1.4.2" - resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.4.2.tgz#bbc8bbf420389b12541151255a50f319cc17ef96" - integrity sha512-TYD28+dCQKeuxxcy7gLJUCFLqrwDZnHtC2z7cdeGfZpbI2mbfppfTf2wUPzqZk3gEC96zHd4Yr37V3Tvzar+lQ== - -"@swc/core-linux-arm-gnueabihf@1.4.2": - version "1.4.2" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.4.2.tgz#aa9a18f130820717df08c9dd882043fc47e8d35a" - integrity sha512-Eyqipf7ZPGj0vplKHo8JUOoU1un2sg5PjJMpEesX0k+6HKE2T8pdyeyXODN0YTFqzndSa/J43EEPXm+rHAsLFQ== - -"@swc/core-linux-arm64-gnu@1.4.2": - version "1.4.2" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.4.2.tgz#5ef1de0ca7cc3a034aa3a1c3c1794b78e6ca207e" - integrity sha512-wZn02DH8VYPv3FC0ub4my52Rttsus/rFw+UUfzdb3tHMHXB66LqN+rR0ssIOZrH6K+VLN6qpTw9VizjyoH0BxA== - -"@swc/core-linux-arm64-musl@1.4.2": - version "1.4.2" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.4.2.tgz#5dfd2a8c0483770a307de0ccb6019a082ff0d902" - integrity sha512-3G0D5z9hUj9bXNcwmA1eGiFTwe5rWkuL3DsoviTj73TKLpk7u64ND0XjEfO0huVv4vVu9H1jodrKb7nvln/dlw== - -"@swc/core-linux-x64-gnu@1.4.2": - version "1.4.2" - resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.4.2.tgz#314aa76b7c1208e315e3156ab57b7188fb605bc2" - integrity sha512-LFxn9U8cjmYHw3jrdPNqPAkBGglKE3tCZ8rA7hYyp0BFxuo7L2ZcEnPm4RFpmSCCsExFH+LEJWuMGgWERoktvg== - -"@swc/core-linux-x64-musl@1.4.2": - version "1.4.2" - resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.4.2.tgz#b2b226657f6a8d48f561cb3dbe2d414cfbafe467" - integrity sha512-dp0fAmreeVVYTUcb4u9njTPrYzKnbIH0EhH2qvC9GOYNNREUu2GezSIDgonjOXkHiTCvopG4xU7y56XtXj4VrQ== - -"@swc/core-win32-arm64-msvc@1.4.2": - version "1.4.2" - resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.4.2.tgz#582f79fa328ce0f426ab8313b3d881e7315fab2f" - integrity sha512-HlVIiLMQkzthAdqMslQhDkoXJ5+AOLUSTV6fm6shFKZKqc/9cJvr4S8UveNERL9zUficA36yM3bbfo36McwnvQ== - -"@swc/core-win32-ia32-msvc@1.4.2": - version "1.4.2" - resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.4.2.tgz#15c8289e1c18857f79b9b888100ab1f871bf58f6" - integrity sha512-WCF8faPGjCl4oIgugkp+kL9nl3nUATlzKXCEGFowMEmVVCFM0GsqlmGdPp1pjZoWc9tpYanoXQDnp5IvlDSLhA== - -"@swc/core-win32-x64-msvc@1.4.2": - version "1.4.2" - resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.4.2.tgz#c999ca7b68124d058b40a1431cdd6f56779670d5" - integrity sha512-oV71rwiSpA5xre2C5570BhCsg1HF97SNLsZ/12xv7zayGzqr3yvFALFJN8tHKpqUdCB4FGPjoP3JFdV3i+1wUw== - -"@swc/core@1.4.2": - version "1.4.2" - resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.4.2.tgz#310b0d5e93e47ca72f54150c8f9efcb434c39b17" - integrity sha512-vWgY07R/eqj1/a0vsRKLI9o9klGZfpLNOVEnrv4nrccxBgYPjcf22IWwAoaBJ+wpA7Q4fVjCUM8lP0m01dpxcg== +"@swc/core-darwin-arm64@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.4.5.tgz#639b50cb9b748319b1bcd110778d0f322c60d03d" + integrity sha512-toMSkbByHNfGXESyY1aiq5L3KutgijrNWB/THgdHIA1aIbwtrgMdFQfxpSE+INuuvWYi/Fxarv86EnU7ewbI0Q== + +"@swc/core-darwin-x64@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.4.5.tgz#f309224da2a243e34a53624bfd1b82d3211eb12f" + integrity sha512-LN8cbnmb4Gav8UcbBc+L/DEthmzCWZz22rQr6fIEHMN+f0d71fuKnV0ca0hoKbpZn33dlzUmXQE53HRjlRUQbw== + +"@swc/core-linux-arm-gnueabihf@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.4.5.tgz#05d3c6e163408eed733268afd31c5e2594430b56" + integrity sha512-suRFkhBWmOQxlM4frpos1uqjmHfaEI8FuJ0LL5+yRE7IunNDeQJBKujGZt6taeuxo1KqC0N0Ajr8IluN2wrKpA== + +"@swc/core-linux-arm64-gnu@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.4.5.tgz#3c0659fb8fff6b05925f1536dbf52f181e73047f" + integrity sha512-mLKxasQArDGmR6k9c0tkPVUdoo8VfUecocMG1Mx9NYvpidJNaZ3xq9nYM77v7uq1fQqrs/59DM1fJTNRWvv/UQ== + +"@swc/core-linux-arm64-musl@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.4.5.tgz#5b9d65efb09616fabbf536566b5da9ad8652272f" + integrity sha512-pgKuyRP7S29U/HMDTx+x8dFcklWxwB9cHFNCNWSE6bS4vHR93jc4quwPX9OEQX5CVHxm+c8+xof043I4OGkAXw== + +"@swc/core-linux-x64-gnu@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.4.5.tgz#39075d5cf978509ea64f5832d9d7d7b5b640a9fd" + integrity sha512-srR+YN86Oerzoghd0DPCzTbTp08feeJPSr9kkNdmtQWENOa4l/9cJV3+XY6vviw0sEjezPmYnc3SwRxJRaxvEw== + +"@swc/core-linux-x64-musl@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.4.5.tgz#2ce0dc1679e9348eccaa07f688a870b3259e480c" + integrity sha512-aSf41LZtDeG5VXI4RCnzcu0UInPyNm3ip8Kw+sCK+sSqW9o7DgBkyqqbip3RZq84fNUHBQQQQdKXetltsyRRqw== + +"@swc/core-win32-arm64-msvc@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.4.5.tgz#3921291e22581dc94e49f56ccb69222fe927e18a" + integrity sha512-vU3k8JwRUlTkJMfJQY9E4VvLrsIFOpfhnvbuXB84Amo1cJsz+bYQcC6RSvY7qpaDzDKFdUGbJco4uZTRoRf7Mg== + +"@swc/core-win32-ia32-msvc@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.4.5.tgz#69740dc87e449cd82c71d92c899f42b8529cd723" + integrity sha512-856YRh3frRK2XbrSjDOFBgoAqWJLNRkaEtfGzXfeEoyJlOz0BFsSJHxKlHAFkxRfHe2li9DJRUQFTEhXn4OUWw== + +"@swc/core-win32-x64-msvc@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.4.5.tgz#b511eddfe643f7540bbe26fa4982e99c9137746c" + integrity sha512-j1+kV7jmWY1+NbXAvxAEW165781yLXVZKLcoXIZKmw18EatqMF6w8acg1gDG8C+Iw5aWLkRZVS4pijSh7+DtCQ== + +"@swc/core@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.4.5.tgz#c4a2e1f40117d1ab639751e0fd19e103a85b2809" + integrity sha512-4/JGkG4b1Z/QwCGgx+Ub46MlzrsZvBk5JSkxm9PcZ4bSX81c+4Y94Xm3iLp5Ka8NxzS5rD4mJSpcYuN3Tw0ceg== dependencies: "@swc/counter" "^0.1.2" "@swc/types" "^0.1.5" optionalDependencies: - "@swc/core-darwin-arm64" "1.4.2" - "@swc/core-darwin-x64" "1.4.2" - "@swc/core-linux-arm-gnueabihf" "1.4.2" - "@swc/core-linux-arm64-gnu" "1.4.2" - "@swc/core-linux-arm64-musl" "1.4.2" - "@swc/core-linux-x64-gnu" "1.4.2" - "@swc/core-linux-x64-musl" "1.4.2" - "@swc/core-win32-arm64-msvc" "1.4.2" - "@swc/core-win32-ia32-msvc" "1.4.2" - "@swc/core-win32-x64-msvc" "1.4.2" + "@swc/core-darwin-arm64" "1.4.5" + "@swc/core-darwin-x64" "1.4.5" + "@swc/core-linux-arm-gnueabihf" "1.4.5" + "@swc/core-linux-arm64-gnu" "1.4.5" + "@swc/core-linux-arm64-musl" "1.4.5" + "@swc/core-linux-x64-gnu" "1.4.5" + "@swc/core-linux-x64-musl" "1.4.5" + "@swc/core-win32-arm64-msvc" "1.4.5" + "@swc/core-win32-ia32-msvc" "1.4.5" + "@swc/core-win32-x64-msvc" "1.4.5" "@swc/counter@^0.1.2": version "0.1.3" @@ -880,9 +880,9 @@ "@types/estree" "*" "@types/eslint@*", "@types/eslint@^8.44.8": - version "8.56.3" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.3.tgz#d1f6b2303ac5ed53cb2cf59e0ab680cde1698f5f" - integrity sha512-PvSf1wfv2wJpVIFUMSb+i4PvqNYkB9Rkp9ZDO3oaWzq4SKhsQk4mrMBr3ZH06I0hKrVGLBacmgl8JM4WVjb9dg== + version "8.56.5" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.5.tgz#94b88cab77588fcecdd0771a6d576fa1c0af9d02" + integrity sha512-u5/YPJHo1tvkSF2CE0USEkxon82Z5DBy2xR+qfyYNszpX9qcs4sT6uq2kBbj4BXY1+DBGDPnrhMZV3pKWGNukw== dependencies: "@types/estree" "*" "@types/json-schema" "*" @@ -950,9 +950,9 @@ integrity sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg== "@types/node@*": - version "20.11.20" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.20.tgz#f0a2aee575215149a62784210ad88b3a34843659" - integrity sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg== + version "20.11.25" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.25.tgz#0f50d62f274e54dd7a49f7704cc16bfbcccaf49f" + integrity sha512-TBHyJxk2b7HceLVGFcpAUjsa5zIdsPWlR6XHfyGzd0SFu+/NFgQgMAl96MSDZgQDvJAvV6BKsFOrt6zIL09JDw== dependencies: undici-types "~5.26.4" @@ -993,9 +993,9 @@ csstype "^3.0.2" "@types/react@^17": - version "17.0.75" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.75.tgz#cffbc76840a12fcadaf5a3cf14878bb06efcf73d" - integrity sha512-MSA+NzEzXnQKrqpO63CYqNstFjsESgvJAdAyyJ1n6ZQq/GLgf6nOfIKwk+Twuz0L1N6xPe+qz5xRCJrbhMaLsw== + version "17.0.76" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.76.tgz#bfdf762046699e265655cd8f67a51beab6cd1e80" + integrity sha512-w9Aq+qeszGYoQM0hgFcdsAODGJdogadBDiitPm+zjBFJ0mLymvn2qSXsDaLJUndFRqqXk1FQfa9avHUBk1JhJQ== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -1047,16 +1047,16 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@7.0.2": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.0.2.tgz#c13a34057be425167cc4a765158c46fdf2fd981d" - integrity sha512-/XtVZJtbaphtdrWjr+CJclaCVGPtOdBpFEnvtNf/jRV0IiEemRrL0qABex/nEt8isYcnFacm3nPHYQwL+Wb7qg== +"@typescript-eslint/eslint-plugin@7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.1.1.tgz#dd71fc5c7ecec745ca26ece506d84d203a205c0e" + integrity sha512-zioDz623d0RHNhvx0eesUmGfIjzrk18nSBC8xewepKXbBvN/7c1qImV7Hg8TI1URTxKax7/zxfxj3Uph8Chcuw== dependencies: "@eslint-community/regexpp" "^4.5.1" - "@typescript-eslint/scope-manager" "7.0.2" - "@typescript-eslint/type-utils" "7.0.2" - "@typescript-eslint/utils" "7.0.2" - "@typescript-eslint/visitor-keys" "7.0.2" + "@typescript-eslint/scope-manager" "7.1.1" + "@typescript-eslint/type-utils" "7.1.1" + "@typescript-eslint/utils" "7.1.1" + "@typescript-eslint/visitor-keys" "7.1.1" debug "^4.3.4" graphemer "^1.4.0" ignore "^5.2.4" @@ -1064,47 +1064,47 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/parser@7.0.2": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.0.2.tgz#95c31233d343db1ca1df8df7811b5b87ca7b1a68" - integrity sha512-GdwfDglCxSmU+QTS9vhz2Sop46ebNCXpPPvsByK7hu0rFGRHL+AusKQJ7SoN+LbLh6APFpQwHKmDSwN35Z700Q== +"@typescript-eslint/parser@7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.1.1.tgz#6a9d0a5c9ccdf5dbd3cb8c949728c64e24e07d1f" + integrity sha512-ZWUFyL0z04R1nAEgr9e79YtV5LbafdOtN7yapNbn1ansMyaegl2D4bL7vHoJ4HPSc4CaLwuCVas8CVuneKzplQ== dependencies: - "@typescript-eslint/scope-manager" "7.0.2" - "@typescript-eslint/types" "7.0.2" - "@typescript-eslint/typescript-estree" "7.0.2" - "@typescript-eslint/visitor-keys" "7.0.2" + "@typescript-eslint/scope-manager" "7.1.1" + "@typescript-eslint/types" "7.1.1" + "@typescript-eslint/typescript-estree" "7.1.1" + "@typescript-eslint/visitor-keys" "7.1.1" debug "^4.3.4" -"@typescript-eslint/scope-manager@7.0.2": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.0.2.tgz#6ec4cc03752758ddd1fdaae6fbd0ed9a2ca4fe63" - integrity sha512-l6sa2jF3h+qgN2qUMjVR3uCNGjWw4ahGfzIYsCtFrQJCjhbrDPdiihYT8FnnqFwsWX+20hK592yX9I2rxKTP4g== +"@typescript-eslint/scope-manager@7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.1.1.tgz#9e301803ff8e21a74f50c6f89a4baccad9a48f93" + integrity sha512-cirZpA8bJMRb4WZ+rO6+mnOJrGFDd38WoXCEI57+CYBqta8Yc8aJym2i7vyqLL1vVYljgw0X27axkUXz32T8TA== dependencies: - "@typescript-eslint/types" "7.0.2" - "@typescript-eslint/visitor-keys" "7.0.2" + "@typescript-eslint/types" "7.1.1" + "@typescript-eslint/visitor-keys" "7.1.1" -"@typescript-eslint/type-utils@7.0.2": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.0.2.tgz#a7fc0adff0c202562721357e7478207d380a757b" - integrity sha512-IKKDcFsKAYlk8Rs4wiFfEwJTQlHcdn8CLwLaxwd6zb8HNiMcQIFX9sWax2k4Cjj7l7mGS5N1zl7RCHOVwHq2VQ== +"@typescript-eslint/type-utils@7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.1.1.tgz#aee820d5bedd39b83c18585a526cc520ddb7a226" + integrity sha512-5r4RKze6XHEEhlZnJtR3GYeCh1IueUHdbrukV2KSlLXaTjuSfeVF8mZUVPLovidCuZfbVjfhi4c0DNSa/Rdg5g== dependencies: - "@typescript-eslint/typescript-estree" "7.0.2" - "@typescript-eslint/utils" "7.0.2" + "@typescript-eslint/typescript-estree" "7.1.1" + "@typescript-eslint/utils" "7.1.1" debug "^4.3.4" ts-api-utils "^1.0.1" -"@typescript-eslint/types@7.0.2": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.0.2.tgz#b6edd108648028194eb213887d8d43ab5750351c" - integrity sha512-ZzcCQHj4JaXFjdOql6adYV4B/oFOFjPOC9XYwCaZFRvqN8Llfvv4gSxrkQkd2u4Ci62i2c6W6gkDwQJDaRc4nA== +"@typescript-eslint/types@7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.1.1.tgz#ca33ba7cf58224fb46a84fea62593c2c53cd795f" + integrity sha512-KhewzrlRMrgeKm1U9bh2z5aoL4s7K3tK5DwHDn8MHv0yQfWFz/0ZR6trrIHHa5CsF83j/GgHqzdbzCXJ3crx0Q== -"@typescript-eslint/typescript-estree@7.0.2": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.0.2.tgz#3c6dc8a3b9799f4ef7eca0d224ded01974e4cb39" - integrity sha512-3AMc8khTcELFWcKcPc0xiLviEvvfzATpdPj/DXuOGIdQIIFybf4DMT1vKRbuAEOFMwhWt7NFLXRkbjsvKZQyvw== +"@typescript-eslint/typescript-estree@7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.1.1.tgz#09c54af0151a1b05d0875c0fc7fe2ec7a2476ece" + integrity sha512-9ZOncVSfr+sMXVxxca2OJOPagRwT0u/UHikM2Rd6L/aB+kL/QAuTnsv6MeXtjzCJYb8PzrXarypSGIPx3Jemxw== dependencies: - "@typescript-eslint/types" "7.0.2" - "@typescript-eslint/visitor-keys" "7.0.2" + "@typescript-eslint/types" "7.1.1" + "@typescript-eslint/visitor-keys" "7.1.1" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -1112,25 +1112,25 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/utils@7.0.2": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.0.2.tgz#8756123054cd934c8ba7db6a6cffbc654b10b5c4" - integrity sha512-PZPIONBIB/X684bhT1XlrkjNZJIEevwkKDsdwfiu1WeqBxYEEdIgVDgm8/bbKHVu+6YOpeRqcfImTdImx/4Bsw== +"@typescript-eslint/utils@7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.1.1.tgz#bdeeb789eee4af5d3fb5400a69566d4dbf97ff3b" + integrity sha512-thOXM89xA03xAE0lW7alstvnyoBUbBX38YtY+zAUcpRPcq9EIhXPuJ0YTv948MbzmKh6e1AUszn5cBFK49Umqg== dependencies: "@eslint-community/eslint-utils" "^4.4.0" "@types/json-schema" "^7.0.12" "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "7.0.2" - "@typescript-eslint/types" "7.0.2" - "@typescript-eslint/typescript-estree" "7.0.2" + "@typescript-eslint/scope-manager" "7.1.1" + "@typescript-eslint/types" "7.1.1" + "@typescript-eslint/typescript-estree" "7.1.1" semver "^7.5.4" -"@typescript-eslint/visitor-keys@7.0.2": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.0.2.tgz#2899b716053ad7094962beb895d11396fc12afc7" - integrity sha512-8Y+YiBmqPighbm5xA2k4wKTxRzx9EkBu7Rlw+WHqMvRJ3RPz/BMBO9b2ru0LUNmXg120PHUXD5+SWFy2R8DqlQ== +"@typescript-eslint/visitor-keys@7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.1.1.tgz#e6538a58c9b157f03bcbb29e3b6a92fe39a6ab0d" + integrity sha512-yTdHDQxY7cSoCcAtiBzVzxleJhkGB9NncSIyMYe2+OGON1ZsP9zOPws/Pqgopa65jvknOjlk/w7ulPlZ78PiLQ== dependencies: - "@typescript-eslint/types" "7.0.2" + "@typescript-eslint/types" "7.1.1" eslint-visitor-keys "^3.4.1" "@ungap/structured-clone@^1.2.0": @@ -1654,12 +1654,12 @@ atoa@1.0.0: integrity sha512-VVE1H6cc4ai+ZXo/CRWoJiHXrA1qfA31DPnx6D20+kSI547hQN5Greh51LQ1baMRMfxO5K5M4ImMtZbZt2DODQ== autoprefixer@^10.4.17: - version "10.4.17" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.17.tgz#35cd5695cbbe82f536a50fa025d561b01fdec8be" - integrity sha512-/cpVNRLSfhOtcGflT13P2794gVSgmPgTR+erw5ifnMLZb0UnSlkK4tquLmkd3BhA+nLo5tX8Cu0upUsGKvKbmg== + version "10.4.18" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.18.tgz#fcb171a3b017be7cb5d8b7a825f5aacbf2045163" + integrity sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g== dependencies: - browserslist "^4.22.2" - caniuse-lite "^1.0.30001578" + browserslist "^4.23.0" + caniuse-lite "^1.0.30001591" fraction.js "^4.3.7" normalize-range "^0.1.2" picocolors "^1.0.0" @@ -1691,14 +1691,14 @@ balanced-match@^1.0.0: integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== bare-events@^2.0.0, bare-events@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.2.0.tgz#a7a7263c107daf8b85adf0b64f908503454ab26e" - integrity sha512-Yyyqff4PIFfSuthCZqLlPISTWHmnQxoPuAvkmgzsJEmG3CesdIv6Xweayl0JkCZJSB2yYIdJyEz97tpxNhgjbg== + version "2.2.1" + resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.2.1.tgz#7b6d421f26a7a755e20bf580b727c84b807964c1" + integrity sha512-9GYPpsPFvrWBkelIhOhTWtkeZxVxZOdb3VnFTCzlOo3OjvmTvzLoZFUT8kNFACx0vJej6QPney1Cf9BvzCNE/A== bare-fs@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-2.2.0.tgz#e23ab841be0e08b29ad2933281ce4ad5ddd60384" - integrity sha512-+VhW202E9eTVGkX7p+TNXtZC4RTzj9JfJW7PtfIbZ7mIQ/QT9uOafQTx7lx2n9ERmWsXvLHF4hStAFn4gl2mQw== + version "2.2.1" + resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-2.2.1.tgz#c1985d8d3e07a178956b072d3af67cb8c1fa9391" + integrity sha512-+CjmZANQDFZWy4PGbVdmALIwmt33aJg8qTkVjClU6X4WmZkTPBDxRHiBn7fpqEWEfF3AC2io++erpViAIQbSjg== dependencies: bare-events "^2.0.0" bare-os "^2.0.0" @@ -1815,7 +1815,7 @@ browserify-zlib@^0.1.4: dependencies: pako "~0.2.0" -browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.22.2, browserslist@^4.23.0: +browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.23.0: version "4.23.0" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab" integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ== @@ -1931,10 +1931,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001578, caniuse-lite@^1.0.30001587: - version "1.0.30001589" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001589.tgz#7ad6dba4c9bf6561aec8291976402339dc157dfb" - integrity sha512-vNQWS6kI+q6sBlHbh71IIeC+sRwK2N3EDySc/updIGhIee2x5z00J4c1242/5/d6EpEMdOnk/m+6tuk4/tcsqg== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001587, caniuse-lite@^1.0.30001591: + version "1.0.30001594" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001594.tgz#bea552414cd52c2d0c985ed9206314a696e685f5" + integrity sha512-VblSX6nYqyJVs8DKFMldE2IVCJjZ225LW00ydtUWwh5hk9IfkTOffO6r8gJNsH0qqqeAF8KrbMYA2VEwTlGW5g== capital-case@^1.0.4: version "1.0.4" @@ -2409,64 +2409,66 @@ cssesc@^3.0.0: resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssnano-preset-advanced@6.0.5: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cssnano-preset-advanced/-/cssnano-preset-advanced-6.0.5.tgz#4f2c5a1229250129cad4cd11b7e072a720fe6941" - integrity sha512-weLbFCo1ka/9oRYDxa+NngtcWf/yDQi6JnjaUTZ1TROWeQVmA7v3xfHQatNYtWa8sloZaTk7KswcwSs7bj7IbA== +cssnano-preset-advanced@6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/cssnano-preset-advanced/-/cssnano-preset-advanced-6.1.0.tgz#683f1bd56f302efcb62f1c7e373b0839cc47168a" + integrity sha512-/cMni80g5cNwNtYn6CL+U1jCiUS3iCfTKY4AqqGR8t3BBi6AMWaOSYzML+0RK7vZg0suk9zCmivKcN00CTop8g== dependencies: autoprefixer "^10.4.17" - cssnano-preset-default "^6.0.5" - postcss-discard-unused "^6.0.3" - postcss-merge-idents "^6.0.2" - postcss-reduce-idents "^6.0.2" - postcss-zindex "^6.0.1" + browserslist "^4.23.0" + cssnano-preset-default "^6.1.0" + postcss-discard-unused "^6.0.4" + postcss-merge-idents "^6.0.3" + postcss-reduce-idents "^6.0.3" + postcss-zindex "^6.0.2" -cssnano-preset-default@^6.0.5: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-6.0.5.tgz#c7afd6af1230a78b8d12c6da771d1156ab0127cf" - integrity sha512-M+qRDEr5QZrfNl0B2ySdbTLGyNb8kBcSjuwR7WBamYBOEREH9t2efnB/nblekqhdGLZdkf4oZNetykG2JWRdZQ== +cssnano-preset-default@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-6.1.0.tgz#b6f2da3c984c0e84a162862203419cce52a2fa0e" + integrity sha512-4DUXZoDj+PI3fRl3MqMjl9DwLGjcsFP4qt+92nLUcN1RGfw2TY+GwNoG2B38Usu1BrcTs8j9pxNfSusmvtSjfg== dependencies: + browserslist "^4.23.0" css-declaration-sorter "^7.1.1" - cssnano-utils "^4.0.1" + cssnano-utils "^4.0.2" postcss-calc "^9.0.1" - postcss-colormin "^6.0.3" - postcss-convert-values "^6.0.4" - postcss-discard-comments "^6.0.1" - postcss-discard-duplicates "^6.0.2" - postcss-discard-empty "^6.0.2" - postcss-discard-overridden "^6.0.1" - postcss-merge-longhand "^6.0.3" - postcss-merge-rules "^6.0.4" - postcss-minify-font-values "^6.0.2" - postcss-minify-gradients "^6.0.2" - postcss-minify-params "^6.0.3" - postcss-minify-selectors "^6.0.2" - postcss-normalize-charset "^6.0.1" - postcss-normalize-display-values "^6.0.1" - postcss-normalize-positions "^6.0.1" - postcss-normalize-repeat-style "^6.0.1" - postcss-normalize-string "^6.0.1" - postcss-normalize-timing-functions "^6.0.1" - postcss-normalize-unicode "^6.0.3" - postcss-normalize-url "^6.0.1" - postcss-normalize-whitespace "^6.0.1" - postcss-ordered-values "^6.0.1" - postcss-reduce-initial "^6.0.3" - postcss-reduce-transforms "^6.0.1" - postcss-svgo "^6.0.2" - postcss-unique-selectors "^6.0.2" - -cssnano-utils@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-4.0.1.tgz#fd18b42f95938bf55ab47967705355d6047bf1da" - integrity sha512-6qQuYDqsGoiXssZ3zct6dcMxiqfT6epy7x4R0TQJadd4LWO3sPR6JH6ZByOvVLoZ6EdwPGgd7+DR1EmX3tiXQQ== + postcss-colormin "^6.1.0" + postcss-convert-values "^6.1.0" + postcss-discard-comments "^6.0.2" + postcss-discard-duplicates "^6.0.3" + postcss-discard-empty "^6.0.3" + postcss-discard-overridden "^6.0.2" + postcss-merge-longhand "^6.0.4" + postcss-merge-rules "^6.1.0" + postcss-minify-font-values "^6.0.3" + postcss-minify-gradients "^6.0.3" + postcss-minify-params "^6.1.0" + postcss-minify-selectors "^6.0.3" + postcss-normalize-charset "^6.0.2" + postcss-normalize-display-values "^6.0.2" + postcss-normalize-positions "^6.0.2" + postcss-normalize-repeat-style "^6.0.2" + postcss-normalize-string "^6.0.2" + postcss-normalize-timing-functions "^6.0.2" + postcss-normalize-unicode "^6.1.0" + postcss-normalize-url "^6.0.2" + postcss-normalize-whitespace "^6.0.2" + postcss-ordered-values "^6.0.2" + postcss-reduce-initial "^6.1.0" + postcss-reduce-transforms "^6.0.2" + postcss-svgo "^6.0.3" + postcss-unique-selectors "^6.0.3" + +cssnano-utils@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-4.0.2.tgz#56f61c126cd0f11f2eef1596239d730d9fceff3c" + integrity sha512-ZR1jHg+wZ8o4c3zqf1SIUSTIvm/9mU343FMR6Obe/unskbvpGhZOo1J6d/r8D1pzkRQYuwbcH3hToOuoA2G7oQ== cssnano@^6.0.3: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-6.0.5.tgz#5ff1a344ca9d7862ee7198991cf3e7463bd12355" - integrity sha512-tpTp/ukgrElwu3ESFY4IvWnGn8eTt8cJhC2aAbtA3lvUlxp6t6UPv8YCLjNnEGiFreT1O0LiOM1U3QyTBVFl2A== + version "6.1.0" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-6.1.0.tgz#f36de7311d7f7cefe4c6d9045927611d56b6b9eb" + integrity sha512-e2v4w/t3OFM6HTuSweI4RSdABaqgVgHlJp5FZrQsopHnKKHLFIvK2D3C4kHWeFIycN/1L1J5VIrg5KlDzn3r/g== dependencies: - cssnano-preset-default "^6.0.5" + cssnano-preset-default "^6.1.0" lilconfig "^3.1.1" csso@^5.0.5: @@ -2916,9 +2918,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.4.668: - version "1.4.681" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.681.tgz#5f23fad8aa7e1f64cbb7dd9d15c7e39a1cd7e6e3" - integrity sha512-1PpuqJUFWoXZ1E54m8bsLPVYwIVCRzvaL+n5cjigGga4z854abDnFRc+cTa2th4S79kyGqya/1xoR7h+Y5G5lg== + version "1.4.693" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.693.tgz#001bb5dcb57ba404366ec39e1957d11886fc8a93" + integrity sha512-/if4Ueg0GUQlhCrW2ZlXwDAm40ipuKo+OgeHInlL8sbjt+hzISxZK949fZeJaVsheamrzANXvw1zQTvbxTvSHw== emoji-regex@^8.0.0: version "8.0.0" @@ -2955,9 +2957,9 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: once "^1.4.0" enhanced-resolve@^5.0.0, enhanced-resolve@^5.12.0, enhanced-resolve@^5.15.0: - version "5.15.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35" - integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg== + version "5.15.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.1.tgz#384391e025f099e67b4b00bfd7f0906a408214e1" + integrity sha512-3d3JRbwsCLJsYgvb6NuWEG44jjPSOMuS73L/6+7BZuoKm3W+qXnSoIYVHi8dG7Qcg4inAY4jbzkZ7MnskePeDg== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -3000,17 +3002,17 @@ error-ex@^1.3.1: is-arrayish "^0.2.1" es-abstract@^1.22.1, es-abstract@^1.22.3: - version "1.22.4" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.4.tgz#26eb2e7538c3271141f5754d31aabfdb215f27bf" - integrity sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg== + version "1.22.5" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.5.tgz#1417df4e97cc55f09bf7e58d1e614bc61cb8df46" + integrity sha512-oW69R+4q2wG+Hc3KZePPZxOiisRIqfKBVo/HLx94QcJeWGU/8sZhCvc829rd1kS366vlJbzBfXf9yWwf0+Ko7w== dependencies: array-buffer-byte-length "^1.0.1" arraybuffer.prototype.slice "^1.0.3" - available-typed-arrays "^1.0.6" + available-typed-arrays "^1.0.7" call-bind "^1.0.7" es-define-property "^1.0.0" es-errors "^1.3.0" - es-set-tostringtag "^2.0.2" + es-set-tostringtag "^2.0.3" es-to-primitive "^1.2.1" function.prototype.name "^1.1.6" get-intrinsic "^1.2.4" @@ -3018,15 +3020,15 @@ es-abstract@^1.22.1, es-abstract@^1.22.3: globalthis "^1.0.3" gopd "^1.0.1" has-property-descriptors "^1.0.2" - has-proto "^1.0.1" + has-proto "^1.0.3" has-symbols "^1.0.3" hasown "^2.0.1" internal-slot "^1.0.7" is-array-buffer "^3.0.4" is-callable "^1.2.7" - is-negative-zero "^2.0.2" + is-negative-zero "^2.0.3" is-regex "^1.1.4" - is-shared-array-buffer "^1.0.2" + is-shared-array-buffer "^1.0.3" is-string "^1.0.7" is-typed-array "^1.1.13" is-weakref "^1.0.2" @@ -3039,10 +3041,10 @@ es-abstract@^1.22.1, es-abstract@^1.22.3: string.prototype.trim "^1.2.8" string.prototype.trimend "^1.0.7" string.prototype.trimstart "^1.0.7" - typed-array-buffer "^1.0.1" - typed-array-byte-length "^1.0.0" - typed-array-byte-offset "^1.0.0" - typed-array-length "^1.0.4" + typed-array-buffer "^1.0.2" + typed-array-byte-length "^1.0.1" + typed-array-byte-offset "^1.0.2" + typed-array-length "^1.0.5" unbox-primitive "^1.0.2" which-typed-array "^1.1.14" @@ -3068,7 +3070,7 @@ es-module-lexer@^1.2.1: resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5" integrity sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w== -es-set-tostringtag@^2.0.2: +es-set-tostringtag@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777" integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ== @@ -3221,9 +3223,9 @@ eslint-import-resolver-typescript@3.6.1: is-glob "^4.0.3" eslint-module-utils@^2.7.4, eslint-module-utils@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49" - integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw== + version "2.8.1" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz#52f2404300c3bd33deece9d7372fb337cc1d7c34" + integrity sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q== dependencies: debug "^3.2.7" @@ -4315,7 +4317,7 @@ is-lambda@^1.0.1: resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== -is-negative-zero@^2.0.2: +is-negative-zero@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747" integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw== @@ -4391,7 +4393,7 @@ is-regex@^1.1.4: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-shared-array-buffer@^1.0.2: +is-shared-array-buffer@^1.0.2, is-shared-array-buffer@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688" integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg== @@ -5011,10 +5013,10 @@ min-indent@^1.0.1: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -mini-css-extract-plugin@2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.0.tgz#1aeae2a90a954b6426c9e8311eab36b450f553a0" - integrity sha512-CxmUYPFcTgET1zImteG/LZOy/4T5rTojesQXkSNBiquhydn78tfbCE9sjIjnJ/UcjNjOC1bphTCCW5rrS7cXAg== +mini-css-extract-plugin@2.8.1: + version "2.8.1" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.1.tgz#75245f3f30ce3a56dbdd478084df6fe475f02dc7" + integrity sha512-/1HDlyFRxWIZPI1ZpgqlZ8jMw/1Dp/dl3P0L1jtZ+zVcHqwPhGwaJwKL00WVgfnBy6PWCde9W65or7IIETImuA== dependencies: schema-utils "^4.0.0" tapable "^2.2.1" @@ -5203,9 +5205,9 @@ mylas@^2.1.9: integrity sha512-+MrqnJRtxdF+xngFfUUkIMQrUUL0KsxbADUkn23Z/4ibGg192Q+z+CQyiYwvWTsYjJygmMR8+w3ZDa98Zh6ESg== nan@^2.14.2: - version "2.18.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554" - integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w== + version "2.19.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.19.0.tgz#bb58122ad55a6c5bc973303908d5b16cfdd5a8c0" + integrity sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw== nanoid@^3.3.7: version "3.3.7" @@ -5700,17 +5702,17 @@ pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -playwright-core@1.41.2: - version "1.41.2" - resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.41.2.tgz#db22372c708926c697acc261f0ef8406606802d9" - integrity sha512-VaTvwCA4Y8kxEe+kfm2+uUUw5Lubf38RxF7FpBxLPmGe5sdNkSg5e3ChEigaGrX7qdqT3pt2m/98LiyvU2x6CA== +playwright-core@1.42.1: + version "1.42.1" + resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.42.1.tgz#13c150b93c940a3280ab1d3fbc945bc855c9459e" + integrity sha512-mxz6zclokgrke9p1vtdy/COWBH+eOZgYUVVU34C73M+4j4HLlQJHtfcqiqqxpP0o8HhMkflvfbquLX5dg6wlfA== playwright@^1.41.2: - version "1.41.2" - resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.41.2.tgz#4e760b1c79f33d9129a8c65cc27953be6dd35042" - integrity sha512-v0bOa6H2GJChDL8pAeLa/LZC4feoAMbSQm1/jF/ySsWWoaNItvrMP7GEkvEEFyCTUYKMxjQKaTSg5up7nR6/8A== + version "1.42.1" + resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.42.1.tgz#79c828b51fe3830211137550542426111dc8239f" + integrity sha512-PgwB03s2DZBcNRoW+1w9E+VkLBxweib6KTXM0M3tkiT4jVxKSi6PmVJ591J+0u10LUrgxB7dLRbiJqO5s2QPMg== dependencies: - playwright-core "1.41.2" + playwright-core "1.42.1" optionalDependencies: fsevents "2.3.2" @@ -5734,106 +5736,106 @@ postcss-calc@^9.0.1: postcss-selector-parser "^6.0.11" postcss-value-parser "^4.2.0" -postcss-colormin@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-6.0.3.tgz#d33f444299e490e8b0914bd347ca8010983e935c" - integrity sha512-ECpkS+UZRyAtu/kjive2/1mihP+GNtgC8kcdU8ueWZi1ZVxMNnRziCLdhrWECJhEtSWijfX2Cl9XTTCK/hjGaA== +postcss-colormin@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-6.1.0.tgz#076e8d3fb291fbff7b10e6b063be9da42ff6488d" + integrity sha512-x9yX7DOxeMAR+BgGVnNSAxmAj98NX/YxEMNFP+SDCEeNLb2r3i6Hh1ksMsnW8Ub5SLCpbescQqn9YEbE9554Sw== dependencies: browserslist "^4.23.0" caniuse-api "^3.0.0" colord "^2.9.3" postcss-value-parser "^4.2.0" -postcss-convert-values@^6.0.4: - version "6.0.4" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-6.0.4.tgz#1f4cc51197f0f8bd85d6b5df4206df470f3a3df0" - integrity sha512-YT2yrGzPXoQD3YeA2kBo/696qNwn7vI+15AOS2puXWEvSWqdCqlOyDWRy5GNnOc9ACRGOkuQ4ESQEqPJBWt/GA== +postcss-convert-values@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-6.1.0.tgz#3498387f8efedb817cbc63901d45bd1ceaa40f48" + integrity sha512-zx8IwP/ts9WvUM6NkVSkiU902QZL1bwPhaVaLynPtCsOTqp+ZKbNi+s6XJg3rfqpKGA/oc7Oxk5t8pOQJcwl/w== dependencies: browserslist "^4.23.0" postcss-value-parser "^4.2.0" -postcss-discard-comments@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-6.0.1.tgz#46176212bd9c3e5f48aa4b8b4868786726c41d36" - integrity sha512-f1KYNPtqYLUeZGCHQPKzzFtsHaRuECe6jLakf/RjSRqvF5XHLZnM2+fXLhb8Qh/HBFHs3M4cSLb1k3B899RYIg== - -postcss-discard-duplicates@^6.0.2: +postcss-discard-comments@^6.0.2: version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.2.tgz#11f389e6af55099b928dca34b10734360b34bc93" - integrity sha512-U2rsj4w6pAGROCCcD13LP2eBIi1whUsXs4kgE6xkIuGfkbxCBSKhkCTWyowFd66WdVlLv0uM1euJKIgmdmZObg== + resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-6.0.2.tgz#e768dcfdc33e0216380623652b0a4f69f4678b6c" + integrity sha512-65w/uIqhSBBfQmYnG92FO1mWZjJ4GL5b8atm5Yw2UgrwD7HiNiSSNwJor1eCFGzUgYnN/iIknhNRVqjrrpuglw== -postcss-discard-empty@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-6.0.2.tgz#9c4ca61f949dede0f7a1dfe3959e1003d0454500" - integrity sha512-rj6pVC2dVCJrP0Y2RkYTQEbYaCf4HEm+R/2StQgJqGHxAa3+KcYslNQhcRqjLHtl/4wpzipJluaJLqBj6d5eDQ== - -postcss-discard-overridden@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-6.0.1.tgz#c63c559237758d74bc505452393a64dda9b19ef4" - integrity sha512-qs0ehZMMZpSESbRkw1+inkf51kak6OOzNRaoLd/U7Fatp0aN2HQ1rxGOrJvYcRAN9VpX8kUF13R2ofn8OlvFVA== +postcss-discard-duplicates@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.3.tgz#d121e893c38dc58a67277f75bb58ba43fce4c3eb" + integrity sha512-+JA0DCvc5XvFAxwx6f/e68gQu/7Z9ud584VLmcgto28eB8FqSFZwtrLwB5Kcp70eIoWP/HXqz4wpo8rD8gpsTw== -postcss-discard-unused@^6.0.3: +postcss-discard-empty@^6.0.3: version "6.0.3" - resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-6.0.3.tgz#e21de9bc3c0291b9f5a3883667e6f8c09cca5318" - integrity sha512-f0m/zO6BONjcZmp2VQe5CwCQvrcm89DJxYhOgV/nXbMY59j/gxyyx/utMJ18SKSRzutaQd66o+0cj0/yGfNenA== - dependencies: - postcss-selector-parser "^6.0.15" + resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-6.0.3.tgz#ee39c327219bb70473a066f772621f81435a79d9" + integrity sha512-znyno9cHKQsK6PtxL5D19Fj9uwSzC2mB74cpT66fhgOadEUPyXFkbgwm5tvc3bt3NAy8ltE5MrghxovZRVnOjQ== -postcss-merge-idents@^6.0.2: +postcss-discard-overridden@^6.0.2: version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-6.0.2.tgz#c7c06e8105f0a6ac5c644364a2867b27775e272f" - integrity sha512-1fJqEzpgyjuec8UR9WdUDvCU0NhHVwKm4JK2Vk2Xv7RB+zpssSGFNE5Xwa0fmQYFxAwfb824monvKAyqLTGsSw== + resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-6.0.2.tgz#4e9f9c62ecd2df46e8fdb44dc17e189776572e2d" + integrity sha512-j87xzI4LUggC5zND7KdjsI25APtyMuynXZSujByMaav2roV6OZX+8AaCUcZSWqckZpjAjRyFDdpqybgjFO0HJQ== + +postcss-discard-unused@^6.0.4: + version "6.0.4" + resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-6.0.4.tgz#70ad7cd0126e64ce1c9ecb921dd7d2caef0f1324" + integrity sha512-FzaiSnuy637ZJKqAmuKs+0ik+Izd44qSBZ2KWbpnrLQ1eK1mDhk55S29XuUMJeve/bpJJONeskKrfC5begTiVQ== dependencies: - cssnano-utils "^4.0.1" - postcss-value-parser "^4.2.0" + postcss-selector-parser "^6.0.15" -postcss-merge-longhand@^6.0.3: +postcss-merge-idents@^6.0.3: version "6.0.3" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-6.0.3.tgz#862ec759face52b7b33e6a6ee72b1d7dbdee0268" - integrity sha512-kF/y3DU8CRt+SX3tP/aG+2gkZI2Z7OXDsPU7FgxIJmuyhQQ1EHceIYcsp/alvzCm2P4c37Sfdu8nNrHc+YeyLg== + resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-6.0.3.tgz#7b9c31c7bc823c94bec50f297f04e3c2b838ea65" + integrity sha512-1oIoAsODUs6IHQZkLQGO15uGEbK3EAl5wi9SS8hs45VgsxQfMnxvt+L+zIr7ifZFIH14cfAeVe2uCTa+SPRa3g== dependencies: + cssnano-utils "^4.0.2" postcss-value-parser "^4.2.0" - stylehacks "^6.0.3" -postcss-merge-rules@^6.0.4: +postcss-merge-longhand@^6.0.4: version "6.0.4" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-6.0.4.tgz#a4ac3ed63502428d846f8b71b2c880dba58c78f1" - integrity sha512-97iF3UJ5v8N1BWy38y+0l+Z8o5/9uGlEgtWic2PJPzoRrLB6Gxg8TVG93O0EK52jcLeMsywre26AUlX1YAYeHA== + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-6.0.4.tgz#a96f23a31953bdf1683a66059c8a8d469d7e20e6" + integrity sha512-vAfWGcxUUGlFiPM3nDMZA+/Yo9sbpc3JNkcYZez8FfJDv41Dh7tAgA3QGVTocaHCZZL6aXPXPOaBMJsjujodsA== + dependencies: + postcss-value-parser "^4.2.0" + stylehacks "^6.1.0" + +postcss-merge-rules@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-6.1.0.tgz#f3edd175056599a284444aa6553a09d5a4440266" + integrity sha512-lER+W3Gr6XOvxOYk1Vi/6UsAgKMg6MDBthmvbNqi2XxAk/r9XfhdYZSigfWjuWWn3zYw2wLelvtM8XuAEFqRkA== dependencies: browserslist "^4.23.0" caniuse-api "^3.0.0" - cssnano-utils "^4.0.1" + cssnano-utils "^4.0.2" postcss-selector-parser "^6.0.15" -postcss-minify-font-values@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-6.0.2.tgz#fbaad399635ed9fd21078114b5c1109d43a714ed" - integrity sha512-IedzbVMoX0a7VZWjSYr5qJ6C37rws8kl8diPBeMZLJfWKkgXuMFY5R/OxPegn/q9tK9ztd0XRH3aR0u2t+A7uQ== +postcss-minify-font-values@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-6.0.3.tgz#ed07f0e76c1345a9eaafe48b4bc15fdf62822775" + integrity sha512-SmAeTA1We5rMnN3F8X9YBNo9bj9xB4KyDHnaNJnBfQIPi+60fNiR9OTRnIaMqkYzAQX0vObIw4Pn0vuKEOettg== dependencies: postcss-value-parser "^4.2.0" -postcss-minify-gradients@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-6.0.2.tgz#9efc9e3cf026ca2b4d33bce70a167b8416315868" - integrity sha512-vP5mF7iI6/5fcpv+rSfwWQekOE+8I1i7/7RjZPGuIjj6eUaZVeG4XZYZrroFuw1WQd51u2V32wyQFZ+oYdE7CA== +postcss-minify-gradients@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-6.0.3.tgz#ca3eb55a7bdb48a1e187a55c6377be918743dbd6" + integrity sha512-4KXAHrYlzF0Rr7uc4VrfwDJ2ajrtNEpNEuLxFgwkhFZ56/7gaE4Nr49nLsQDZyUe+ds+kEhf+YAUolJiYXF8+Q== dependencies: colord "^2.9.3" - cssnano-utils "^4.0.1" + cssnano-utils "^4.0.2" postcss-value-parser "^4.2.0" -postcss-minify-params@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-6.0.3.tgz#c7e10f924350ae4a3d9698e4d56cc2ec02d65689" - integrity sha512-j4S74d3AAeCK5eGdQndXSrkxusV2ekOxbXGnlnZthMyZBBvSDiU34CihTASbJxuVB3bugudmwolS7+Dgs5OyOQ== +postcss-minify-params@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-6.1.0.tgz#54551dec77b9a45a29c3cb5953bf7325a399ba08" + integrity sha512-bmSKnDtyyE8ujHQK0RQJDIKhQ20Jq1LYiez54WiaOoBtcSuflfK3Nm596LvbtlFcpipMjgClQGyGr7GAs+H1uA== dependencies: browserslist "^4.23.0" - cssnano-utils "^4.0.1" + cssnano-utils "^4.0.2" postcss-value-parser "^4.2.0" -postcss-minify-selectors@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-6.0.2.tgz#62065b38d3453ddc6627ba50e4f4a2154b031aa0" - integrity sha512-0b+m+w7OAvZejPQdN2GjsXLv5o0jqYHX3aoV0e7RBKPCsB7TYG5KKWBFhGnB/iP3213Ts8c5H4wLPLMm7z28Sg== +postcss-minify-selectors@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-6.0.3.tgz#ffc51655d52a01cc09cf90c88923d167d9012396" + integrity sha512-IcV7ZQJcaXyhx4UBpWZMsinGs2NmiUC60rJSkyvjPCPqhNjVGsrJUM+QhAtCaikZ0w0/AbZuH4wVvF/YMuMhvA== dependencies: postcss-selector-parser "^6.0.15" @@ -5865,95 +5867,95 @@ postcss-modules-values@^4.0.0: dependencies: icss-utils "^5.0.0" -postcss-normalize-charset@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-6.0.1.tgz#5f70e1eb8bbdbcfcbed060ef70f179e8fef57d0c" - integrity sha512-aW5LbMNRZ+oDV57PF9K+WI1Z8MPnF+A8qbajg/T8PP126YrGX1f9IQx21GI2OlGz7XFJi/fNi0GTbY948XJtXg== +postcss-normalize-charset@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-6.0.2.tgz#1ec25c435057a8001dac942942a95ffe66f721e1" + integrity sha512-a8N9czmdnrjPHa3DeFlwqst5eaL5W8jYu3EBbTTkI5FHkfMhFZh1EGbku6jhHhIzTA6tquI2P42NtZ59M/H/kQ== -postcss-normalize-display-values@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.1.tgz#ff9aa30bbf1283294bfd9cc8b6fb81ff060a7f2d" - integrity sha512-mc3vxp2bEuCb4LgCcmG1y6lKJu1Co8T+rKHrcbShJwUmKJiEl761qb/QQCfFwlrvSeET3jksolCR/RZuMURudw== +postcss-normalize-display-values@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.2.tgz#54f02764fed0b288d5363cbb140d6950dbbdd535" + integrity sha512-8H04Mxsb82ON/aAkPeq8kcBbAtI5Q2a64X/mnRRfPXBq7XeogoQvReqxEfc0B4WPq1KimjezNC8flUtC3Qz6jg== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-positions@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-6.0.1.tgz#41ffdc72994f024c6cd6e91dbfb40ab9abe6fe90" - integrity sha512-HRsq8u/0unKNvm0cvwxcOUEcakFXqZ41fv3FOdPn916XFUrympjr+03oaLkuZENz3HE9RrQE9yU0Xv43ThWjQg== +postcss-normalize-positions@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-6.0.2.tgz#e982d284ec878b9b819796266f640852dbbb723a" + integrity sha512-/JFzI441OAB9O7VnLA+RtSNZvQ0NCFZDOtp6QPFo1iIyawyXg0YI3CYM9HBy1WvwCRHnPep/BvI1+dGPKoXx/Q== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-repeat-style@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.1.tgz#55dc54b6f80305b280a379899a6626e0a07b04a8" - integrity sha512-Gbb2nmCy6tTiA7Sh2MBs3fj9W8swonk6lw+dFFeQT68B0Pzwp1kvisJQkdV6rbbMSd9brMlS8I8ts52tAGWmGQ== +postcss-normalize-repeat-style@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.2.tgz#f8006942fd0617c73f049dd8b6201c3a3040ecf3" + integrity sha512-YdCgsfHkJ2jEXwR4RR3Tm/iOxSfdRt7jplS6XRh9Js9PyCR/aka/FCb6TuHT2U8gQubbm/mPmF6L7FY9d79VwQ== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-string@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-6.0.1.tgz#7605e0fb4ec7bf2709709991d13a949e4419db1d" - integrity sha512-5Fhx/+xzALJD9EI26Aq23hXwmv97Zfy2VFrt5PLT8lAhnBIZvmaT5pQk+NuJ/GWj/QWaKSKbnoKDGLbV6qnhXg== +postcss-normalize-string@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-6.0.2.tgz#e3cc6ad5c95581acd1fc8774b309dd7c06e5e363" + integrity sha512-vQZIivlxlfqqMp4L9PZsFE4YUkWniziKjQWUtsxUiVsSSPelQydwS8Wwcuw0+83ZjPWNTl02oxlIvXsmmG+CiQ== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-timing-functions@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.1.tgz#ef937b7ca2fd62ed0b46645ea5728b842a3600db" - integrity sha512-4zcczzHqmCU7L5dqTB9rzeqPWRMc0K2HoR+Bfl+FSMbqGBUcP5LRfgcH4BdRtLuzVQK1/FHdFoGT3F7rkEnY+g== +postcss-normalize-timing-functions@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.2.tgz#40cb8726cef999de984527cbd9d1db1f3e9062c0" + integrity sha512-a+YrtMox4TBtId/AEwbA03VcJgtyW4dGBizPl7e88cTFULYsprgHWTbfyjSLyHeBcK/Q9JhXkt2ZXiwaVHoMzA== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-unicode@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.3.tgz#86ca57e765d841ecc0c1c4f2a86182e728bbcf20" - integrity sha512-T2Bb3gXz0ASgc3ori2dzjv6j/P2IantreaC6fT8tWjqYUiqMAh5jGIkdPwEV2FaucjQlCLeFJDJh2BeSugE1ig== +postcss-normalize-unicode@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-6.1.0.tgz#aaf8bbd34c306e230777e80f7f12a4b7d27ce06e" + integrity sha512-QVC5TQHsVj33otj8/JD869Ndr5Xcc/+fwRh4HAsFsAeygQQXm+0PySrKbr/8tkDKzW+EVT3QkqZMfFrGiossDg== dependencies: browserslist "^4.23.0" postcss-value-parser "^4.2.0" -postcss-normalize-url@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-6.0.1.tgz#eae58cb4f5f9a4fa5bbbf6d4222dff534ad46186" - integrity sha512-jEXL15tXSvbjm0yzUV7FBiEXwhIa9H88JOXDGQzmcWoB4mSjZIsmtto066s2iW9FYuIrIF4k04HA2BKAOpbsaQ== +postcss-normalize-url@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-6.0.2.tgz#292792386be51a8de9a454cb7b5c58ae22db0f79" + integrity sha512-kVNcWhCeKAzZ8B4pv/DnrU1wNh458zBNp8dh4y5hhxih5RZQ12QWMuQrDgPRw3LRl8mN9vOVfHl7uhvHYMoXsQ== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-whitespace@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.1.tgz#b5933750b938814c028d3d2b2e5c0199e0037b53" - integrity sha512-76i3NpWf6bB8UHlVuLRxG4zW2YykF9CTEcq/9LGAiz2qBuX5cBStadkk0jSkg9a9TCIXbMQz7yzrygKoCW9JuA== +postcss-normalize-whitespace@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.2.tgz#fbb009e6ebd312f8b2efb225c2fcc7cf32b400cd" + integrity sha512-sXZ2Nj1icbJOKmdjXVT9pnyHQKiSAyuNQHSgRCUgThn2388Y9cGVDR+E9J9iAYbSbLHI+UUwLVl1Wzco/zgv0Q== dependencies: postcss-value-parser "^4.2.0" -postcss-ordered-values@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-6.0.1.tgz#553e735d009065b362da93340e57f43d5f2d0fbc" - integrity sha512-XXbb1O/MW9HdEhnBxitZpPFbIvDgbo9NK4c/5bOfiKpnIGZDoL2xd7/e6jW5DYLsWxBbs+1nZEnVgnjnlFViaA== +postcss-ordered-values@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-6.0.2.tgz#366bb663919707093451ab70c3f99c05672aaae5" + integrity sha512-VRZSOB+JU32RsEAQrO94QPkClGPKJEL/Z9PCBImXMhIeK5KAYo6slP/hBYlLgrCjFxyqvn5VC81tycFEDBLG1Q== dependencies: - cssnano-utils "^4.0.1" + cssnano-utils "^4.0.2" postcss-value-parser "^4.2.0" -postcss-reduce-idents@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-6.0.2.tgz#0585684d7aeaeeebdbec8c2579c7396373e62e2a" - integrity sha512-GKgyBLS5hMCJC8T36h4IH9u0XhmRHRwLwlxP6xVYbAuxKqn3LezEDDIxnb1/Cu2DXGc20jvWK9VZdCVtYAoTyg== +postcss-reduce-idents@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-6.0.3.tgz#b0d9c84316d2a547714ebab523ec7d13704cd486" + integrity sha512-G3yCqZDpsNPoQgbDUy3T0E6hqOQ5xigUtBQyrmq3tn2GxlyiL0yyl7H+T8ulQR6kOcHJ9t7/9H4/R2tv8tJbMA== dependencies: postcss-value-parser "^4.2.0" -postcss-reduce-initial@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-6.0.3.tgz#112b039079ca96faeb0c5bbd8bfab6cf38e8177d" - integrity sha512-w4QIR9pEa1N4xMx3k30T1vLZl6udVK2RmNqrDXhBXX9L0mBj2a8ADs8zkbaEH7eUy1m30Wyr5EBgHN31Yq1JvA== +postcss-reduce-initial@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-6.1.0.tgz#4401297d8e35cb6e92c8e9586963e267105586ba" + integrity sha512-RarLgBK/CrL1qZags04oKbVbrrVK2wcxhvta3GCxrZO4zveibqbRPmm2VI8sSgCXwoUHEliRSbOfpR0b/VIoiw== dependencies: browserslist "^4.23.0" caniuse-api "^3.0.0" -postcss-reduce-transforms@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.1.tgz#7bf59d7c6e7066e3b18ef17237d2344bd3da6d75" - integrity sha512-fUbV81OkUe75JM+VYO1gr/IoA2b/dRiH6HvMwhrIBSUrxq3jNZQZitSnugcTLDi1KkQh1eR/zi+iyxviUNBkcQ== +postcss-reduce-transforms@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.2.tgz#6fa2c586bdc091a7373caeee4be75a0f3e12965d" + integrity sha512-sB+Ya++3Xj1WaT9+5LOOdirAxP7dJZms3GRcYheSPi1PiTMigsxHAdkrbItHxwYHr4kt1zL7mmcHstgMYT+aiA== dependencies: postcss-value-parser "^4.2.0" @@ -5965,18 +5967,18 @@ postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.15, postcss-select cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-svgo@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-6.0.2.tgz#dbc9d03e7f346bc0d82443078602a951e0214836" - integrity sha512-IH5R9SjkTkh0kfFOQDImyy1+mTCb+E830+9SV1O+AaDcoHTvfsvt6WwJeo7KwcHbFnevZVCsXhDmjFiGVuwqFQ== +postcss-svgo@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-6.0.3.tgz#1d6e180d6df1fa8a3b30b729aaa9161e94f04eaa" + integrity sha512-dlrahRmxP22bX6iKEjOM+c8/1p+81asjKT+V5lrgOH944ryx/OHpclnIbGsKVd3uWOXFLYJwCVf0eEkJGvO96g== dependencies: postcss-value-parser "^4.2.0" svgo "^3.2.0" -postcss-unique-selectors@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-6.0.2.tgz#09a34a5a31a649d3e9bca5962af0616f39d071d2" - integrity sha512-8IZGQ94nechdG7Y9Sh9FlIY2b4uS8/k8kdKRX040XHsS3B6d1HrJAkXrBSsSu4SuARruSsUjW3nlSw8BHkaAYQ== +postcss-unique-selectors@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-6.0.3.tgz#dbba572b842ab6fc410307172f13d362e0a836e7" + integrity sha512-NFXbYr8qdmCr/AFceaEfdcsKGCvWTeGO6QVC9h2GvtWgj0/0dklKQcaMMVzs6tr8bY+ase8hOtHW8OBTTRvS8A== dependencies: postcss-selector-parser "^6.0.15" @@ -5985,10 +5987,10 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss-zindex@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-6.0.1.tgz#30a4397a71b5cc291d464ee986e146e0f8143d4a" - integrity sha512-wQF95TIerYvPlsjwldO7iGP3Z3arhuYRK/gndq4NAdZaEsdUkmQYtRqkrEPMzJOQFBk06wFtzkHZKJoQlqFgXQ== +postcss-zindex@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-6.0.2.tgz#e498304b83a8b165755f53db40e2ea65a99b56e1" + integrity sha512-5BxW9l1evPB/4ZIc+2GobEBoKC+h8gPGCMi+jxsYvd2x0mjq7wazk6DrP71pStqxE9Foxh5TVnonbWpFZzXaYg== postcss@^8.4.33: version "8.4.35" @@ -6000,9 +6002,9 @@ postcss@^8.4.33: source-map-js "^1.0.2" prebuild-install@^7.0.1, prebuild-install@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45" - integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw== + version "7.1.2" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.2.tgz#a5fd9986f5a6251fbc47e1e5c65de71e68c0a056" + integrity sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ== dependencies: detect-libc "^2.0.0" expand-template "^2.0.3" @@ -6101,11 +6103,11 @@ punycode@^2.1.0: integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== qs@^6.9.1: - version "6.11.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9" - integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA== + version "6.12.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.0.tgz#edd40c3b823995946a8a0b1f208669c7a200db77" + integrity sha512-trVZiI6RMOkO476zLGaBIzszOdFPnCCXHPG9kn0yuS1uz6xdVxPfZdB3vUig9pxPFDM9BRAgz/YUIVQ1/vuiUg== dependencies: - side-channel "^1.0.4" + side-channel "^1.0.6" queue-lit@^1.5.1: version "1.5.2" @@ -6436,7 +6438,7 @@ rimraf@^2.6.3: dependencies: glob "^7.1.3" -rimraf@^3.0.0, rimraf@^3.0.2: +rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -6678,12 +6680,12 @@ shell-quote@^1.8.1: resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== -side-channel@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.5.tgz#9a84546599b48909fb6af1211708d23b1946221b" - integrity sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ== +side-channel@^1.0.4, side-channel@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" + integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA== dependencies: - call-bind "^1.0.6" + call-bind "^1.0.7" es-errors "^1.3.0" get-intrinsic "^1.2.4" object-inspect "^1.13.1" @@ -7002,10 +7004,10 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== -stylehacks@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-6.0.3.tgz#3cb7d4ceae5f310b9d211fd49bfda18984e89b9f" - integrity sha512-KzBqjnqktc8/I0ERCb+lGq06giF/JxDbw2r9kEVhen9noHeIDRtMWUp9r62sOk+/2bbX6sFG1GhsS7ToXG0PEg== +stylehacks@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-6.1.0.tgz#42b922c77a0f2c83692a5c9ef07d722d4d174ecb" + integrity sha512-ETErsPFgwlfYZ/CSjMO2Ddf+TsnkCVPBPaoB99Ro8WMAxf7cglzmFsRBhRmKObFjibtcvlNxFFPHuyr3sNlNUQ== dependencies: browserslist "^4.23.0" postcss-selector-parser "^6.0.15" @@ -7161,9 +7163,9 @@ terser-webpack-plugin@5.3.10, terser-webpack-plugin@^5.3.10: terser "^5.26.0" terser@^5.10.0, terser@^5.15.1, terser@^5.26.0: - version "5.28.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.28.1.tgz#bf00f7537fd3a798c352c2d67d67d65c915d1b28" - integrity sha512-wM+bZp54v/E9eRRGXb5ZFDvinrJIOaTapx3WUokyVGZu5ucVCK55zEgGd5Dl2fSr3jUo5sDiERErUWLY6QPFyA== + version "5.29.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.29.1.tgz#44e58045b70c09792ba14bfb7b4e14ca8755b9fa" + integrity sha512-lZQ/fyaIGxsbGxApKmoPTODIzELy3++mXhS5hOqaAWZjQtpq/hFHAc+rm29NND1rYRxRWKcjuARNwULNXa5RtQ== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -7189,11 +7191,9 @@ ticky@1.0.1: integrity sha512-RX35iq/D+lrsqhcPWIazM9ELkjOe30MSeoBHQHSsRwd1YuhJO5ui1K1/R0r7N3mFvbLBs33idw+eR6j+w6i/DA== tmp@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" - integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== - dependencies: - rimraf "^3.0.0" + version "0.2.3" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae" + integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w== to-regex-range@^5.0.1: version "5.0.1" @@ -7347,7 +7347,7 @@ type-is@^1.6.16: media-typer "0.3.0" mime-types "~2.1.24" -typed-array-buffer@^1.0.1: +typed-array-buffer@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3" integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ== @@ -7356,7 +7356,7 @@ typed-array-buffer@^1.0.1: es-errors "^1.3.0" is-typed-array "^1.1.13" -typed-array-byte-length@^1.0.0: +typed-array-byte-length@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67" integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw== @@ -7367,7 +7367,7 @@ typed-array-byte-length@^1.0.0: has-proto "^1.0.3" is-typed-array "^1.1.13" -typed-array-byte-offset@^1.0.0: +typed-array-byte-offset@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063" integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA== @@ -7379,7 +7379,7 @@ typed-array-byte-offset@^1.0.0: has-proto "^1.0.3" is-typed-array "^1.1.13" -typed-array-length@^1.0.4: +typed-array-length@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.5.tgz#57d44da160296d8663fd63180a1802ebf25905d5" integrity sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA== @@ -7400,10 +7400,10 @@ typed-rest-client@^1.8.4: tunnel "0.0.6" underscore "^1.12.1" -typescript@5.3.3: - version "5.3.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37" - integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== +typescript@5.4.2: + version "5.4.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.2.tgz#0ae9cebcfae970718474fe0da2c090cad6577372" + integrity sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ== typescript@^4.9.5: version "4.9.5" From 35409caea33eed8089f68366ef13e20ce4642e39 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Fri, 8 Mar 2024 10:06:58 -0700 Subject: [PATCH 0568/1012] Updates Focus View tabs --- src/webviews/apps/plus/focus/components/focus-app.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/webviews/apps/plus/focus/components/focus-app.ts b/src/webviews/apps/plus/focus/components/focus-app.ts index 6d699c711f5b4..54cd39d647b92 100644 --- a/src/webviews/apps/plus/focus/components/focus-app.ts +++ b/src/webviews/apps/plus/focus/components/focus-app.ts @@ -30,9 +30,9 @@ export class GlFocusApp extends LitElement { static override styles = [themeProperties]; private readonly tabFilters = ['prs', 'issues', 'snoozed']; private readonly tabFilterOptions = [ - { label: 'All', value: '' }, - { label: 'PRs', value: 'prs' }, + { label: 'Pull Requests', value: 'prs' }, { label: 'Issues', value: 'issues' }, + { label: 'All', value: '' }, { label: 'Snoozed', value: 'snoozed' }, ]; private readonly mineFilters = ['authored', 'assigned', 'review-requested', 'mentioned']; @@ -53,7 +53,7 @@ export class GlFocusApp extends LitElement { private subScriptionBadgeEl!: FeatureGateBadge; @state() - private selectedTabFilter?: string; + private selectedTabFilter?: string = 'prs'; @state() private selectedMineFilter?: string; From 8795b8c19dd1fee0b9f50c23172798698955eccf Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 8 Mar 2024 14:31:17 -0500 Subject: [PATCH 0569/1012] Expands PR nodes to include commits and changes --- src/git/actions/commit.ts | 2 +- src/git/queryResults.ts | 135 ++++++++++++++++++++++++++ src/views/nodes/abstract/viewNode.ts | 5 + src/views/nodes/compareBranchNode.ts | 53 +++------- src/views/nodes/compareResultsNode.ts | 122 +++-------------------- src/views/nodes/pullRequestNode.ts | 80 ++++++++++++++- src/views/nodes/resultsCommitsNode.ts | 31 +++--- src/views/nodes/resultsFilesNode.ts | 24 ++--- src/views/nodes/searchResultsNode.ts | 2 +- 9 files changed, 267 insertions(+), 187 deletions(-) create mode 100644 src/git/queryResults.ts diff --git a/src/git/actions/commit.ts b/src/git/actions/commit.ts index 9d46eaae7bc45..23d296e6ecba2 100644 --- a/src/git/actions/commit.ts +++ b/src/git/actions/commit.ts @@ -16,7 +16,6 @@ import { showRevisionFilesPicker } from '../../quickpicks/revisionFilesPicker'; import { executeCommand, executeCoreGitCommand, executeEditorCommand } from '../../system/command'; import { configuration } from '../../system/configuration'; import { findOrOpenEditor, findOrOpenEditors, openChangesEditor } from '../../system/utils'; -import { getAheadBehindFilesQuery } from '../../views/nodes/compareResultsNode'; import { GitUri } from '../gitUri'; import type { GitCommit } from '../models/commit'; import { isCommit } from '../models/commit'; @@ -32,6 +31,7 @@ import { isUncommittedStaged, shortenRevision, } from '../models/reference'; +import { getAheadBehindFilesQuery } from '../queryResults'; export type Ref = { repoPath: string; ref: string }; export type RefRange = { repoPath: string; rhs: string; lhs: string }; diff --git a/src/git/queryResults.ts b/src/git/queryResults.ts new file mode 100644 index 0000000000000..007c2edab2290 --- /dev/null +++ b/src/git/queryResults.ts @@ -0,0 +1,135 @@ +import type { Container } from '../container'; +import { getSettledValue } from '../system/promise'; +import { pluralize } from '../system/string'; +import type { FilesQueryFilter } from '../views/nodes/resultsFilesNode'; +import type { GitDiffShortStat } from './models/diff'; +import type { GitFile } from './models/file'; +import type { GitLog } from './models/log'; +import type { GitUser } from './models/user'; + +export interface CommitsQueryResults { + readonly label: string; + readonly log: GitLog | undefined; + readonly hasMore: boolean; + more?(limit: number | undefined): Promise; +} + +export interface FilesQueryResults { + label: string; + files: GitFile[] | undefined; + stats?: (GitDiffShortStat & { approximated?: boolean }) | undefined; + + filtered?: Map; +} + +export async function getAheadBehindFilesQuery( + container: Container, + repoPath: string, + comparison: string, + compareWithWorkingTree: boolean, +): Promise { + const [filesResult, workingFilesResult, statsResult, workingStatsResult] = await Promise.allSettled([ + container.git.getDiffStatus(repoPath, comparison), + compareWithWorkingTree ? container.git.getDiffStatus(repoPath, 'HEAD') : undefined, + container.git.getChangedFilesCount(repoPath, comparison), + compareWithWorkingTree ? container.git.getChangedFilesCount(repoPath, 'HEAD') : undefined, + ]); + + let files = getSettledValue(filesResult) ?? []; + let stats: FilesQueryResults['stats'] = getSettledValue(statsResult); + + if (compareWithWorkingTree) { + const workingFiles = getSettledValue(workingFilesResult); + if (workingFiles != null) { + if (files.length === 0) { + files = workingFiles ?? []; + } else { + for (const wf of workingFiles) { + const index = files.findIndex(f => f.path === wf.path); + if (index !== -1) { + files.splice(index, 1, wf); + } else { + files.push(wf); + } + } + } + } + + const workingStats = getSettledValue(workingStatsResult); + if (workingStats != null) { + if (stats == null) { + stats = workingStats; + } else { + stats = { + additions: stats.additions + workingStats.additions, + deletions: stats.deletions + workingStats.deletions, + changedFiles: files.length, + approximated: true, + }; + } + } + } + + return { + label: `${pluralize('file', files.length, { zero: 'No' })} changed`, + files: files, + stats: stats, + }; +} + +export function getCommitsQuery( + container: Container, + repoPath: string, + range: string, + filterByAuthors?: GitUser[] | undefined, +): (limit: number | undefined) => Promise { + return async (limit: number | undefined) => { + const log = await container.git.getLog(repoPath, { + limit: limit, + ref: range, + authors: filterByAuthors, + }); + + const results: Mutable> = { + log: log, + hasMore: log?.hasMore ?? true, + }; + if (results.hasMore) { + results.more = async (limit: number | undefined) => { + results.log = (await results.log?.more?.(limit)) ?? results.log; + results.hasMore = results.log?.hasMore ?? true; + }; + } + + return results as CommitsQueryResults; + }; +} + +export async function getFilesQuery( + container: Container, + repoPath: string, + ref1: string, + ref2: string, +): Promise { + let comparison; + if (ref2 === '') { + debugger; + throw new Error('Cannot get files for comparisons of a ref with working tree'); + } else if (ref1 === '') { + comparison = ref2; + } else { + comparison = `${ref2}..${ref1}`; + } + + const [filesResult, statsResult] = await Promise.allSettled([ + container.git.getDiffStatus(repoPath, comparison), + container.git.getChangedFilesCount(repoPath, comparison), + ]); + + const files = getSettledValue(filesResult) ?? []; + return { + label: `${pluralize('file', files.length, { zero: 'No' })} changed`, + files: files, + stats: getSettledValue(statsResult), + }; +} diff --git a/src/views/nodes/abstract/viewNode.ts b/src/views/nodes/abstract/viewNode.ts index 145ea89ea3a84..9cc170797a7b7 100644 --- a/src/views/nodes/abstract/viewNode.ts +++ b/src/views/nodes/abstract/viewNode.ts @@ -5,6 +5,7 @@ import type { GitBranch } from '../../../git/models/branch'; import type { GitCommit } from '../../../git/models/commit'; import type { GitContributor } from '../../../git/models/contributor'; import type { GitFile } from '../../../git/models/file'; +import type { PullRequest } from '../../../git/models/pullRequest'; import type { GitReflogRecord } from '../../../git/models/reflog'; import type { GitRemote } from '../../../git/models/remote'; import type { Repository } from '../../../git/models/repository'; @@ -125,6 +126,7 @@ export interface AmbientContext { readonly contributor?: GitContributor; readonly draft?: Draft; readonly file?: GitFile; + readonly pullRequest?: PullRequest; readonly reflog?: GitReflogRecord; readonly remote?: GitRemote; readonly repository?: Repository; @@ -170,6 +172,9 @@ export function getViewNodeId(type: string, context: AmbientContext): string { if (context.branchStatusUpstreamType != null) { uniqueness += `/branch-status-direction/${context.branchStatusUpstreamType}`; } + if (context.pullRequest != null) { + uniqueness += `/pr/${context.pullRequest.id}`; + } if (context.status != null) { uniqueness += `/status/${context.status}`; } diff --git a/src/views/nodes/compareBranchNode.ts b/src/views/nodes/compareBranchNode.ts index 54606c57ba463..7170c6484e009 100644 --- a/src/views/nodes/compareBranchNode.ts +++ b/src/views/nodes/compareBranchNode.ts @@ -7,6 +7,8 @@ import type { GitUri } from '../../git/gitUri'; import type { GitBranch } from '../../git/models/branch'; import { createRevisionRange, shortenRevision } from '../../git/models/reference'; import type { GitUser } from '../../git/models/user'; +import type { CommitsQueryResults, FilesQueryResults } from '../../git/queryResults'; +import { getCommitsQuery, getFilesQuery } from '../../git/queryResults'; import { CommandQuickPickItem } from '../../quickpicks/items/common'; import { showReferencePicker } from '../../quickpicks/referencePicker'; import { debug, log } from '../../system/decorators/log'; @@ -24,9 +26,7 @@ import { resetComparisonCheckedFiles, restoreComparisonCheckedFiles, } from './compareResultsNode'; -import type { CommitsQueryResults } from './resultsCommitsNode'; import { ResultsCommitsNode } from './resultsCommitsNode'; -import type { FilesQueryResults } from './resultsFilesNode'; import { ResultsFilesNode } from './resultsFilesNode'; type State = { @@ -383,50 +383,21 @@ export class CompareBranchNode extends SubscribeableViewNode< } private getCommitsQuery(range: string): (limit: number | undefined) => Promise { - const repoPath = this.repoPath; - return async (limit: number | undefined) => { - const log = await this.view.container.git.getLog(repoPath, { - limit: limit, - ref: range, - authors: this.filterByAuthors, - }); - - const results: Mutable> = { - log: log, - hasMore: log?.hasMore ?? true, - }; - if (results.hasMore) { - results.more = async (limit: number | undefined) => { - results.log = (await results.log?.more?.(limit)) ?? results.log; - results.hasMore = results.log?.hasMore ?? true; - }; - } - - return results as CommitsQueryResults; - }; + return getCommitsQuery(this.view.container, this.repoPath, range, this.filterByAuthors); } - private async getFilesQuery(): Promise { - let comparison; - if (!this._compareWith?.ref) { - comparison = this.branch.ref; + private getFilesQuery(): Promise { + let ref1 = this.branch.ref; + let ref2 = this._compareWith?.ref; + + if (!ref2) { + ref2 = ref1; + ref1 = ''; } else if (this.compareWithWorkingTree) { - comparison = this._compareWith.ref; - } else { - comparison = `${this._compareWith.ref}..${this.branch.ref}`; + ref1 = ''; } - const [filesResult, statsResult] = await Promise.allSettled([ - this.view.container.git.getDiffStatus(this.repoPath, comparison), - this.view.container.git.getChangedFilesCount(this.repoPath, comparison), - ]); - - const files = getSettledValue(filesResult) ?? []; - return { - label: `${pluralize('file', files.length, { zero: 'No' })} changed`, - files: files, - stats: getSettledValue(statsResult), - }; + return getFilesQuery(this.view.container, this.repoPath, ref1, ref2); } private getStorageId() { diff --git a/src/views/nodes/compareResultsNode.ts b/src/views/nodes/compareResultsNode.ts index 7462e0712216d..f3eca10f93212 100644 --- a/src/views/nodes/compareResultsNode.ts +++ b/src/views/nodes/compareResultsNode.ts @@ -2,24 +2,22 @@ import type { Disposable, TreeCheckboxChangeEvent } from 'vscode'; import { ThemeIcon, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, window } from 'vscode'; import { md5 } from '@env/crypto'; import type { StoredNamedRef } from '../../constants'; -import type { Container } from '../../container'; import type { FilesComparison } from '../../git/actions/commit'; import { GitUri } from '../../git/gitUri'; import { createRevisionRange, shortenRevision } from '../../git/models/reference'; import type { GitUser } from '../../git/models/user'; +import type { CommitsQueryResults, FilesQueryResults } from '../../git/queryResults'; +import { getAheadBehindFilesQuery, getCommitsQuery, getFilesQuery } from '../../git/queryResults'; import { gate } from '../../system/decorators/gate'; import { debug, log } from '../../system/decorators/log'; import { weakEvent } from '../../system/event'; -import { getSettledValue } from '../../system/promise'; import { pluralize } from '../../system/string'; import type { SearchAndCompareView } from '../searchAndCompareView'; import type { View } from '../viewBase'; import { SubscribeableViewNode } from './abstract/subscribeableViewNode'; import type { ViewNode } from './abstract/viewNode'; import { ContextValues, getViewNodeId } from './abstract/viewNode'; -import type { CommitsQueryResults } from './resultsCommitsNode'; import { ResultsCommitsNode } from './resultsCommitsNode'; -import type { FilesQueryResults } from './resultsFilesNode'; import { ResultsFilesNode } from './resultsFilesNode'; let instanceId = 0; @@ -269,72 +267,29 @@ export class CompareResultsNode extends SubscribeableViewNode< } private async getAheadFilesQuery(): Promise { - return this.getAheadBehindFilesQuery( + return getAheadBehindFilesQuery( + this.view.container, + this.repoPath, createRevisionRange(this._compareWith?.ref || 'HEAD', this._ref.ref || 'HEAD', '...'), this._ref.ref === '', ); } private async getBehindFilesQuery(): Promise { - return this.getAheadBehindFilesQuery( + return getAheadBehindFilesQuery( + this.view.container, + this.repoPath, createRevisionRange(this._ref.ref || 'HEAD', this._compareWith.ref || 'HEAD', '...'), false, ); } - private async getAheadBehindFilesQuery( - comparison: string, - compareWithWorkingTree: boolean, - ): Promise { - return getAheadBehindFilesQuery(this.view.container, this.repoPath, comparison, compareWithWorkingTree); - } - private getCommitsQuery(range: string): (limit: number | undefined) => Promise { - const repoPath = this.repoPath; - return async (limit: number | undefined) => { - const log = await this.view.container.git.getLog(repoPath, { - limit: limit, - ref: range, - authors: this.filterByAuthors, - }); - - const results: Mutable> = { - log: log, - hasMore: log?.hasMore ?? true, - }; - if (results.hasMore) { - results.more = async (limit: number | undefined) => { - results.log = (await results.log?.more?.(limit)) ?? results.log; - results.hasMore = results.log?.hasMore ?? true; - }; - } - - return results as CommitsQueryResults; - }; + return getCommitsQuery(this.view.container, this.repoPath, range, this.filterByAuthors); } - private async getFilesQuery(): Promise { - let comparison; - if (this._compareWith.ref === '') { - debugger; - throw new Error('Cannot get files for comparisons of a ref with working tree'); - } else if (this._ref.ref === '') { - comparison = this._compareWith.ref; - } else { - comparison = `${this._compareWith.ref}..${this._ref.ref}`; - } - - const [filesResult, statsResult] = await Promise.allSettled([ - this.view.container.git.getDiffStatus(this.repoPath, comparison), - this.view.container.git.getChangedFilesCount(this.repoPath, comparison), - ]); - - const files = getSettledValue(filesResult) ?? []; - return { - label: `${pluralize('file', files.length, { zero: 'No' })} changed`, - files: files, - stats: getSettledValue(statsResult), - }; + private getFilesQuery(): Promise { + return getFilesQuery(this.view.container, this.repoPath, this._ref.ref, this._compareWith.ref); } private getStorageId() { @@ -371,61 +326,6 @@ export class CompareResultsNode extends SubscribeableViewNode< } } -export async function getAheadBehindFilesQuery( - container: Container, - repoPath: string, - comparison: string, - compareWithWorkingTree: boolean, -): Promise { - const [filesResult, workingFilesResult, statsResult, workingStatsResult] = await Promise.allSettled([ - container.git.getDiffStatus(repoPath, comparison), - compareWithWorkingTree ? container.git.getDiffStatus(repoPath, 'HEAD') : undefined, - container.git.getChangedFilesCount(repoPath, comparison), - compareWithWorkingTree ? container.git.getChangedFilesCount(repoPath, 'HEAD') : undefined, - ]); - - let files = getSettledValue(filesResult) ?? []; - let stats: FilesQueryResults['stats'] = getSettledValue(statsResult); - - if (compareWithWorkingTree) { - const workingFiles = getSettledValue(workingFilesResult); - if (workingFiles != null) { - if (files.length === 0) { - files = workingFiles ?? []; - } else { - for (const wf of workingFiles) { - const index = files.findIndex(f => f.path === wf.path); - if (index !== -1) { - files.splice(index, 1, wf); - } else { - files.push(wf); - } - } - } - } - - const workingStats = getSettledValue(workingStatsResult); - if (workingStats != null) { - if (stats == null) { - stats = workingStats; - } else { - stats = { - additions: stats.additions + workingStats.additions, - deletions: stats.deletions + workingStats.deletions, - changedFiles: files.length, - approximated: true, - }; - } - } - } - - return { - label: `${pluralize('file', files.length, { zero: 'No' })} changed`, - files: files, - stats: stats, - }; -} - export function getComparisonStoragePrefix(storageId: string) { return `${storageId}|`; } diff --git a/src/views/nodes/pullRequestNode.ts b/src/views/nodes/pullRequestNode.ts index 12041d9f9e172..383f9455a2bdc 100644 --- a/src/views/nodes/pullRequestNode.ts +++ b/src/views/nodes/pullRequestNode.ts @@ -4,11 +4,19 @@ import { GitBranch } from '../../git/models/branch'; import type { GitCommit } from '../../git/models/commit'; import { getIssueOrPullRequestMarkdownIcon, getIssueOrPullRequestThemeIcon } from '../../git/models/issue'; import type { PullRequest } from '../../git/models/pullRequest'; +import { getComparisonRefsForPullRequest } from '../../git/models/pullRequest'; import type { GitBranchReference } from '../../git/models/reference'; +import { createRevisionRange } from '../../git/models/reference'; +import { getAheadBehindFilesQuery, getCommitsQuery } from '../../git/queryResults'; +import { pluralize } from '../../system/string'; import type { ViewsWithCommits } from '../viewBase'; -import { ContextValues, getViewNodeId, ViewNode } from './abstract/viewNode'; +import { CacheableChildrenViewNode } from './abstract/cacheableChildrenViewNode'; +import type { ViewNode } from './abstract/viewNode'; +import { ContextValues, getViewNodeId } from './abstract/viewNode'; +import { ResultsCommitsNode } from './resultsCommitsNode'; +import { ResultsFilesNode } from './resultsFilesNode'; -export class PullRequestNode extends ViewNode<'pullrequest', ViewsWithCommits> { +export class PullRequestNode extends CacheableChildrenViewNode<'pullrequest', ViewsWithCommits> { readonly repoPath: string; constructor( @@ -36,6 +44,7 @@ export class PullRequestNode extends ViewNode<'pullrequest', ViewsWithCommits> { } } + this.updateContext({ pullRequest: pullRequest }); this._uniqueId = getViewNodeId(this.type, this.context); this.repoPath = repoPath; } @@ -74,12 +83,73 @@ export class PullRequestNode extends ViewNode<'pullrequest', ViewsWithCommits> { return undefined; } - getChildren(): ViewNode[] { - return []; + async getChildren(): Promise { + if (this.children == null) { + const refs = await getComparisonRefsForPullRequest( + this.view.container, + this.repoPath, + this.pullRequest.refs!, + ); + + const comparison = { + ref1: refs.base.ref, + ref2: refs.head.ref, + }; + + const aheadBehindCounts = await this.view.container.git.getAheadBehindCommitCount(this.repoPath, [ + createRevisionRange(comparison.ref2, comparison.ref1, '...'), + ]); + + const children = [ + new ResultsCommitsNode( + this.view, + this, + this.repoPath, + 'Commits', + { + query: getCommitsQuery( + this.view.container, + this.repoPath, + createRevisionRange(comparison.ref1, comparison.ref2, '..'), + ), + comparison: comparison, + }, + { + autolinks: false, + expand: false, + description: pluralize('commit', aheadBehindCounts?.ahead ?? 0), + }, + ), + new ResultsFilesNode( + this.view, + this, + this.repoPath, + comparison.ref1, + comparison.ref2, + () => + getAheadBehindFilesQuery( + this.view.container, + this.repoPath, + createRevisionRange(comparison.ref1, comparison.ref2, '...'), + false, + ), + undefined, + { expand: true, timeout: false }, + ), + ]; + + this.children = children; + } + return this.children; } getTreeItem(): TreeItem { - const item = new TreeItem(`#${this.pullRequest.id}: ${this.pullRequest.title}`, TreeItemCollapsibleState.None); + const hasRefs = this.pullRequest.refs?.base != null && this.pullRequest.refs.head != null; + + const item = new TreeItem( + `#${this.pullRequest.id}: ${this.pullRequest.title}`, + hasRefs ? TreeItemCollapsibleState.Collapsed : TreeItemCollapsibleState.None, + ); item.id = this.id; item.contextValue = ContextValues.PullRequest; if (this.pullRequest.refs?.base != null && this.pullRequest.refs.head != null) { diff --git a/src/views/nodes/resultsCommitsNode.ts b/src/views/nodes/resultsCommitsNode.ts index 3b349013076c2..a87e754fd1eb9 100644 --- a/src/views/nodes/resultsCommitsNode.ts +++ b/src/views/nodes/resultsCommitsNode.ts @@ -1,7 +1,7 @@ import { TreeItem, TreeItemCollapsibleState } from 'vscode'; import { GitUri } from '../../git/gitUri'; import { isStash } from '../../git/models/commit'; -import type { GitLog } from '../../git/models/log'; +import type { CommitsQueryResults, FilesQueryResults } from '../../git/queryResults'; import { configuration } from '../../system/configuration'; import { gate } from '../../system/decorators/gate'; import { debug } from '../../system/decorators/log'; @@ -15,15 +15,13 @@ import { AutolinkedItemsNode } from './autolinkedItemsNode'; import { CommitNode } from './commitNode'; import { LoadMoreNode } from './common'; import { insertDateMarkers } from './helpers'; -import type { FilesQueryResults } from './resultsFilesNode'; import { ResultsFilesNode } from './resultsFilesNode'; import { StashNode } from './stashNode'; -export interface CommitsQueryResults { - readonly label: string; - readonly log: GitLog | undefined; - readonly hasMore: boolean; - more?(limit: number | undefined): Promise; +interface Options { + autolinks: boolean; + expand: boolean; + description?: string; } export class ResultsCommitsNode @@ -32,6 +30,8 @@ export class ResultsCommitsNode Promise; }; }, - private readonly _options: { description?: string; expand?: boolean } = undefined!, + options?: Partial, splatted?: boolean, ) { super('results-commits', GitUri.fromRepoPath(repoPath), view, parent); @@ -59,7 +59,7 @@ export class ResultsCommitsNode): Promise { const results = await this.getCommitsQueryResults(); - if (results == null || !results.hasMore) return; + if (!results?.hasMore) return; if (context != null && 'expandAutolinks' in context) { this._expandAutolinks = Boolean(context.expandAutolinks); diff --git a/src/views/nodes/resultsFilesNode.ts b/src/views/nodes/resultsFilesNode.ts index 715d0815ea32f..9d63624e0b829 100644 --- a/src/views/nodes/resultsFilesNode.ts +++ b/src/views/nodes/resultsFilesNode.ts @@ -1,8 +1,8 @@ import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; import type { FilesComparison } from '../../git/actions/commit'; import { GitUri } from '../../git/gitUri'; -import type { GitDiffShortStat } from '../../git/models/diff'; import type { GitFile } from '../../git/models/file'; +import type { FilesQueryResults } from '../../git/queryResults'; import { makeHierarchical } from '../../system/array'; import { gate } from '../../system/decorators/gate'; import { debug } from '../../system/decorators/log'; @@ -25,15 +25,14 @@ export enum FilesQueryFilter { Right = 1, } -export interface FilesQueryResults { - label: string; - files: GitFile[] | undefined; - stats?: (GitDiffShortStat & { approximated?: boolean }) | undefined; - - filtered?: Map; +interface Options { + expand: boolean; + timeout: false | number; } export class ResultsFilesNode extends ViewNode<'results-files', ViewsWithCommits, State> { + private readonly _options: Options; + constructor( view: ViewsWithCommits, protected override parent: ViewNode, @@ -42,9 +41,7 @@ export class ResultsFilesNode extends ViewNode<'results-files', ViewsWithCommits public readonly ref2: string, private readonly _filesQuery: () => Promise, private readonly direction: 'ahead' | 'behind' | undefined, - private readonly _options: { - expand?: boolean; - } = undefined!, + options?: Partial, ) { super('results-files', GitUri.fromRepoPath(repoPath), view, parent); @@ -52,7 +49,7 @@ export class ResultsFilesNode extends ViewNode<'results-files', ViewsWithCommits this.updateContext({ branchStatusUpstreamType: this.direction }); } this._uniqueId = getViewNodeId(this.type, this.context); - this._options = { expand: true, ..._options }; + this._options = { expand: true, timeout: 100, ...options }; } override get id(): string { @@ -135,7 +132,10 @@ export class ResultsFilesNode extends ViewNode<'results-files', ViewsWithCommits const filter = this.filter; try { - const results = await cancellable(this.getFilesQueryResults(), 100); + const results = await cancellable( + this.getFilesQueryResults(), + this._options.timeout === false ? undefined : this._options.timeout, + ); label = results.label; if (filter == null && results.stats != null) { description = `${pluralize('addition', results.stats.additions)} (+), ${pluralize( diff --git a/src/views/nodes/searchResultsNode.ts b/src/views/nodes/searchResultsNode.ts index 0b86290fdcbe2..f373315413661 100644 --- a/src/views/nodes/searchResultsNode.ts +++ b/src/views/nodes/searchResultsNode.ts @@ -4,6 +4,7 @@ import { md5 } from '@env/crypto'; import { executeGitCommand } from '../../git/actions'; import { GitUri } from '../../git/gitUri'; import type { GitLog } from '../../git/models/log'; +import type { CommitsQueryResults } from '../../git/queryResults'; import type { SearchQuery } from '../../git/search'; import { getSearchQueryComparisonKey, getStoredSearchQuery } from '../../git/search'; import { gate } from '../../system/decorators/gate'; @@ -12,7 +13,6 @@ import { pluralize } from '../../system/string'; import type { SearchAndCompareView } from '../searchAndCompareView'; import type { PageableViewNode } from './abstract/viewNode'; import { ContextValues, getViewNodeId, ViewNode } from './abstract/viewNode'; -import type { CommitsQueryResults } from './resultsCommitsNode'; import { ResultsCommitsNode } from './resultsCommitsNode'; let instanceId = 0; From 195ee04630879d6d5ea38d60d9ca319c871352cb Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 28 Feb 2024 02:21:54 -0500 Subject: [PATCH 0570/1012] Adds ability to try to collapse worktrees in views --- CHANGELOG.md | 4 + package.json | 7 ++ src/commands/ghpr/openOrCreateWorktree.ts | 2 +- src/commands/git/worktree.ts | 4 +- src/config.ts | 1 + src/git/models/branch.ts | 17 +++ src/git/models/repository.ts | 110 ++++++++++++++---- src/git/models/status.ts | 2 +- src/plus/webviews/focus/focusWebview.ts | 2 +- src/views/branchesView.ts | 28 ++++- src/views/commitsView.ts | 2 +- src/views/contributorsView.ts | 15 ++- .../nodes/abstract/repositoryFolderNode.ts | 28 ++++- src/views/nodes/abstract/viewNode.ts | 2 + src/views/nodes/branchNode.ts | 84 +++++++------ src/views/nodes/branchOrTagFolderNode.ts | 2 +- src/views/nodes/branchesNode.ts | 7 ++ src/views/nodes/repositoryNode.ts | 2 +- src/views/remotesView.ts | 12 +- src/views/stashesView.ts | 12 +- src/views/tagsView.ts | 12 +- src/views/viewDecorationProvider.ts | 14 ++- src/views/worktreesView.ts | 12 +- 23 files changed, 287 insertions(+), 94 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8aaa0296354ec..181642e91c1e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] +### Added + +- Adds a new `gitlens.views.collapseWorktreesWhenPossible` setting to specify whether to try to collapse the opened worktrees into a single (common) repository in the views when possible + ## [14.9.0] - 2024-03-06 ### Added diff --git a/package.json b/package.json index b1efb80e267a0..23dd0e2a35ecb 100644 --- a/package.json +++ b/package.json @@ -578,6 +578,13 @@ "title": "Views", "order": 20, "properties": { + "gitlens.views.collapseWorktreesWhenPossible": { + "type": "boolean", + "default": true, + "markdownDescription": "Specifies whether to try to collapse the opened worktrees into a single (common) repository in the views when possible", + "scope": "window", + "order": 1 + }, "gitlens.views.defaultItemLimit": { "type": "number", "default": 10, diff --git a/src/commands/ghpr/openOrCreateWorktree.ts b/src/commands/ghpr/openOrCreateWorktree.ts index 5d9c7d60f3ccf..7cf6f41ebbe3f 100644 --- a/src/commands/ghpr/openOrCreateWorktree.ts +++ b/src/commands/ghpr/openOrCreateWorktree.ts @@ -77,7 +77,7 @@ export class OpenOrCreateWorktreeCommand extends Command { return; } - repo = await repo.getMainRepository(); + repo = await repo.getCommonRepository(); if (repo == null) { void window.showWarningMessage(`Unable to find main repository(${localUri.toString()}) for PR #${number}`); return; diff --git a/src/commands/git/worktree.ts b/src/commands/git/worktree.ts index 2e66a5198f6c5..e3063f9c2c2cd 100644 --- a/src/commands/git/worktree.ts +++ b/src/commands/git/worktree.ts @@ -291,7 +291,7 @@ export class WorktreeGitCommand extends QuickCommand { if (state.subcommand !== 'copy-changes') { // Ensure we use the "main" repository if we are in a worktree already - state.repo = (await state.repo.getMainRepository()) ?? state.repo; + state.repo = (await state.repo.getCommonRepository()) ?? state.repo; } assertStateStepRepository(state); @@ -977,7 +977,7 @@ export class WorktreeGitCommand extends QuickCommand { } else { let name; - const repo = (await state.repo.getMainRepository()) ?? state.repo; + const repo = (await state.repo.getCommonRepository()) ?? state.repo; if (repo.name !== state.worktree.name) { name = `${repo.name}: ${state.worktree.name}`; } else { diff --git a/src/config.ts b/src/config.ts index f376ef62e7858..6afe9f1d3041a 100644 --- a/src/config.ts +++ b/src/config.ts @@ -551,6 +551,7 @@ export type SuppressedMessages = | 'suppressBlameInvalidIgnoreRevsFileBadRevisionWarning'; export interface ViewsCommonConfig { + readonly collapseWorktreesWhenPossible: boolean; readonly defaultItemLimit: number; readonly formats: { readonly commits: { diff --git a/src/git/models/branch.ts b/src/git/models/branch.ts index 01bae3d5a31fb..e9dfd342c4fb0 100644 --- a/src/git/models/branch.ts +++ b/src/git/models/branch.ts @@ -36,6 +36,7 @@ export interface BranchSortOptions { current?: boolean; missingUpstream?: boolean; orderBy?: BranchSorting; + openWorktreeBranches?: string[]; } export function getBranchId(repoPath: string, remote: boolean, name: string): string { @@ -251,6 +252,10 @@ export function sortBranches(branches: GitBranch[], options?: BranchSortOptions) (a, b) => (options.missingUpstream ? (a.upstream?.missing ? -1 : 1) - (b.upstream?.missing ? -1 : 1) : 0) || (options.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) || + (options.openWorktreeBranches + ? (options.openWorktreeBranches.includes(a.name) ? -1 : 1) - + (options.openWorktreeBranches.includes(b.name) ? -1 : 1) + : 0) || (a.starred ? -1 : 1) - (b.starred ? -1 : 1) || (b.remote ? -1 : 1) - (a.remote ? -1 : 1) || (a.date == null ? -1 : a.date.getTime()) - (b.date == null ? -1 : b.date.getTime()), @@ -260,6 +265,10 @@ export function sortBranches(branches: GitBranch[], options?: BranchSortOptions) (a, b) => (options.missingUpstream ? (a.upstream?.missing ? -1 : 1) - (b.upstream?.missing ? -1 : 1) : 0) || (options.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) || + (options.openWorktreeBranches + ? (options.openWorktreeBranches.includes(a.name) ? -1 : 1) - + (options.openWorktreeBranches.includes(b.name) ? -1 : 1) + : 0) || (a.starred ? -1 : 1) - (b.starred ? -1 : 1) || (a.name === 'main' ? -1 : 1) - (b.name === 'main' ? -1 : 1) || (a.name === 'master' ? -1 : 1) - (b.name === 'master' ? -1 : 1) || @@ -272,6 +281,10 @@ export function sortBranches(branches: GitBranch[], options?: BranchSortOptions) (a, b) => (options.missingUpstream ? (a.upstream?.missing ? -1 : 1) - (b.upstream?.missing ? -1 : 1) : 0) || (options.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) || + (options.openWorktreeBranches + ? (options.openWorktreeBranches.includes(a.name) ? -1 : 1) - + (options.openWorktreeBranches.includes(b.name) ? -1 : 1) + : 0) || (a.starred ? -1 : 1) - (b.starred ? -1 : 1) || (a.name === 'main' ? -1 : 1) - (b.name === 'main' ? -1 : 1) || (a.name === 'master' ? -1 : 1) - (b.name === 'master' ? -1 : 1) || @@ -285,6 +298,10 @@ export function sortBranches(branches: GitBranch[], options?: BranchSortOptions) (a, b) => (options.missingUpstream ? (a.upstream?.missing ? -1 : 1) - (b.upstream?.missing ? -1 : 1) : 0) || (options.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) || + (options.openWorktreeBranches + ? (options.openWorktreeBranches.includes(a.name) ? -1 : 1) - + (options.openWorktreeBranches.includes(b.name) ? -1 : 1) + : 0) || (a.starred ? -1 : 1) - (b.starred ? -1 : 1) || (b.remote ? -1 : 1) - (a.remote ? -1 : 1) || (b.date == null ? -1 : b.date.getTime()) - (a.date == null ? -1 : a.date.getTime()), diff --git a/src/git/models/repository.ts b/src/git/models/repository.ts index 9f6484685f504..42ecbf9047e9a 100644 --- a/src/git/models/repository.ts +++ b/src/git/models/repository.ts @@ -8,6 +8,7 @@ import type { Container } from '../../container'; import type { FeatureAccess, Features, PlusFeatures } from '../../features'; import { showCreatePullRequestPrompt, showGenericErrorMessage } from '../../messages'; import type { ProviderIntegration } from '../../plus/integrations/providerIntegration'; +import type { RepoComparisonKey } from '../../repositories'; import { asRepoComparisonKey } from '../../repositories'; import { executeActionCommand } from '../../system/command'; import { configuration } from '../../system/configuration'; @@ -16,7 +17,7 @@ import { gate } from '../../system/decorators/gate'; import { debug, log, logName } from '../../system/decorators/log'; import type { Deferrable } from '../../system/function'; import { debounce } from '../../system/function'; -import { filter, groupByMap, join, min, some } from '../../system/iterable'; +import { filter, groupByMap, join, map, min, some } from '../../system/iterable'; import { getLoggableName, Logger } from '../../system/logger'; import { getLogScope } from '../../system/logger.scope'; import { updateRecordValue } from '../../system/object'; @@ -223,9 +224,13 @@ export class Repository implements Disposable { return this.name; } - readonly id: string; + readonly id: RepoComparisonKey; readonly index: number; - readonly name: string; + + private _name: string; + get name(): string { + return this._name; + } private _idHash: string | undefined; get idHash() { @@ -255,13 +260,13 @@ export class Repository implements Disposable { ) { if (folder != null) { if (root) { - this.name = folder.name; + this._name = folder.name; } else { const relativePath = container.git.getRelativePath(uri, folder.uri); - this.name = relativePath ? relativePath : folder.name; + this._name = relativePath ? relativePath : folder.name; } } else { - this.name = basename(uri.path); + this._name = basename(uri.path); // TODO@eamodio should we create a fake workspace folder? // folder = { @@ -270,6 +275,22 @@ export class Repository implements Disposable { // index: container.git.repositoryCount, // }; } + + // Update the name if it is a worktree + void this.getGitDir().then(gd => { + if (gd?.commonUri == null) return; + + let path = gd.commonUri.path; + if (path.endsWith('/.git')) { + path = path.substring(0, path.length - 5); + } + + const prefix = `${basename(path)}: `; + if (!this._name.startsWith(prefix)) { + this._name = `${prefix}${this._name}`; + } + }); + this.index = folder?.index ?? container.git.repositoryCount; this.id = asRepoComparisonKey(uri); @@ -681,6 +702,32 @@ export class Repository implements Disposable { return this.container.git.getCommit(this.uri, ref); } + @gate() + @log({ exit: true }) + async getCommonRepository(): Promise { + const gitDir = await this.getGitDir(); + if (gitDir?.commonUri == null) return this; + + // If the repository isn't already opened, then open it as a "closed" repo (won't show up in the UI) + return this.container.git.getOrOpenRepository(gitDir.commonUri, { + detectNested: false, + force: true, + closeOnOpen: true, + }); + } + + @log({ exit: true }) + async getCommonRepositoryUri(): Promise { + const gitDir = await this.getGitDir(); + if (gitDir?.commonUri?.path.endsWith('/.git')) { + return gitDir.commonUri.with({ + path: gitDir.commonUri.path.substring(0, gitDir.commonUri.path.length - 5), + }); + } + + return gitDir?.commonUri; + } + getContributors(options?: { all?: boolean; merges?: boolean | 'first-parent'; @@ -711,20 +758,6 @@ export class Repository implements Disposable { return this._lastFetched ?? 0; } - @gate() - @log({ exit: true }) - async getMainRepository(): Promise { - const gitDir = await this.getGitDir(); - if (gitDir?.commonUri == null) return this; - - // If the repository isn't already opened, then open it as a "closed" repo (won't show up in the UI) - return this.container.git.getOrOpenRepository(gitDir.commonUri, { - detectNested: false, - force: true, - closeOnOpen: true, - }); - } - getMergeStatus(): Promise { return this.container.git.getMergeStatus(this.uri); } @@ -1262,3 +1295,40 @@ export class Repository implements Disposable { export function isRepository(repository: unknown): repository is Repository { return repository instanceof Repository; } + +export async function groupRepositories(repositories: Repository[]): Promise> { + const repos = new Map(repositories.map(r => [r.id, r])); + + // Group worktree repos under the common repo when the common repo is also in the list + const result = new Map(); + for (const [, repo] of repos) { + const commonUri = await repo.getCommonRepositoryUri(); + if (commonUri == null) { + if (result.has(repo.id)) { + debugger; + } + result.set(repo.id, { repo: repo, worktrees: [] }); + continue; + } + + const commonId = asRepoComparisonKey(commonUri); + const commonRepo = repos.get(commonId); + if (commonRepo == null) { + if (result.has(repo.id)) { + debugger; + } + result.set(repo.id, { repo: repo, worktrees: [] }); + continue; + } + + let r = result.get(commonRepo.id); + if (r == null) { + r = { repo: commonRepo, worktrees: [] }; + result.set(commonRepo.id, r); + } else { + r.worktrees.push(repo); + } + } + + return new Map(map(result, ([, r]) => [r.repo, r.worktrees])); +} diff --git a/src/git/models/status.ts b/src/git/models/status.ts index 9c864526a11cd..d1a080cba044f 100644 --- a/src/git/models/status.ts +++ b/src/git/models/status.ts @@ -311,7 +311,7 @@ export function getUpstreamStatus( status += `${status.length === 0 ? '' : separator}${pluralize('commit', state.ahead, { infix: icons ? '$(arrow-up) ' : undefined, })} ahead`; - if (suffix.startsWith(` ${upstream.name.split('/')[0]}`)) { + if (suffix.includes(upstream.name.split('/')[0])) { status += ' of'; } } diff --git a/src/plus/webviews/focus/focusWebview.ts b/src/plus/webviews/focus/focusWebview.ts index b3ba56d8ba4e6..8fd0c8fdd46b0 100644 --- a/src/plus/webviews/focus/focusWebview.ts +++ b/src/plus/webviews/focus/focusWebview.ts @@ -285,7 +285,7 @@ export class FocusWebviewProvider implements WebviewProvider { const repoAndRemote = searchedPullRequest.repoAndRemote; const localUri = repoAndRemote.repo.uri; - const repo = await repoAndRemote.repo.getMainRepository(); + const repo = await repoAndRemote.repo.getCommonRepository(); if (repo == null) { void window.showWarningMessage( `Unable to find main repository(${localUri.toString()}) for PR #${pullRequest.id}`, diff --git a/src/views/branchesView.ts b/src/views/branchesView.ts index 9124dd4622486..02de1d1bcea86 100644 --- a/src/views/branchesView.ts +++ b/src/views/branchesView.ts @@ -8,8 +8,8 @@ import type { GitCommit } from '../git/models/commit'; import { isCommit } from '../git/models/commit'; import type { GitBranchReference, GitRevisionReference } from '../git/models/reference'; import { getReferenceLabel } from '../git/models/reference'; -import type { RepositoryChangeEvent } from '../git/models/repository'; -import { RepositoryChange, RepositoryChangeComparisonMode } from '../git/models/repository'; +import type { Repository, RepositoryChangeEvent } from '../git/models/repository'; +import { groupRepositories, RepositoryChange, RepositoryChangeComparisonMode } from '../git/models/repository'; import { executeCommand } from '../system/command'; import { configuration } from '../system/configuration'; import { gate } from '../system/decorators/gate'; @@ -48,7 +48,15 @@ export class BranchesRepositoryNode extends RepositoryFolderNode { async getChildren(): Promise { if (this.children == null) { - const repositories = this.view.container.git.openRepositories; + let nestedWorktrees: Repository[] | undefined; + + let repositories = this.view.container.git.openRepositories; + if (configuration.get('views.collapseWorktreesWhenPossible')) { + const grouped = await groupRepositories(repositories); + repositories = [...grouped.keys()]; + nestedWorktrees = [...grouped.values()].flat(); + } + if (repositories.length === 0) { this.view.message = this.view.container.git.isDiscoveringRepositories ? 'Loading branches...' @@ -59,6 +67,17 @@ export class BranchesViewNode extends RepositoriesSubscribeableNode new BranchesRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, r, splat), @@ -181,7 +200,8 @@ export class BranchesView extends ViewBase<'branches', BranchesViewNode, Branche !configuration.changed(e, 'defaultGravatarsStyle') && !configuration.changed(e, 'defaultTimeFormat') && !configuration.changed(e, 'sortBranchesBy') && - !configuration.changed(e, 'sortRepositoriesBy') + !configuration.changed(e, 'sortRepositoriesBy') && + !configuration.changed(e, 'views.collapseWorktreesWhenPossible') ) { return false; } diff --git a/src/views/commitsView.ts b/src/views/commitsView.ts index de4704d23f49a..d2709ceb2773d 100644 --- a/src/views/commitsView.ts +++ b/src/views/commitsView.ts @@ -54,7 +54,7 @@ export class CommitsRepositoryNode extends RepositoryFolderNode { async getChildren(): Promise { if (this.children == null) { - const repositories = this.view.container.git.openRepositories; + let repositories = this.view.container.git.openRepositories; + if ( + configuration.get('views.collapseWorktreesWhenPossible') && + configuration.get('views.contributors.showAllBranches') + ) { + const grouped = await groupRepositories(repositories); + repositories = [...grouped.keys()]; + } + if (repositories.length === 0) { this.view.message = this.view.container.git.isDiscoveringRepositories ? 'Loading contributors...' @@ -225,7 +233,8 @@ export class ContributorsView extends ViewBase<'contributors', ContributorsViewN !configuration.changed(e, 'defaultGravatarsStyle') && !configuration.changed(e, 'defaultTimeFormat') && !configuration.changed(e, 'sortContributorsBy') && - !configuration.changed(e, 'sortRepositoriesBy') + !configuration.changed(e, 'sortRepositoriesBy') && + !configuration.changed(e, 'views.collapseWorktreesWhenPossible') ) { return false; } diff --git a/src/views/nodes/abstract/repositoryFolderNode.ts b/src/views/nodes/abstract/repositoryFolderNode.ts index 904467b208807..0b39f4c9473c6 100644 --- a/src/views/nodes/abstract/repositoryFolderNode.ts +++ b/src/views/nodes/abstract/repositoryFolderNode.ts @@ -8,6 +8,7 @@ import { Repository, RepositoryChange, RepositoryChangeComparisonMode } from '.. import { gate } from '../../../system/decorators/gate'; import { debug, log } from '../../../system/decorators/log'; import { weakEvent } from '../../../system/event'; +import { basename } from '../../../system/path'; import { pad } from '../../../system/string'; import type { View } from '../../viewBase'; import { SubscribeableViewNode } from './subscribeableViewNode'; @@ -73,8 +74,19 @@ export abstract class RepositoryFolderNode< const expand = ahead || behind || this.repo.starred || this.view.container.git.isRepositoryForEditor(this.repo); + let label = this.repo.formattedName ?? this.uri.repoPath ?? ''; + if (this.options?.showBranchAndLastFetched && branch != null) { + const remove = `: ${basename(branch.name)}`; + const suffix = `: ${branch.name}`; + if (label.endsWith(remove)) { + label = label.substring(0, label.length - remove.length) + suffix; + } else if (!label.endsWith(suffix)) { + label += suffix; + } + } + const item = new TreeItem( - this.repo.formattedName ?? this.uri.repoPath ?? '', + label, expand ? TreeItemCollapsibleState.Expanded : TreeItemCollapsibleState.Collapsed, ); item.contextValue = `${ContextValues.RepositoryFolder}${this.repo.starred ? '+starred' : ''}`; @@ -92,11 +104,15 @@ export abstract class RepositoryFolderNode< const lastFetched = (await this.repo.getLastFetched()) ?? 0; const status = branch.getTrackingStatus(); - item.description = `${status ? `${status}${pad(GlyphChars.Dot, 1, 1)}` : ''}${branch.name}${ - lastFetched - ? `${pad(GlyphChars.Dot, 1, 1)}Last fetched ${Repository.formatLastFetched(lastFetched)}` - : '' - }`; + if (status) { + item.description = status; + if (lastFetched) { + item.description += pad(GlyphChars.Dot, 1, 1); + } + } + if (lastFetched) { + item.description = `${item.description ?? ''}Last fetched ${Repository.formatLastFetched(lastFetched)}`; + } let providerName; if (branch.upstream != null) { diff --git a/src/views/nodes/abstract/viewNode.ts b/src/views/nodes/abstract/viewNode.ts index 9cc170797a7b7..e8db995f4c9d6 100644 --- a/src/views/nodes/abstract/viewNode.ts +++ b/src/views/nodes/abstract/viewNode.ts @@ -138,6 +138,8 @@ export interface AmbientContext { readonly workspace?: CloudWorkspace | LocalWorkspace; readonly wsRepositoryDescriptor?: CloudWorkspaceRepositoryDescriptor | LocalWorkspaceRepositoryDescriptor; readonly worktree?: GitWorktree; + + readonly openWorktreeBranches?: string[]; } export function getViewNodeId(type: string, context: AmbientContext): string { diff --git a/src/views/nodes/branchNode.ts b/src/views/nodes/branchNode.ts index 6ed47f533abec..7123949eb66b5 100644 --- a/src/views/nodes/branchNode.ts +++ b/src/views/nodes/branchNode.ts @@ -37,23 +37,25 @@ type State = { pendingPullRequest: Promise | undefined; }; +type Options = { + expand: boolean; + limitCommits: boolean; + showAsCommits: boolean; + showComparison: false | ViewShowBranchComparison; + showCurrentOrOpened: boolean; + showMergeCommits?: boolean; + showStatus: boolean; + showTracking: boolean; + authors?: GitUser[]; +}; + export class BranchNode extends ViewRefNode<'branch', ViewsWithBranches, GitBranchReference, State> implements PageableViewNode { limit: number | undefined; - private readonly options: { - expand: boolean; - limitCommits: boolean; - showAsCommits: boolean; - showComparison: false | ViewShowBranchComparison; - showCurrent: boolean; - showMergeCommits?: boolean; - showStatus: boolean; - showTracking: boolean; - authors?: GitUser[]; - }; + private readonly options: Options; protected override splatted = true; constructor( @@ -64,17 +66,7 @@ export class BranchNode public readonly branch: GitBranch, // Specifies that the node is shown as a root public readonly root: boolean, - options?: { - expand?: boolean; - limitCommits?: boolean; - showAsCommits?: boolean; - showComparison?: false | ViewShowBranchComparison; - showCurrent?: boolean; - showMergeCommits?: boolean; - showStatus?: boolean; - showTracking?: boolean; - authors?: GitUser[]; - }, + options?: Partial, ) { super('branch', uri, view, parent); @@ -88,7 +80,7 @@ export class BranchNode showAsCommits: false, showComparison: false, // Hide the current branch checkmark when the node is displayed as a root - showCurrent: !this.root, + showCurrentOrOpened: !this.root, // Don't show merge/rebase status info the node is displayed as a root showStatus: true, //!this.root, // Don't show tracking info the node is displayed as a root @@ -116,6 +108,10 @@ export class BranchNode return this.branch.current; } + get opened(): boolean { + return this.context.openWorktreeBranches?.includes(this.branch.name) ?? false; + } + get label(): string { if (this.options.showAsCommits) return 'Commits'; @@ -125,6 +121,7 @@ export class BranchNode this.compacted || this.root || this.current || + this.opened || this.branch.detached || this.branch.starred ? branchName @@ -137,7 +134,7 @@ export class BranchNode } get treeHierarchy(): string[] { - return this.root || this.current || this.branch.detached || this.branch.starred + return this.root || this.current || this.opened || this.branch.detached || this.branch.starred ? [this.branch.name] : this.branch.getNameWithoutRemote().split('/'); } @@ -392,8 +389,8 @@ export class BranchNode this.splatted = false; let tooltip: string | MarkdownString = `${ - this.current ? 'Current branch' : 'Branch' - } $(git-branch) ${this.branch.getNameWithoutRemote()}${this.branch.rebasing ? ' (Rebasing)' : ''}`; + this.current ? 'Current branch\\\n' : this.opened ? 'Current branch in an opened worktree\\\n' : '' + }Branch $(git-branch) ${this.branch.getNameWithoutRemote()}${this.branch.rebasing ? ' (Rebasing)' : ''}`; let contextValue: string = ContextValues.Branch; if (this.current) { @@ -416,7 +413,7 @@ export class BranchNode contextValue += '+closed'; } - let color: ThemeColor | undefined; + let iconColor: ThemeColor | undefined; let description; let iconSuffix = ''; if (!this.branch.remote) { @@ -481,13 +478,22 @@ export class BranchNode if (this.branch.state.ahead || this.branch.state.behind) { if (this.branch.state.ahead) { contextValue += '+ahead'; - color = new ThemeColor('gitlens.unpublishedChangesIconColor' satisfies Colors); + iconColor = new ThemeColor('gitlens.decorations.branchAheadForegroundColor' satisfies Colors); iconSuffix = '-green'; } if (this.branch.state.behind) { contextValue += '+behind'; - color = new ThemeColor('gitlens.unpulledChangesIconColor' satisfies Colors); - iconSuffix = this.branch.state.ahead ? '-yellow' : '-red'; + if (this.branch.state.ahead) { + iconColor = new ThemeColor( + 'gitlens.decorations.branchDivergedForegroundColor' satisfies Colors, + ); + iconSuffix = '-yellow'; + } else { + iconColor = new ThemeColor( + 'gitlens.decorations.branchBehindForegroundColor' satisfies Colors, + ); + iconSuffix = '-red'; + } } } } else { @@ -534,7 +540,7 @@ export class BranchNode pendingPullRequest != null ? new ThemeIcon('loading~spin') : this.options.showAsCommits - ? new ThemeIcon('git-commit', color) + ? new ThemeIcon('git-commit', iconColor) : { dark: this.view.container.context.asAbsolutePath( `images/dark/icon-branch${iconSuffix}.svg`, @@ -544,11 +550,17 @@ export class BranchNode ), }; item.tooltip = tooltip; - item.resourceUri = Uri.parse( - `gitlens-view://branch/status/${await this.branch.getStatus()}${ - this.options.showCurrent && this.current ? '/current' : '' - }`, - ); + + const query = new URLSearchParams(); + query.set('status', await this.branch.getStatus()); + if (this.options.showCurrentOrOpened) { + if (this.current) { + query.set('current', 'true'); + } else if (this.opened) { + query.set('opened', 'true'); + } + } + item.resourceUri = Uri.parse(`gitlens-view://branch?${query.toString()}`); return item; } diff --git a/src/views/nodes/branchOrTagFolderNode.ts b/src/views/nodes/branchOrTagFolderNode.ts index 1f44974765f7f..03abe544e7c79 100644 --- a/src/views/nodes/branchOrTagFolderNode.ts +++ b/src/views/nodes/branchOrTagFolderNode.ts @@ -38,7 +38,7 @@ export class BranchOrTagFolderNode extends ViewNode<'branch-tag-folder'> { for (const folder of this.root.children.values()) { if (folder.value === undefined) { // If the folder contains the current branch, expand it by default - const expand = folder.descendants?.some(n => n.is('branch') && n.current); + const expand = folder.descendants?.some(n => n.is('branch') && (n.current || n.opened)); children.push( new BranchOrTagFolderNode( this.view, diff --git a/src/views/nodes/branchesNode.ts b/src/views/nodes/branchesNode.ts index 631c9d34f17df..901c6840199f0 100644 --- a/src/views/nodes/branchesNode.ts +++ b/src/views/nodes/branchesNode.ts @@ -41,6 +41,13 @@ export class BranchesNode extends CacheableChildrenViewNode<'branches', ViewsWit }); if (branches.values.length === 0) return [new MessageNode(this.view, this, 'No branches could be found.')]; + // if (configuration.get('views.collapseWorktreesWhenPossible')) { + // sortBranches(branches.values, { + // current: true, + // openWorktreeBranches: this.context.openWorktreeBranches, + // }); + // } + // TODO@eamodio handle paging const branchNodes = branches.values.map( b => diff --git a/src/views/nodes/repositoryNode.ts b/src/views/nodes/repositoryNode.ts index ad12e95d0884a..28bebcd538e88 100644 --- a/src/views/nodes/repositoryNode.ts +++ b/src/views/nodes/repositoryNode.ts @@ -157,7 +157,7 @@ export class RepositoryNode extends SubscribeableViewNode<'repository', ViewsWit new BranchNode(this.uri, this.view, this, this.repo, branch, true, { showAsCommits: true, showComparison: false, - showCurrent: false, + showCurrentOrOpened: false, showStatus: false, showTracking: false, }), diff --git a/src/views/remotesView.ts b/src/views/remotesView.ts index 036f28b4942fd..18eba097d3166 100644 --- a/src/views/remotesView.ts +++ b/src/views/remotesView.ts @@ -11,7 +11,7 @@ import type { GitBranchReference, GitRevisionReference } from '../git/models/ref import { getReferenceLabel } from '../git/models/reference'; import type { GitRemote } from '../git/models/remote'; import type { RepositoryChangeEvent } from '../git/models/repository'; -import { RepositoryChange, RepositoryChangeComparisonMode } from '../git/models/repository'; +import { groupRepositories, RepositoryChange, RepositoryChangeComparisonMode } from '../git/models/repository'; import { executeCommand } from '../system/command'; import { configuration } from '../system/configuration'; import { gate } from '../system/decorators/gate'; @@ -49,7 +49,12 @@ export class RemotesRepositoryNode extends RepositoryFolderNode { async getChildren(): Promise { if (this.children == null) { - const repositories = this.view.container.git.openRepositories; + let repositories = this.view.container.git.openRepositories; + if (configuration.get('views.collapseWorktreesWhenPossible')) { + const grouped = await groupRepositories(repositories); + repositories = [...grouped.keys()]; + } + if (repositories.length === 0) { this.view.message = this.view.container.git.isDiscoveringRepositories ? 'Loading remotes...' @@ -173,7 +178,8 @@ export class RemotesView extends ViewBase<'remotes', RemotesViewNode, RemotesVie !configuration.changed(e, 'defaultTimeFormat') && !configuration.changed(e, 'integrations.enabled') && !configuration.changed(e, 'sortBranchesBy') && - !configuration.changed(e, 'sortRepositoriesBy') + !configuration.changed(e, 'sortRepositoriesBy') && + !configuration.changed(e, 'views.collapseWorktreesWhenPossible') ) { return false; } diff --git a/src/views/stashesView.ts b/src/views/stashesView.ts index a40bde036834c..9d85cf37d488c 100644 --- a/src/views/stashesView.ts +++ b/src/views/stashesView.ts @@ -7,7 +7,7 @@ import { GitUri } from '../git/gitUri'; import type { GitStashReference } from '../git/models/reference'; import { getReferenceLabel } from '../git/models/reference'; import type { RepositoryChangeEvent } from '../git/models/repository'; -import { RepositoryChange, RepositoryChangeComparisonMode } from '../git/models/repository'; +import { groupRepositories, RepositoryChange, RepositoryChangeComparisonMode } from '../git/models/repository'; import { executeCommand } from '../system/command'; import { configuration } from '../system/configuration'; import { gate } from '../system/decorators/gate'; @@ -35,7 +35,12 @@ export class StashesRepositoryNode extends RepositoryFolderNode { async getChildren(): Promise { if (this.children == null) { - const repositories = this.view.container.git.openRepositories; + let repositories = this.view.container.git.openRepositories; + if (configuration.get('views.collapseWorktreesWhenPossible')) { + const grouped = await groupRepositories(repositories); + repositories = [...grouped.keys()]; + } + if (repositories.length === 0) { this.view.message = this.view.container.git.isDiscoveringRepositories ? 'Loading stashes...' @@ -143,7 +148,8 @@ export class StashesView extends ViewBase<'stashes', StashesViewNode, StashesVie !configuration.changed(e, 'defaultDateStyle') && !configuration.changed(e, 'defaultGravatarsStyle') && !configuration.changed(e, 'defaultTimeFormat') && - !configuration.changed(e, 'sortRepositoriesBy') + !configuration.changed(e, 'sortRepositoriesBy') && + !configuration.changed(e, 'views.collapseWorktreesWhenPossible') ) { return false; } diff --git a/src/views/tagsView.ts b/src/views/tagsView.ts index becd56c811702..13acc8c1b2a08 100644 --- a/src/views/tagsView.ts +++ b/src/views/tagsView.ts @@ -7,7 +7,7 @@ import { GitUri } from '../git/gitUri'; import type { GitTagReference } from '../git/models/reference'; import { getReferenceLabel } from '../git/models/reference'; import type { RepositoryChangeEvent } from '../git/models/repository'; -import { RepositoryChange, RepositoryChangeComparisonMode } from '../git/models/repository'; +import { groupRepositories, RepositoryChange, RepositoryChangeComparisonMode } from '../git/models/repository'; import { executeCommand } from '../system/command'; import { configuration } from '../system/configuration'; import { gate } from '../system/decorators/gate'; @@ -36,7 +36,12 @@ export class TagsRepositoryNode extends RepositoryFolderNode export class TagsViewNode extends RepositoriesSubscribeableNode { async getChildren(): Promise { if (this.children == null) { - const repositories = this.view.container.git.openRepositories; + let repositories = this.view.container.git.openRepositories; + if (configuration.get('views.collapseWorktreesWhenPossible')) { + const grouped = await groupRepositories(repositories); + repositories = [...grouped.keys()]; + } + if (repositories.length === 0) { this.view.message = this.view.container.git.isDiscoveringRepositories ? 'Loading tags...' @@ -149,7 +154,8 @@ export class TagsView extends ViewBase<'tags', TagsViewNode, TagsViewConfig> { !configuration.changed(e, 'defaultGravatarsStyle') && !configuration.changed(e, 'defaultTimeFormat') && !configuration.changed(e, 'sortTagsBy') && - !configuration.changed(e, 'sortRepositoriesBy') + !configuration.changed(e, 'sortRepositoriesBy') && + !configuration.changed(e, 'views.collapseWorktreesWhenPossible') ) { return false; } diff --git a/src/views/viewDecorationProvider.ts b/src/views/viewDecorationProvider.ts index 030501ce51ffd..a08230ea1aa08 100644 --- a/src/views/viewDecorationProvider.ts +++ b/src/views/viewDecorationProvider.ts @@ -21,7 +21,7 @@ export class ViewFileDecorationProvider implements FileDecorationProvider, Dispo switch (uri.authority) { case 'branch': - return this.provideBranchCurrentDecoration(uri, token); + return this.provideBranchDecoration(uri, token); case 'remote': return this.provideRemoteDefaultDecoration(uri, token); case 'status': @@ -191,10 +191,14 @@ export class ViewFileDecorationProvider implements FileDecorationProvider, Dispo } } - provideBranchCurrentDecoration(uri: Uri, _token: CancellationToken): FileDecoration | undefined { - const [, , status, current] = uri.path.split('/'); + provideBranchDecoration(uri: Uri, _token: CancellationToken): FileDecoration | undefined { + const query = new URLSearchParams(uri.query); - if (!current) return undefined; + const current = Boolean(query.get('current')); + const opened = Boolean(query.get('opened')); + const status = query.get('status')! as GitBranchStatus; + + if (!current && !opened) return undefined; let color; switch (status as GitBranchStatus) { @@ -218,7 +222,7 @@ export class ViewFileDecorationProvider implements FileDecorationProvider, Dispo return { badge: GlyphChars.Check, color: color, - tooltip: 'Current Branch', + tooltip: current ? 'Current Branch' : 'Opened Worktree Branch', }; } diff --git a/src/views/worktreesView.ts b/src/views/worktreesView.ts index be3e56ecd3734..1105480ae6367 100644 --- a/src/views/worktreesView.ts +++ b/src/views/worktreesView.ts @@ -7,7 +7,7 @@ import type { Container } from '../container'; import { PlusFeatures } from '../features'; import { GitUri } from '../git/gitUri'; import type { RepositoryChangeEvent } from '../git/models/repository'; -import { RepositoryChange, RepositoryChangeComparisonMode } from '../git/models/repository'; +import { groupRepositories, RepositoryChange, RepositoryChangeComparisonMode } from '../git/models/repository'; import type { GitWorktree } from '../git/models/worktree'; import { ensurePlusFeaturesEnabled } from '../plus/gk/utils'; import { executeCommand } from '../system/command'; @@ -46,7 +46,12 @@ export class WorktreesViewNode extends RepositoriesSubscribeableNode Date: Thu, 29 Feb 2024 00:11:02 -0500 Subject: [PATCH 0571/1012] Improves perf of showing open worktree branches --- src/git/models/repository.ts | 12 +++++----- src/views/branchesView.ts | 34 ++++++++++++++++++---------- src/views/nodes/abstract/viewNode.ts | 2 +- src/views/nodes/branchNode.ts | 2 +- 4 files changed, 30 insertions(+), 20 deletions(-) diff --git a/src/git/models/repository.ts b/src/git/models/repository.ts index 42ecbf9047e9a..771f41118315c 100644 --- a/src/git/models/repository.ts +++ b/src/git/models/repository.ts @@ -1296,18 +1296,18 @@ export function isRepository(repository: unknown): repository is Repository { return repository instanceof Repository; } -export async function groupRepositories(repositories: Repository[]): Promise> { +export async function groupRepositories(repositories: Repository[]): Promise>> { const repos = new Map(repositories.map(r => [r.id, r])); // Group worktree repos under the common repo when the common repo is also in the list - const result = new Map(); + const result = new Map }>(); for (const [, repo] of repos) { const commonUri = await repo.getCommonRepositoryUri(); if (commonUri == null) { if (result.has(repo.id)) { debugger; } - result.set(repo.id, { repo: repo, worktrees: [] }); + result.set(repo.id, { repo: repo, worktrees: new Map() }); continue; } @@ -1317,16 +1317,16 @@ export async function groupRepositories(repositories: Repository[]): Promise { async getChildren(): Promise { if (this.children == null) { - let nestedWorktrees: Repository[] | undefined; + let grouped: Map> | undefined; let repositories = this.view.container.git.openRepositories; if (configuration.get('views.collapseWorktreesWhenPossible')) { - const grouped = await groupRepositories(repositories); + grouped = await groupRepositories(repositories); repositories = [...grouped.keys()]; - nestedWorktrees = [...grouped.values()].flat(); } if (repositories.length === 0) { @@ -67,16 +66,27 @@ export class BranchesViewNode extends RepositoriesSubscribeableNode | undefined; + if (grouped?.size) { + // Get all the opened worktree branches to pass along downstream, e.g. in the BranchNode to display an indicator + openWorktreeBranches = new Set(); + + await Promise.allSettled( + [...grouped].map(async ([r, nested]) => { + if (!nested.size) return; + + const worktrees = await r.getWorktrees(); + for (const wt of worktrees) { + if (wt.branch == null || nested.has(wt.repoPath)) return; + + openWorktreeBranches!.add(wt.branch); + } + }), + ); } + this.updateContext({ + openWorktreeBranches: openWorktreeBranches?.size ? openWorktreeBranches : undefined, + }); const splat = repositories.length === 1; this.children = repositories.map( diff --git a/src/views/nodes/abstract/viewNode.ts b/src/views/nodes/abstract/viewNode.ts index e8db995f4c9d6..1a14e1fe1be01 100644 --- a/src/views/nodes/abstract/viewNode.ts +++ b/src/views/nodes/abstract/viewNode.ts @@ -139,7 +139,7 @@ export interface AmbientContext { readonly wsRepositoryDescriptor?: CloudWorkspaceRepositoryDescriptor | LocalWorkspaceRepositoryDescriptor; readonly worktree?: GitWorktree; - readonly openWorktreeBranches?: string[]; + readonly openWorktreeBranches?: Set; } export function getViewNodeId(type: string, context: AmbientContext): string { diff --git a/src/views/nodes/branchNode.ts b/src/views/nodes/branchNode.ts index 7123949eb66b5..19ff11a33a2be 100644 --- a/src/views/nodes/branchNode.ts +++ b/src/views/nodes/branchNode.ts @@ -109,7 +109,7 @@ export class BranchNode } get opened(): boolean { - return this.context.openWorktreeBranches?.includes(this.branch.name) ?? false; + return this.context.openWorktreeBranches?.has(this.branch.name) ?? false; } get label(): string { From 9646f9c4fe79f3b376c497f35ab1591aaa23274c Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Fri, 23 Feb 2024 10:59:07 -0700 Subject: [PATCH 0572/1012] Renames to integrations and splits out issue integrations Removes unused imports --- src/annotations/autolinks.ts | 4 +- src/cache.ts | 24 +- src/constants.ts | 4 +- src/git/gitProviderService.ts | 4 +- src/git/models/commit.ts | 5 +- src/git/models/remote.ts | 4 +- src/git/models/repository.ts | 6 +- src/git/remotes/remoteProvider.ts | 4 +- .../integrationAuthentication.ts | 51 ++- .../integrations/authentication/models.ts | 5 + ...{providerIntegration.ts => integration.ts} | 392 +++++++++++------- src/plus/integrations/integrationService.ts | 79 ++-- .../integrations/providers/azureDevOps.ts | 16 +- src/plus/integrations/providers/bitbucket.ts | 16 +- src/plus/integrations/providers/github.ts | 20 +- src/plus/integrations/providers/gitlab.ts | 20 +- src/plus/integrations/providers/models.ts | 59 +-- .../integrations/providers/providersApi.ts | 80 ++-- 18 files changed, 461 insertions(+), 332 deletions(-) create mode 100644 src/plus/integrations/authentication/models.ts rename src/plus/integrations/{providerIntegration.ts => integration.ts} (81%) diff --git a/src/annotations/autolinks.ts b/src/annotations/autolinks.ts index b95593ba98f73..13514d6b99de5 100644 --- a/src/annotations/autolinks.ts +++ b/src/annotations/autolinks.ts @@ -7,7 +7,7 @@ import type { IssueOrPullRequest } from '../git/models/issue'; import { getIssueOrPullRequestHtmlIcon, getIssueOrPullRequestMarkdownIcon } from '../git/models/issue'; import type { GitRemote } from '../git/models/remote'; import type { RemoteProviderReference } from '../git/models/remoteProvider'; -import type { RepositoryDescriptor } from '../plus/integrations/providerIntegration'; +import type { ResourceDescriptor } from '../plus/integrations/integration'; import type { MaybePausedResult } from '../system/cancellation'; import { configuration } from '../system/configuration'; import { fromNow } from '../system/date'; @@ -31,7 +31,7 @@ export interface Autolink { type?: AutolinkType; description?: string; - descriptor?: RepositoryDescriptor; + descriptor?: ResourceDescriptor; } export type EnrichedAutolink = [ diff --git a/src/cache.ts b/src/cache.ts index 5416ef4541771..5ed1fe80736c8 100644 --- a/src/cache.ts +++ b/src/cache.ts @@ -5,7 +5,7 @@ import type { DefaultBranch } from './git/models/defaultBranch'; import type { IssueOrPullRequest } from './git/models/issue'; import type { PullRequest } from './git/models/pullRequest'; import type { RepositoryMetadata } from './git/models/repositoryMetadata'; -import type { ProviderIntegration, RepositoryDescriptor } from './plus/integrations/providerIntegration'; +import type { HostingIntegration, ResourceDescriptor } from './plus/integrations/integration'; import { isPromise } from './system/promise'; type Caches = { @@ -72,8 +72,8 @@ export class CacheProvider implements Disposable { getIssueOrPullRequest( id: string, - repo: RepositoryDescriptor, - integration: ProviderIntegration | undefined, + repo: ResourceDescriptor, + integration: HostingIntegration | undefined, cacheable: Cacheable, ): CacheResult { const { key, etag } = getRemoteKeyAndEtag(repo, integration); @@ -95,8 +95,8 @@ export class CacheProvider implements Disposable { getPullRequestForBranch( branch: string, - repo: RepositoryDescriptor, - integration: ProviderIntegration | undefined, + repo: ResourceDescriptor, + integration: HostingIntegration | undefined, cacheable: Cacheable, ): CacheResult { const cache = 'prByBranch'; @@ -107,8 +107,8 @@ export class CacheProvider implements Disposable { getPullRequestForSha( sha: string, - repo: RepositoryDescriptor, - integration: ProviderIntegration | undefined, + repo: ResourceDescriptor, + integration: HostingIntegration | undefined, cacheable: Cacheable, ): CacheResult { const cache = 'prsBySha'; @@ -118,8 +118,8 @@ export class CacheProvider implements Disposable { } getRepositoryDefaultBranch( - repo: RepositoryDescriptor, - integration: ProviderIntegration | undefined, + repo: ResourceDescriptor, + integration: HostingIntegration | undefined, cacheable: Cacheable, ): CacheResult { const { key, etag } = getRemoteKeyAndEtag(repo, integration); @@ -127,8 +127,8 @@ export class CacheProvider implements Disposable { } getRepositoryMetadata( - repo: RepositoryDescriptor, - integration: ProviderIntegration | undefined, + repo: ResourceDescriptor, + integration: HostingIntegration | undefined, cacheable: Cacheable, ): CacheResult { const { key, etag } = getRemoteKeyAndEtag(repo, integration); @@ -220,6 +220,6 @@ function getExpiresAt(cache: T, value: CacheValue | undefine } } -function getRemoteKeyAndEtag(repo: RepositoryDescriptor, integration?: ProviderIntegration) { +function getRemoteKeyAndEtag(repo: ResourceDescriptor, integration?: HostingIntegration) { return { key: repo.key, etag: `${repo.key}:${integration?.maybeConnected ?? false}` }; } diff --git a/src/constants.ts b/src/constants.ts index b5433c868faf7..04eeed2d1d57b 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -4,7 +4,7 @@ import type { ViewShowBranchComparison } from './config'; import type { Environment } from './container'; import type { StoredSearchQuery } from './git/search'; import type { Subscription } from './plus/gk/account/subscription'; -import type { ProviderIntegration } from './plus/integrations/providerIntegration'; +import type { HostingIntegration } from './plus/integrations/integration'; import type { TrackedUsage, TrackedUsageKeys } from './telemetry/usageTracker'; export const extensionPrefix = 'gitlens'; @@ -899,7 +899,7 @@ export type WorkspaceStorage = { 'views:searchAndCompare:pinned': StoredSearchAndCompareItems; 'views:commitDetails:autolinksExpanded': boolean; } & { [key in `confirm:ai:tos:${AIProviders}`]: boolean } & { - [key in `connected:${ProviderIntegration['key']}`]: boolean; + [key in `connected:${HostingIntegration['key']}`]: boolean; }; export interface Stored { diff --git a/src/git/gitProviderService.ts b/src/git/gitProviderService.ts index 19ae339643489..e9a109f2dcbdc 100644 --- a/src/git/gitProviderService.ts +++ b/src/git/gitProviderService.ts @@ -19,7 +19,7 @@ import type { FeatureAccess, Features, PlusFeatures, RepoFeatureAccess } from '. import type { Subscription } from '../plus/gk/account/subscription'; import { isSubscriptionPaidPlan, SubscriptionPlanId } from '../plus/gk/account/subscription'; import type { SubscriptionChangeEvent } from '../plus/gk/account/subscriptionService'; -import type { ProviderIntegration } from '../plus/integrations/providerIntegration'; +import type { HostingIntegration } from '../plus/integrations/integration'; import type { RepoComparisonKey } from '../repositories'; import { asRepoComparisonKey, Repositories } from '../repositories'; import { joinUnique } from '../system/array'; @@ -2101,7 +2101,7 @@ export class GitProviderService implements Disposable { async getBestRemoteWithIntegration( repoPath: string | Uri, options?: { - filter?: (remote: GitRemote, integration: ProviderIntegration) => boolean; + filter?: (remote: GitRemote, integration: HostingIntegration) => boolean; includeDisconnected?: boolean; }, cancellation?: CancellationToken, diff --git a/src/git/models/commit.ts b/src/git/models/commit.ts index b5a95891acebe..86f7f516304de 100644 --- a/src/git/models/commit.ts +++ b/src/git/models/commit.ts @@ -423,8 +423,9 @@ export class GitCommit implements GitRevisionReference { remote ??= await this.container.git.getBestRemoteWithIntegration(this.repoPath); if (!remote?.hasIntegration()) return undefined; - const provider = this.container.integrations.getByRemote(remote); - return provider?.getPullRequestForCommit(remote.provider.repoDesc, this.ref); + return this.container.integrations + .getByRemote(remote) + ?.getPullRequestForCommit(remote.provider.repoDesc, this.ref); } async getEnrichedAutolinks(remote?: GitRemote): Promise | undefined> { diff --git a/src/git/models/remote.ts b/src/git/models/remote.ts index 25b6dead7f9f9..014b0a7d6bcff 100644 --- a/src/git/models/remote.ts +++ b/src/git/models/remote.ts @@ -2,7 +2,7 @@ import type { ColorTheme } from 'vscode'; import { Uri, window } from 'vscode'; import { GlyphChars } from '../../constants'; import { Container } from '../../container'; -import type { ProviderIntegration } from '../../plus/integrations/providerIntegration'; +import type { HostingIntegration } from '../../plus/integrations/integration'; import { memoize } from '../../system/decorators/memoize'; import { equalsIgnoreCase, sortCompare } from '../../system/string'; import { isLightTheme } from '../../system/utils'; @@ -71,7 +71,7 @@ export class GitRemote boolean; + filter?: (remote: GitRemote, integration: HostingIntegration) => boolean; includeDisconnected?: boolean; }): Promise | undefined> { return this.container.git.getBestRemoteWithIntegration(this.uri, options); @@ -825,7 +825,7 @@ export class Repository implements Disposable { } async hasRemoteWithIntegration(options?: { - filter?: (remote: GitRemote, integration: ProviderIntegration) => boolean; + filter?: (remote: GitRemote, integration: HostingIntegration) => boolean; includeDisconnected?: boolean; }): Promise { const remote = await this.getBestRemoteWithIntegration(options); diff --git a/src/git/remotes/remoteProvider.ts b/src/git/remotes/remoteProvider.ts index 03fc62f2c6ce0..9a9689e8d593e 100644 --- a/src/git/remotes/remoteProvider.ts +++ b/src/git/remotes/remoteProvider.ts @@ -3,7 +3,7 @@ import { env } from 'vscode'; import type { DynamicAutolinkReference } from '../../annotations/autolinks'; import type { AutolinkReference } from '../../config'; import type { GkProviderId } from '../../gk/models/repositoryIdentities'; -import type { RepositoryDescriptor } from '../../plus/integrations/providerIntegration'; +import type { ResourceDescriptor } from '../../plus/integrations/integration'; import { memoize } from '../../system/decorators/memoize'; import { encodeUrl } from '../../system/encoding'; import { openUrl } from '../../system/utils'; @@ -23,7 +23,7 @@ export type RemoteProviderId = | 'gitlab' | 'google-source'; -export abstract class RemoteProvider +export abstract class RemoteProvider implements RemoteProviderReference { protected readonly _name: string | undefined; diff --git a/src/plus/integrations/authentication/integrationAuthentication.ts b/src/plus/integrations/authentication/integrationAuthentication.ts index d66b965e91d66..be7a044745e8b 100644 --- a/src/plus/integrations/authentication/integrationAuthentication.ts +++ b/src/plus/integrations/authentication/integrationAuthentication.ts @@ -3,12 +3,13 @@ import { authentication } from 'vscode'; import { wrapForForcedInsecureSSL } from '@env/fetch'; import type { Container } from '../../../container'; import { debug } from '../../../system/decorators/log'; -import type { ProviderId } from '../providers/models'; -import { HostedProviderId, SelfHostedProviderId } from '../providers/models'; +import type { IntegrationId } from '../providers/models'; +import { HostingIntegrationId, SelfHostedIntegrationId } from '../providers/models'; import { AzureDevOpsAuthenticationProvider } from './azureDevOps'; import { BitbucketAuthenticationProvider } from './bitbucket'; import { GitHubEnterpriseAuthenticationProvider } from './github'; import { GitLabAuthenticationProvider } from './gitlab'; +import type { ProviderAuthenticationSession } from './models'; interface StoredSession { id: string; @@ -19,10 +20,11 @@ interface StoredSession { id: string; }; scopes: string[]; + expiresAt?: string; } export interface IntegrationAuthenticationProviderDescriptor { - id: ProviderId; + id: IntegrationId; scopes: string[]; } @@ -34,11 +36,13 @@ export interface IntegrationAuthenticationSessionDescriptor { export interface IntegrationAuthenticationProvider { getSessionId(descriptor?: IntegrationAuthenticationSessionDescriptor): string; - createSession(descriptor?: IntegrationAuthenticationSessionDescriptor): Promise; + createSession( + descriptor?: IntegrationAuthenticationSessionDescriptor, + ): Promise; } export class IntegrationAuthenticationService implements Disposable { - private readonly providers = new Map(); + private readonly providers = new Map(); constructor(private readonly container: Container) {} @@ -48,7 +52,7 @@ export class IntegrationAuthenticationService implements Disposable { @debug() async createSession( - providerId: ProviderId, + providerId: IntegrationId, descriptor?: IntegrationAuthenticationSessionDescriptor, ): Promise { const provider = this.ensureProvider(providerId); @@ -64,10 +68,10 @@ export class IntegrationAuthenticationService implements Disposable { @debug() async getSession( - providerId: ProviderId, + providerId: IntegrationId, descriptor?: IntegrationAuthenticationSessionDescriptor, options?: { createIfNeeded?: boolean; forceNewSession?: boolean }, - ): Promise { + ): Promise { if (this.supports(providerId)) { const provider = this.ensureProvider(providerId); @@ -93,11 +97,14 @@ export class IntegrationAuthenticationService implements Disposable { } } - if (options?.createIfNeeded && storedSession == null) { + if ( + (options?.createIfNeeded && storedSession == null) || + (storedSession?.expiresAt != null && new Date(storedSession.expiresAt).getTime() < Date.now()) + ) { return this.createSession(providerId, descriptor); } - return storedSession as AuthenticationSession | undefined; + return storedSession as ProviderAuthenticationSession | undefined; } if (descriptor == null) return undefined; @@ -115,7 +122,7 @@ export class IntegrationAuthenticationService implements Disposable { } @debug() - async deleteSession(providerId: ProviderId, descriptor?: IntegrationAuthenticationSessionDescriptor) { + async deleteSession(providerId: IntegrationId, descriptor?: IntegrationAuthenticationSessionDescriptor) { const provider = this.ensureProvider(providerId); const key = this.getSecretKey(providerId, provider.getSessionId(descriptor)); @@ -124,11 +131,11 @@ export class IntegrationAuthenticationService implements Disposable { supports(providerId: string): boolean { switch (providerId) { - case HostedProviderId.AzureDevOps: - case HostedProviderId.Bitbucket: - case SelfHostedProviderId.GitHubEnterprise: - case HostedProviderId.GitLab: - case SelfHostedProviderId.GitLabSelfHosted: + case HostingIntegrationId.AzureDevOps: + case HostingIntegrationId.Bitbucket: + case SelfHostedIntegrationId.GitHubEnterprise: + case HostingIntegrationId.GitLab: + case SelfHostedIntegrationId.GitLabSelfHosted: return true; default: return false; @@ -139,21 +146,21 @@ export class IntegrationAuthenticationService implements Disposable { return `gitlens.integration.auth:${providerId}|${id}`; } - private ensureProvider(providerId: ProviderId): IntegrationAuthenticationProvider { + private ensureProvider(providerId: IntegrationId): IntegrationAuthenticationProvider { let provider = this.providers.get(providerId); if (provider == null) { switch (providerId) { - case HostedProviderId.AzureDevOps: + case HostingIntegrationId.AzureDevOps: provider = new AzureDevOpsAuthenticationProvider(); break; - case HostedProviderId.Bitbucket: + case HostingIntegrationId.Bitbucket: provider = new BitbucketAuthenticationProvider(); break; - case SelfHostedProviderId.GitHubEnterprise: + case SelfHostedIntegrationId.GitHubEnterprise: provider = new GitHubEnterpriseAuthenticationProvider(); break; - case HostedProviderId.GitLab: - case SelfHostedProviderId.GitLabSelfHosted: + case HostingIntegrationId.GitLab: + case SelfHostedIntegrationId.GitLabSelfHosted: provider = new GitLabAuthenticationProvider(); break; default: diff --git a/src/plus/integrations/authentication/models.ts b/src/plus/integrations/authentication/models.ts new file mode 100644 index 0000000000000..d215e0612418c --- /dev/null +++ b/src/plus/integrations/authentication/models.ts @@ -0,0 +1,5 @@ +import type { AuthenticationSession } from 'vscode'; + +export interface ProviderAuthenticationSession extends AuthenticationSession { + readonly expiresAt?: Date; +} diff --git a/src/plus/integrations/providerIntegration.ts b/src/plus/integrations/integration.ts similarity index 81% rename from src/plus/integrations/providerIntegration.ts rename to src/plus/integrations/integration.ts index 578c40c2db0e0..02d2bfacdd9d2 100644 --- a/src/plus/integrations/providerIntegration.ts +++ b/src/plus/integrations/integration.ts @@ -1,4 +1,4 @@ -import type { AuthenticationSession, CancellationToken, Event, MessageItem } from 'vscode'; +import type { CancellationToken, Event, MessageItem } from 'vscode'; import { EventEmitter, window } from 'vscode'; import type { Container } from '../../container'; import { AuthenticationError, CancellationError, ProviderRequestClientError } from '../../errors'; @@ -20,36 +20,49 @@ import type { IntegrationAuthenticationProviderDescriptor, IntegrationAuthenticationSessionDescriptor, } from './authentication/integrationAuthentication'; +import type { ProviderAuthenticationSession } from './authentication/models'; import type { GetIssuesOptions, GetPullRequestsOptions, + IntegrationId, + IssueIntegrationId, PagedProjectInput, PagedRepoInput, ProviderAccount, - ProviderId, ProviderIssue, ProviderPullRequest, ProviderRepoInput, ProviderReposInput, - SelfHostedProviderId, + SelfHostedIntegrationId, } from './providers/models'; -import { HostedProviderId, IssueFilter, PagingMode, PullRequestFilter } from './providers/models'; +import { HostingIntegrationId, IssueFilter, PagingMode, PullRequestFilter } from './providers/models'; import type { ProvidersApi } from './providers/providersApi'; -export type SupportedProviderIds = ProviderId; -export type SupportedHostedProviderIds = HostedProviderId; -export type SupportedSelfHostedProviderIds = SelfHostedProviderId; -export type ProviderKey = `${SupportedHostedProviderIds}` | `${SupportedSelfHostedProviderIds}:${string}`; -export type ProviderKeyById = T extends SupportedHostedProviderIds - ? `${SupportedHostedProviderIds}` - : `${SupportedSelfHostedProviderIds}:${string}`; - -export type RepositoryDescriptor = { key: string } & Record; +export type SupportedIntegrationIds = IntegrationId; +export type SupportedHostingIntegrationIds = HostingIntegrationId; +export type SupportedIssueIntegrationIds = IssueIntegrationId; +export type SupportedSelfHostedIntegrationIds = SelfHostedIntegrationId; +export type ProviderKey = + | `${SupportedHostingIntegrationIds}` + | `${SupportedIssueIntegrationIds}` + | `${SupportedSelfHostedIntegrationIds}:${string}`; +export type ProviderKeyById = T extends SupportedIssueIntegrationIds + ? `${SupportedIssueIntegrationIds}` + : T extends SupportedHostingIntegrationIds + ? `${SupportedHostingIntegrationIds}` + : `${SupportedSelfHostedIntegrationIds}:${string}`; + +export type ResourceDescriptor = { key: string } & Record; +export type IntegrationType = 'issues' | 'hosting'; +export type Integration = IssueIntegration | HostingIntegration; +export function isHostingIntegration(integration: Integration): integration is HostingIntegration { + return integration.type === 'hosting'; +} +export function isIssueIntegration(integration: Integration): integration is IssueIntegration { + return integration.type === 'issues'; +} -export abstract class ProviderIntegration< - ID extends SupportedProviderIds = SupportedProviderIds, - T extends RepositoryDescriptor = RepositoryDescriptor, -> { +export abstract class BaseIntegration { private readonly _onDidChange = new EventEmitter(); get onDidChange(): Event { return this._onDidChange.event; @@ -74,7 +87,7 @@ export abstract class ProviderIntegration< return this.id; } - private get connectedKey(): `connected:${ProviderIntegration['key']}` { + private get connectedKey(): `connected:${HostingIntegration['key']}` { return `connected:${this.key}`; } @@ -82,7 +95,12 @@ export abstract class ProviderIntegration< return this._session === undefined ? undefined : this._session !== null; } - protected _session: AuthenticationSession | null | undefined; + get connectionExpired(): boolean | undefined { + if (this._session?.expiresAt == null) return undefined; + return new Date(this._session.expiresAt) < new Date(); + } + + protected _session: ProviderAuthenticationSession | null | undefined; protected session() { if (this._session === undefined) { return this.ensureSession(false); @@ -177,7 +195,7 @@ export abstract class ProviderIntegration< this.requestExceptionCount = 0; } - private handleProviderException(ex: Error, scope: LogScope | undefined, defaultValue: T): T { + protected handleProviderException(ex: Error, scope: LogScope | undefined, defaultValue: T): T { if (ex instanceof CancellationError) return defaultValue; Logger.error(ex, scope); @@ -204,10 +222,191 @@ export abstract class ProviderIntegration< } @gate() + private async ensureSession( + createIfNeeded: boolean, + forceNewSession: boolean = false, + ): Promise { + if (this._session != null) return this._session; + if (!configuration.get('integrations.enabled')) return undefined; + + if (createIfNeeded) { + await this.container.storage.deleteWorkspace(this.connectedKey); + } else if (this.container.storage.getWorkspace(this.connectedKey) === false) { + return undefined; + } + + let session: ProviderAuthenticationSession | undefined | null; + try { + session = await this.container.integrationAuthentication.getSession( + this.authProvider.id, + this.authProviderDescriptor, + { createIfNeeded: createIfNeeded, forceNewSession: forceNewSession }, + ); + } catch (ex) { + await this.container.storage.deleteWorkspace(this.connectedKey); + + if (ex instanceof Error && ex.message.includes('User did not consent')) { + return undefined; + } + + session = null; + } + + if (session === undefined && !createIfNeeded) { + await this.container.storage.deleteWorkspace(this.connectedKey); + } + + this._session = session ?? null; + this.resetRequestExceptionCount(); + + if (session != null) { + await this.container.storage.storeWorkspace(this.connectedKey, true); + + queueMicrotask(() => { + this._onDidChange.fire(); + this.container.integrations.connected(this.key); + }); + } + + return session ?? undefined; + } + + getIgnoreSSLErrors(): boolean | 'force' { + return this.container.integrations.ignoreSSLErrors(this); + } + + async searchMyIssues( + resource?: ResourceDescriptor, + cancellation?: CancellationToken, + ): Promise; + async searchMyIssues( + resources?: ResourceDescriptor[], + cancellation?: CancellationToken, + ): Promise; @debug() - async getAccountForCommit( + async searchMyIssues( + resources?: ResourceDescriptor | ResourceDescriptor[], + cancellation?: CancellationToken, + ): Promise { + const scope = getLogScope(); + const connected = this.maybeConnected ?? (await this.isConnected()); + if (!connected) return undefined; + + try { + const issues = await this.searchProviderMyIssues( + this._session!, + resources != null ? (Array.isArray(resources) ? resources : [resources]) : undefined, + cancellation, + ); + this.resetRequestExceptionCount(); + return issues; + } catch (ex) { + return this.handleProviderException(ex, scope, undefined); + } + } + + protected abstract searchProviderMyIssues( + session: ProviderAuthenticationSession, + resources?: ResourceDescriptor[], + cancellation?: CancellationToken, + ): Promise; +} + +export abstract class IssueIntegration< + ID extends SupportedIntegrationIds = SupportedIntegrationIds, + T extends ResourceDescriptor = ResourceDescriptor, +> extends BaseIntegration { + readonly type: IntegrationType = 'issues'; + @gate() + @debug() + async getAccountForResource(resource: T): Promise { + const connected = this.maybeConnected ?? (await this.isConnected()); + if (!connected) return undefined; + + try { + const account = await this.getProviderAccountForResource(this._session!, resource); + this.resetRequestExceptionCount(); + return account; + } catch (ex) { + return this.handleProviderException(ex, undefined, undefined); + } + } + + protected abstract getProviderAccountForResource( + session: ProviderAuthenticationSession, + resource: T, + ): Promise; + + @gate() + @debug() + async getResourcesForUser(): Promise { + const connected = this.maybeConnected ?? (await this.isConnected()); + if (!connected) return undefined; + + try { + const resources = await this.getProviderResourcesForUser(this._session!); + this.resetRequestExceptionCount(); + return resources; + } catch (ex) { + return this.handleProviderException(ex, undefined, undefined); + } + } + + protected abstract getProviderResourcesForUser(session: ProviderAuthenticationSession): Promise; + + @debug() + async getProjectsForResources(resources: T[]): Promise { + const connected = this.maybeConnected ?? (await this.isConnected()); + if (!connected) return undefined; + + try { + const projects = await this.getProviderProjectsForResources(this._session!, resources); + this.resetRequestExceptionCount(); + return projects; + } catch (ex) { + return this.handleProviderException(ex, undefined, undefined); + } + } + + protected abstract getProviderProjectsForResources( + session: ProviderAuthenticationSession, + resources: T[], + ): Promise; + + @debug() + async getIssuesForProject( + project: T, + options?: { user?: string; filters?: IssueFilter[] }, + ): Promise { + const connected = this.maybeConnected ?? (await this.isConnected()); + if (!connected) return undefined; + + try { + const issues = await this.getProviderIssuesForProject(this._session!, project, options); + this.resetRequestExceptionCount(); + return issues; + } catch (ex) { + return this.handleProviderException(ex, undefined, undefined); + } + } + + protected abstract getProviderIssuesForProject( + session: ProviderAuthenticationSession, + project: T, + options?: { user?: string; filters?: IssueFilter[] }, + ): Promise; +} + +export abstract class HostingIntegration< + ID extends SupportedIntegrationIds = SupportedIntegrationIds, + T extends ResourceDescriptor = ResourceDescriptor, +> extends BaseIntegration { + readonly type: IntegrationType = 'hosting'; + @gate() + @debug() + async getAccountForEmail( repo: T, - ref: string, + email: string, options?: { avatarSize?: number; }, @@ -218,7 +417,7 @@ export abstract class ProviderIntegration< if (!connected) return undefined; try { - const author = await this.getProviderAccountForCommit(this._session!, repo, ref, options); + const author = await this.getProviderAccountForEmail(this._session!, repo, email, options); this.resetRequestExceptionCount(); return author; } catch (ex) { @@ -226,10 +425,10 @@ export abstract class ProviderIntegration< } } - protected abstract getProviderAccountForCommit( - session: AuthenticationSession, + protected abstract getProviderAccountForEmail( + session: ProviderAuthenticationSession, repo: T, - ref: string, + email: string, options?: { avatarSize?: number; }, @@ -237,9 +436,9 @@ export abstract class ProviderIntegration< @gate() @debug() - async getAccountForEmail( + async getAccountForCommit( repo: T, - email: string, + ref: string, options?: { avatarSize?: number; }, @@ -250,7 +449,7 @@ export abstract class ProviderIntegration< if (!connected) return undefined; try { - const author = await this.getProviderAccountForEmail(this._session!, repo, email, options); + const author = await this.getProviderAccountForCommit(this._session!, repo, ref, options); this.resetRequestExceptionCount(); return author; } catch (ex) { @@ -258,10 +457,10 @@ export abstract class ProviderIntegration< } } - protected abstract getProviderAccountForEmail( - session: AuthenticationSession, + protected abstract getProviderAccountForCommit( + session: ProviderAuthenticationSession, repo: T, - email: string, + ref: string, options?: { avatarSize?: number; }, @@ -289,7 +488,7 @@ export abstract class ProviderIntegration< } protected abstract getProviderDefaultBranch( - { accessToken }: AuthenticationSession, + { accessToken }: ProviderAuthenticationSession, repo: T, ): Promise; @@ -315,7 +514,7 @@ export abstract class ProviderIntegration< } protected abstract getProviderRepositoryMetadata( - session: AuthenticationSession, + session: ProviderAuthenticationSession, repo: T, ): Promise; @@ -341,7 +540,7 @@ export abstract class ProviderIntegration< } protected abstract getProviderIssueOrPullRequest( - session: AuthenticationSession, + session: ProviderAuthenticationSession, repo: T, id: string, ): Promise; @@ -375,7 +574,7 @@ export abstract class ProviderIntegration< } protected abstract getProviderPullRequestForBranch( - session: AuthenticationSession, + session: ProviderAuthenticationSession, repo: T, branch: string, options?: { @@ -406,7 +605,7 @@ export abstract class ProviderIntegration< } protected abstract getProviderPullRequestForCommit( - session: AuthenticationSession, + session: ProviderAuthenticationSession, repo: T, ref: string, ): Promise; @@ -424,9 +623,9 @@ export abstract class ProviderIntegration< if (!connected) return undefined; if ( - providerId !== HostedProviderId.GitLab && + providerId !== HostingIntegrationId.GitLab && (this.api.isRepoIdsInput(reposOrRepoIds) || - (providerId === HostedProviderId.AzureDevOps && + (providerId === HostingIntegrationId.AzureDevOps && !reposOrRepoIds.every(repo => repo.project != null && repo.namespace != null))) ) { Logger.warn(`Unsupported input for provider ${providerId}`, 'getIssuesForRepos'); @@ -434,7 +633,7 @@ export abstract class ProviderIntegration< } let getIssuesOptions: GetIssuesOptions | undefined; - if (providerId === HostedProviderId.AzureDevOps) { + if (providerId === HostingIntegrationId.AzureDevOps) { const organizations = new Set(); const projects = new Set(); for (const repo of reposOrRepoIds as ProviderRepoInput[]) { @@ -629,9 +828,9 @@ export abstract class ProviderIntegration< if (!connected) return undefined; if ( - providerId !== HostedProviderId.GitLab && + providerId !== HostingIntegrationId.GitLab && (this.api.isRepoIdsInput(reposOrRepoIds) || - (providerId === HostedProviderId.AzureDevOps && + (providerId === HostingIntegrationId.AzureDevOps && !reposOrRepoIds.every(repo => repo.project != null && repo.namespace != null))) ) { Logger.warn(`Unsupported input for provider ${providerId}`); @@ -646,7 +845,7 @@ export abstract class ProviderIntegration< } let userAccount: ProviderAccount | undefined; - if (providerId === HostedProviderId.AzureDevOps) { + if (providerId === HostingIntegrationId.AzureDevOps) { const organizations = new Set(); for (const repo of reposOrRepoIds as ProviderRepoInput[]) { organizations.add(repo.namespace); @@ -686,8 +885,8 @@ export abstract class ProviderIntegration< let userFilterProperty: string | null; switch (providerId) { - case HostedProviderId.Bitbucket: - case HostedProviderId.AzureDevOps: + case HostingIntegrationId.Bitbucket: + case HostingIntegrationId.AzureDevOps: userFilterProperty = userAccount.id; break; default: @@ -765,53 +964,14 @@ export abstract class ProviderIntegration< } } - async searchMyIssues( - repo?: RepositoryDescriptor, - cancellation?: CancellationToken, - ): Promise; - async searchMyIssues( - repos?: RepositoryDescriptor[], - cancellation?: CancellationToken, - ): Promise; - @debug() - async searchMyIssues( - repos?: RepositoryDescriptor | RepositoryDescriptor[], - cancellation?: CancellationToken, - ): Promise { - const scope = getLogScope(); - const connected = this.maybeConnected ?? (await this.isConnected()); - if (!connected) return undefined; - - try { - const issues = await this.searchProviderMyIssues( - this._session!, - repos != null ? (Array.isArray(repos) ? repos : [repos]) : undefined, - cancellation, - ); - this.resetRequestExceptionCount(); - return issues; - } catch (ex) { - return this.handleProviderException(ex, scope, undefined); - } - } - - protected abstract searchProviderMyIssues( - session: AuthenticationSession, - repos?: RepositoryDescriptor[], - cancellation?: CancellationToken, - ): Promise; - - async searchMyPullRequests( - repo?: RepositoryDescriptor, - cancellation?: CancellationToken, - ): Promise; + async searchMyPullRequests(repo?: T, cancellation?: CancellationToken): Promise; async searchMyPullRequests( - repos?: RepositoryDescriptor[], + repos?: T[], cancellation?: CancellationToken, ): Promise; @debug() async searchMyPullRequests( - repos?: RepositoryDescriptor | RepositoryDescriptor[], + repos?: T | T[], cancellation?: CancellationToken, ): Promise { const scope = getLogScope(); @@ -832,64 +992,10 @@ export abstract class ProviderIntegration< } protected abstract searchProviderMyPullRequests( - session: AuthenticationSession, - repos?: RepositoryDescriptor[], + session: ProviderAuthenticationSession, + repos?: T[], cancellation?: CancellationToken, ): Promise; - - @gate() - private async ensureSession( - createIfNeeded: boolean, - forceNewSession: boolean = false, - ): Promise { - if (this._session != null) return this._session; - if (!configuration.get('integrations.enabled')) return undefined; - - if (createIfNeeded) { - await this.container.storage.deleteWorkspace(this.connectedKey); - } else if (this.container.storage.getWorkspace(this.connectedKey) === false) { - return undefined; - } - - let session: AuthenticationSession | undefined | null; - try { - session = await this.container.integrationAuthentication.getSession( - this.authProvider.id, - this.authProviderDescriptor, - { createIfNeeded: createIfNeeded, forceNewSession: forceNewSession }, - ); - } catch (ex) { - await this.container.storage.deleteWorkspace(this.connectedKey); - - if (ex instanceof Error && ex.message.includes('User did not consent')) { - return undefined; - } - - session = null; - } - - if (session === undefined && !createIfNeeded) { - await this.container.storage.deleteWorkspace(this.connectedKey); - } - - this._session = session ?? null; - this.resetRequestExceptionCount(); - - if (session != null) { - await this.container.storage.storeWorkspace(this.connectedKey, true); - - queueMicrotask(() => { - this._onDidChange.fire(); - this.container.integrations.connected(this.key); - }); - } - - return session ?? undefined; - } - - getIgnoreSSLErrors(): boolean | 'force' { - return this.container.integrations.ignoreSSLErrors(this); - } } export async function ensurePaidPlan(providerName: string, container: Container): Promise { diff --git a/src/plus/integrations/integrationService.ts b/src/plus/integrations/integrationService.ts index 33fe76aa60766..1bf47e8b962aa 100644 --- a/src/plus/integrations/integrationService.ts +++ b/src/plus/integrations/integrationService.ts @@ -10,18 +10,21 @@ import { configuration } from '../../system/configuration'; import { debug } from '../../system/decorators/log'; import { filterMap, flatten } from '../../system/iterable'; import type { - ProviderIntegration, + HostingIntegration, + Integration, + IssueIntegration, ProviderKey, - RepositoryDescriptor, - SupportedHostedProviderIds, - SupportedProviderIds, - SupportedSelfHostedProviderIds, -} from './providerIntegration'; + ResourceDescriptor, + SupportedHostingIntegrationIds, + SupportedIntegrationIds, + SupportedIssueIntegrationIds, + SupportedSelfHostedIntegrationIds, +} from './integration'; import { AzureDevOpsIntegration } from './providers/azureDevOps'; import { BitbucketIntegration } from './providers/bitbucket'; import { GitHubEnterpriseIntegration, GitHubIntegration } from './providers/github'; import { GitLabIntegration, GitLabSelfHostedIntegration } from './providers/gitlab'; -import { HostedProviderId, isSelfHostedProviderId, SelfHostedProviderId } from './providers/models'; +import { HostingIntegrationId, isSelfHostedIntegrationId, SelfHostedIntegrationId } from './providers/models'; import { ProvidersApi } from './providers/providersApi'; export interface ConnectionStateChangeEvent { @@ -37,7 +40,7 @@ export class IntegrationService implements Disposable { private readonly _connectedCache = new Set(); private readonly _disposable: Disposable; - private _integrations = new Map(); + private _integrations = new Map(); private _providersApi: ProvidersApi; constructor(private readonly container: Container) { @@ -88,31 +91,35 @@ export class IntegrationService implements Disposable { return key == null ? this._connectedCache.size !== 0 : this._connectedCache.has(key); } - get(id: SupportedHostedProviderIds): ProviderIntegration; - get(id: SupportedSelfHostedProviderIds, domain: string): ProviderIntegration; - get(id: SupportedHostedProviderIds | SupportedSelfHostedProviderIds, domain?: string): ProviderIntegration { - const key = isSelfHostedProviderId(id) ? (`${id}:${domain}` as const) : id; + get(id: SupportedHostingIntegrationIds): HostingIntegration; + get(id: SupportedIssueIntegrationIds): IssueIntegration; + get(id: SupportedSelfHostedIntegrationIds, domain: string): HostingIntegration; + get( + id: SupportedHostingIntegrationIds | SupportedIssueIntegrationIds | SupportedSelfHostedIntegrationIds, + domain?: string, + ): Integration { + const key = isSelfHostedIntegrationId(id) ? (`${id}:${domain}` as const) : id; let provider = this._integrations.get(key); if (provider == null) { switch (id) { - case HostedProviderId.GitHub: + case HostingIntegrationId.GitHub: provider = new GitHubIntegration(this.container, this._providersApi); break; - case SelfHostedProviderId.GitHubEnterprise: + case SelfHostedIntegrationId.GitHubEnterprise: if (domain == null) throw new Error(`Domain is required for '${id}' integration`); provider = new GitHubEnterpriseIntegration(this.container, this._providersApi, domain); break; - case HostedProviderId.GitLab: + case HostingIntegrationId.GitLab: provider = new GitLabIntegration(this.container, this._providersApi); break; - case SelfHostedProviderId.GitLabSelfHosted: + case SelfHostedIntegrationId.GitLabSelfHosted: if (domain == null) throw new Error(`Domain is required for '${id}' integration`); provider = new GitLabSelfHostedIntegration(this.container, this._providersApi, domain); break; - case HostedProviderId.Bitbucket: + case HostingIntegrationId.Bitbucket: provider = new BitbucketIntegration(this.container, this._providersApi); break; - case HostedProviderId.AzureDevOps: + case HostingIntegrationId.AzureDevOps: provider = new AzureDevOpsIntegration(this.container, this._providersApi); break; default: @@ -124,24 +131,24 @@ export class IntegrationService implements Disposable { return provider; } - getByRemote(remote: GitRemote): ProviderIntegration | undefined { + getByRemote(remote: GitRemote): HostingIntegration | undefined { if (remote?.provider == null) return undefined; switch (remote.provider.id) { case 'azure-devops': - return this.get(HostedProviderId.AzureDevOps); + return this.get(HostingIntegrationId.AzureDevOps); case 'bitbucket': - return this.get(HostedProviderId.Bitbucket); + return this.get(HostingIntegrationId.Bitbucket); case 'github': if (remote.provider.custom && remote.provider.domain != null) { - return this.get(SelfHostedProviderId.GitHubEnterprise, remote.provider.domain); + return this.get(SelfHostedIntegrationId.GitHubEnterprise, remote.provider.domain); } - return this.get(HostedProviderId.GitHub); + return this.get(HostingIntegrationId.GitHub); case 'gitlab': if (remote.provider.custom && remote.provider.domain != null) { - return this.get(SelfHostedProviderId.GitLabSelfHosted, remote.provider.domain); + return this.get(SelfHostedIntegrationId.GitLabSelfHosted, remote.provider.domain); } - return this.get(HostedProviderId.GitLab); + return this.get(HostingIntegrationId.GitLab); case 'bitbucket-server': default: return undefined; @@ -149,11 +156,11 @@ export class IntegrationService implements Disposable { } async getMyIssues( - providerIds?: HostedProviderId[], + providerIds?: HostingIntegrationId[], cancellation?: CancellationToken, ): Promise { - const providers: Map = new Map(); - for (const providerId of providerIds?.length ? providerIds : Object.values(HostedProviderId)) { + const providers: Map = new Map(); + for (const providerId of providerIds?.length ? providerIds : Object.values(HostingIntegrationId)) { const provider = this.get(providerId); if (provider == null) continue; @@ -165,7 +172,7 @@ export class IntegrationService implements Disposable { } private async getMyIssuesCore( - providers: Map, + providers: Map, cancellation?: CancellationToken, ): Promise { const promises: Promise[] = []; @@ -198,7 +205,7 @@ export class IntegrationService implements Disposable { return provider?.searchMyIssues(remote.provider.repoDesc); } - const providers = new Map(); + const providers = new Map(); for (const remote of remoteOrRemotes) { if (remote?.provider == null) continue; @@ -218,11 +225,11 @@ export class IntegrationService implements Disposable { } async getMyPullRequests( - providerIds?: HostedProviderId[], + providerIds?: HostingIntegrationId[], cancellation?: CancellationToken, ): Promise { - const providers: Map = new Map(); - for (const providerId of providerIds?.length ? providerIds : Object.values(HostedProviderId)) { + const providers: Map = new Map(); + for (const providerId of providerIds?.length ? providerIds : Object.values(HostingIntegrationId)) { const provider = this.get(providerId); if (provider == null) continue; @@ -234,7 +241,7 @@ export class IntegrationService implements Disposable { } private async getMyPullRequestsCore( - providers: Map, + providers: Map, cancellation?: CancellationToken, ): Promise { const promises: Promise[] = []; @@ -269,7 +276,7 @@ export class IntegrationService implements Disposable { return provider?.searchMyPullRequests(remote.provider.repoDesc); } - const providers = new Map(); + const providers = new Map(); for (const remote of remoteOrRemotes) { if (remote?.provider == null) continue; @@ -303,7 +310,7 @@ export class IntegrationService implements Disposable { private _ignoreSSLErrors = new Map(); ignoreSSLErrors( - integration: ProviderIntegration | { id: SupportedProviderIds; domain?: string }, + integration: HostingIntegration | { id: SupportedIntegrationIds; domain?: string }, ): boolean | 'force' { if (isWeb) return false; diff --git a/src/plus/integrations/providers/azureDevOps.ts b/src/plus/integrations/providers/azureDevOps.ts index 95c9583233aea..82777715e904a 100644 --- a/src/plus/integrations/providers/azureDevOps.ts +++ b/src/plus/integrations/providers/azureDevOps.ts @@ -7,25 +7,25 @@ import type { PullRequest, PullRequestState, SearchedPullRequest } from '../../. import type { RepositoryMetadata } from '../../../git/models/repositoryMetadata'; import { Logger } from '../../../system/logger'; import type { IntegrationAuthenticationProviderDescriptor } from '../authentication/integrationAuthentication'; -import type { RepositoryDescriptor } from '../providerIntegration'; -import { ProviderIntegration } from '../providerIntegration'; +import type { ResourceDescriptor } from '../integration'; +import { HostingIntegration } from '../integration'; import type { ProviderRepository } from './models'; -import { HostedProviderId, providersMetadata } from './models'; +import { HostingIntegrationId, providersMetadata } from './models'; -const metadata = providersMetadata[HostedProviderId.AzureDevOps]; +const metadata = providersMetadata[HostingIntegrationId.AzureDevOps]; const authProvider = Object.freeze({ id: metadata.id, scopes: metadata.scopes }); -interface AzureRepositoryDescriptor extends RepositoryDescriptor { +interface AzureRepositoryDescriptor extends ResourceDescriptor { owner: string; name: string; } -export class AzureDevOpsIntegration extends ProviderIntegration< - HostedProviderId.AzureDevOps, +export class AzureDevOpsIntegration extends HostingIntegration< + HostingIntegrationId.AzureDevOps, AzureRepositoryDescriptor > { readonly authProvider: IntegrationAuthenticationProviderDescriptor = authProvider; - readonly id = HostedProviderId.AzureDevOps; + readonly id = HostingIntegrationId.AzureDevOps; protected readonly key = this.id; readonly name: string = 'Azure DevOps'; get domain(): string { diff --git a/src/plus/integrations/providers/bitbucket.ts b/src/plus/integrations/providers/bitbucket.ts index 1f7cc15426be9..67efac5a0cc9f 100644 --- a/src/plus/integrations/providers/bitbucket.ts +++ b/src/plus/integrations/providers/bitbucket.ts @@ -5,24 +5,24 @@ import type { IssueOrPullRequest, SearchedIssue } from '../../../git/models/issu import type { PullRequest, PullRequestState, SearchedPullRequest } from '../../../git/models/pullRequest'; import type { RepositoryMetadata } from '../../../git/models/repositoryMetadata'; import type { IntegrationAuthenticationProviderDescriptor } from '../authentication/integrationAuthentication'; -import type { RepositoryDescriptor } from '../providerIntegration'; -import { ProviderIntegration } from '../providerIntegration'; -import { HostedProviderId, providersMetadata } from './models'; +import type { ResourceDescriptor } from '../integration'; +import { HostingIntegration } from '../integration'; +import { HostingIntegrationId, providersMetadata } from './models'; -const metadata = providersMetadata[HostedProviderId.Bitbucket]; +const metadata = providersMetadata[HostingIntegrationId.Bitbucket]; const authProvider = Object.freeze({ id: metadata.id, scopes: metadata.scopes }); -interface BitbucketRepositoryDescriptor extends RepositoryDescriptor { +interface BitbucketRepositoryDescriptor extends ResourceDescriptor { owner: string; name: string; } -export class BitbucketIntegration extends ProviderIntegration< - HostedProviderId.Bitbucket, +export class BitbucketIntegration extends HostingIntegration< + HostingIntegrationId.Bitbucket, BitbucketRepositoryDescriptor > { readonly authProvider: IntegrationAuthenticationProviderDescriptor = authProvider; - readonly id = HostedProviderId.Bitbucket; + readonly id = HostingIntegrationId.Bitbucket; protected readonly key = this.id; readonly name: string = 'Bitbucket'; get domain(): string { diff --git a/src/plus/integrations/providers/github.ts b/src/plus/integrations/providers/github.ts index ef61b76d29327..e1d647e8b6e29 100644 --- a/src/plus/integrations/providers/github.ts +++ b/src/plus/integrations/providers/github.ts @@ -7,18 +7,18 @@ import type { PullRequest, PullRequestState, SearchedPullRequest } from '../../. import type { RepositoryMetadata } from '../../../git/models/repositoryMetadata'; import { log } from '../../../system/decorators/log'; import type { IntegrationAuthenticationProviderDescriptor } from '../authentication/integrationAuthentication'; -import type { SupportedProviderIds } from '../providerIntegration'; -import { ensurePaidPlan, ProviderIntegration } from '../providerIntegration'; -import { HostedProviderId, providersMetadata, SelfHostedProviderId } from './models'; +import type { SupportedIntegrationIds } from '../integration'; +import { ensurePaidPlan, HostingIntegration } from '../integration'; +import { HostingIntegrationId, providersMetadata, SelfHostedIntegrationId } from './models'; import type { ProvidersApi } from './providersApi'; -const metadata = providersMetadata[HostedProviderId.GitHub]; +const metadata = providersMetadata[HostingIntegrationId.GitHub]; const authProvider: IntegrationAuthenticationProviderDescriptor = Object.freeze({ id: metadata.id, scopes: metadata.scopes, }); -const enterpriseMetadata = providersMetadata[SelfHostedProviderId.GitHubEnterprise]; +const enterpriseMetadata = providersMetadata[SelfHostedIntegrationId.GitHubEnterprise]; const enterpriseAuthProvider: IntegrationAuthenticationProviderDescriptor = Object.freeze({ id: enterpriseMetadata.id, scopes: enterpriseMetadata.scopes, @@ -30,7 +30,7 @@ export type GitHubRepositoryDescriptor = { name: string; }; -abstract class GitHubIntegrationBase extends ProviderIntegration< +abstract class GitHubIntegrationBase extends HostingIntegration< ID, GitHubRepositoryDescriptor > { @@ -169,9 +169,9 @@ abstract class GitHubIntegrationBase extends Pr } } -export class GitHubIntegration extends GitHubIntegrationBase { +export class GitHubIntegration extends GitHubIntegrationBase { readonly authProvider = authProvider; - readonly id = HostedProviderId.GitHub; + readonly id = HostingIntegrationId.GitHub; protected readonly key = this.id; readonly name: string = 'GitHub'; get domain(): string { @@ -183,9 +183,9 @@ export class GitHubIntegration extends GitHubIntegrationBase { +export class GitHubEnterpriseIntegration extends GitHubIntegrationBase { readonly authProvider = enterpriseAuthProvider; - readonly id = SelfHostedProviderId.GitHubEnterprise; + readonly id = SelfHostedIntegrationId.GitHubEnterprise; protected readonly key = `${this.id}:${this.domain}` as const; readonly name = 'GitHub Enterprise'; get domain(): string { diff --git a/src/plus/integrations/providers/gitlab.ts b/src/plus/integrations/providers/gitlab.ts index 944e2fa6e1d5c..8a3368cda3000 100644 --- a/src/plus/integrations/providers/gitlab.ts +++ b/src/plus/integrations/providers/gitlab.ts @@ -7,18 +7,18 @@ import type { PullRequest, PullRequestState, SearchedPullRequest } from '../../. import type { RepositoryMetadata } from '../../../git/models/repositoryMetadata'; import { log } from '../../../system/decorators/log'; import type { IntegrationAuthenticationProviderDescriptor } from '../authentication/integrationAuthentication'; -import type { SupportedProviderIds } from '../providerIntegration'; -import { ensurePaidPlan, ProviderIntegration } from '../providerIntegration'; -import { HostedProviderId, providersMetadata, SelfHostedProviderId } from './models'; +import type { SupportedIntegrationIds } from '../integration'; +import { ensurePaidPlan, HostingIntegration } from '../integration'; +import { HostingIntegrationId, providersMetadata, SelfHostedIntegrationId } from './models'; import type { ProvidersApi } from './providersApi'; -const metadata = providersMetadata[HostedProviderId.GitLab]; +const metadata = providersMetadata[HostingIntegrationId.GitLab]; const authProvider: IntegrationAuthenticationProviderDescriptor = Object.freeze({ id: metadata.id, scopes: metadata.scopes, }); -const enterpriseMetadata = providersMetadata[SelfHostedProviderId.GitLabSelfHosted]; +const enterpriseMetadata = providersMetadata[SelfHostedIntegrationId.GitLabSelfHosted]; const enterpriseAuthProvider: IntegrationAuthenticationProviderDescriptor = Object.freeze({ id: enterpriseMetadata.id, scopes: enterpriseMetadata.scopes, @@ -30,7 +30,7 @@ export type GitLabRepositoryDescriptor = { name: string; }; -abstract class GitLabIntegrationBase extends ProviderIntegration< +abstract class GitLabIntegrationBase extends HostingIntegration< ID, GitLabRepositoryDescriptor > { @@ -151,9 +151,9 @@ abstract class GitLabIntegrationBase extends Pr } } -export class GitLabIntegration extends GitLabIntegrationBase { +export class GitLabIntegration extends GitLabIntegrationBase { readonly authProvider = authProvider; - readonly id = HostedProviderId.GitLab; + readonly id = HostingIntegrationId.GitLab; protected readonly key = this.id; readonly name: string = 'GitLab'; get domain(): string { @@ -165,9 +165,9 @@ export class GitLabIntegration extends GitLabIntegrationBase { +export class GitLabSelfHostedIntegration extends GitLabIntegrationBase { readonly authProvider = enterpriseAuthProvider; - readonly id = SelfHostedProviderId.GitLabSelfHosted; + readonly id = SelfHostedIntegrationId.GitLabSelfHosted; protected readonly key = `${this.id}:${this.domain}` as const; readonly name = 'GitLab Self-Hosted'; get domain(): string { diff --git a/src/plus/integrations/providers/models.ts b/src/plus/integrations/providers/models.ts index 6b800063510c5..e75cab2d60a20 100644 --- a/src/plus/integrations/providers/models.ts +++ b/src/plus/integrations/providers/models.ts @@ -20,29 +20,32 @@ export type ProviderPullRequest = GitPullRequest; export type ProviderRepository = GitRepository; export type ProviderIssue = Issue; -export type ProviderId = HostedProviderId | SelfHostedProviderId; +export type IntegrationId = HostingIntegrationId | IssueIntegrationId | SelfHostedIntegrationId; -export enum HostedProviderId { +export enum HostingIntegrationId { GitHub = 'github', GitLab = 'gitlab', Bitbucket = 'bitbucket', + AzureDevOps = 'azureDevOps', +} + +export enum IssueIntegrationId { Jira = 'jira', Trello = 'trello', - AzureDevOps = 'azureDevOps', } -export enum SelfHostedProviderId { +export enum SelfHostedIntegrationId { GitHubEnterprise = 'github-enterprise', GitLabSelfHosted = 'gitlab-self-hosted', } -const selfHostedProviderIds: SelfHostedProviderId[] = [ - SelfHostedProviderId.GitHubEnterprise, - SelfHostedProviderId.GitLabSelfHosted, +const selfHostedIntegrationIds: SelfHostedIntegrationId[] = [ + SelfHostedIntegrationId.GitHubEnterprise, + SelfHostedIntegrationId.GitLabSelfHosted, ] as const; -export function isSelfHostedProviderId(id: ProviderId): id is SelfHostedProviderId { - return selfHostedProviderIds.includes(id as SelfHostedProviderId); +export function isSelfHostedIntegrationId(id: IntegrationId): id is SelfHostedIntegrationId { + return selfHostedIntegrationIds.includes(id as SelfHostedIntegrationId); } export enum PullRequestFilter { @@ -191,7 +194,7 @@ export interface ProviderInfo extends ProviderMetadata { export interface ProviderMetadata { domain: string; - id: ProviderId; + id: IntegrationId; issuesPagingMode?: PagingMode; pullRequestsPagingMode?: PagingMode; scopes: string[]; @@ -199,13 +202,13 @@ export interface ProviderMetadata { supportedIssueFilters?: IssueFilter[]; } -export type Providers = Record; -export type ProvidersMetadata = Record; +export type Providers = Record; +export type ProvidersMetadata = Record; export const providersMetadata: ProvidersMetadata = { - [HostedProviderId.GitHub]: { + [HostingIntegrationId.GitHub]: { domain: 'github.com', - id: HostedProviderId.GitHub, + id: HostingIntegrationId.GitHub, issuesPagingMode: PagingMode.Repos, pullRequestsPagingMode: PagingMode.Repos, // Use 'username' property on account for PR filters @@ -219,9 +222,9 @@ export const providersMetadata: ProvidersMetadata = { supportedIssueFilters: [IssueFilter.Author, IssueFilter.Assignee, IssueFilter.Mention], scopes: ['repo', 'read:user', 'user:email'], }, - [SelfHostedProviderId.GitHubEnterprise]: { + [SelfHostedIntegrationId.GitHubEnterprise]: { domain: '', - id: SelfHostedProviderId.GitHubEnterprise, + id: SelfHostedIntegrationId.GitHubEnterprise, issuesPagingMode: PagingMode.Repos, pullRequestsPagingMode: PagingMode.Repos, // Use 'username' property on account for PR filters @@ -235,9 +238,9 @@ export const providersMetadata: ProvidersMetadata = { supportedIssueFilters: [IssueFilter.Author, IssueFilter.Assignee, IssueFilter.Mention], scopes: ['repo', 'read:user', 'user:email'], }, - [HostedProviderId.GitLab]: { + [HostingIntegrationId.GitLab]: { domain: 'gitlab.com', - id: HostedProviderId.GitLab, + id: HostingIntegrationId.GitLab, issuesPagingMode: PagingMode.Repo, pullRequestsPagingMode: PagingMode.Repo, // Use 'username' property on account for PR filters @@ -250,9 +253,9 @@ export const providersMetadata: ProvidersMetadata = { supportedIssueFilters: [IssueFilter.Author, IssueFilter.Assignee], scopes: ['read_api', 'read_user', 'read_repository'], }, - [SelfHostedProviderId.GitLabSelfHosted]: { + [SelfHostedIntegrationId.GitLabSelfHosted]: { domain: '', - id: SelfHostedProviderId.GitLabSelfHosted, + id: SelfHostedIntegrationId.GitLabSelfHosted, issuesPagingMode: PagingMode.Repo, pullRequestsPagingMode: PagingMode.Repo, // Use 'username' property on account for PR filters @@ -265,17 +268,17 @@ export const providersMetadata: ProvidersMetadata = { supportedIssueFilters: [IssueFilter.Author, IssueFilter.Assignee], scopes: ['read_api', 'read_user', 'read_repository'], }, - [HostedProviderId.Bitbucket]: { + [HostingIntegrationId.Bitbucket]: { domain: 'bitbucket.org', - id: HostedProviderId.Bitbucket, + id: HostingIntegrationId.Bitbucket, pullRequestsPagingMode: PagingMode.Repo, // Use 'id' property on account for PR filters supportedPullRequestFilters: [PullRequestFilter.Author], scopes: ['account:read', 'repository:read', 'pullrequest:read', 'issue:read'], }, - [HostedProviderId.AzureDevOps]: { + [HostingIntegrationId.AzureDevOps]: { domain: 'dev.azure.com', - id: HostedProviderId.AzureDevOps, + id: HostingIntegrationId.AzureDevOps, issuesPagingMode: PagingMode.Project, pullRequestsPagingMode: PagingMode.Repo, // Use 'id' property on account for PR filters @@ -284,14 +287,14 @@ export const providersMetadata: ProvidersMetadata = { supportedIssueFilters: [IssueFilter.Author, IssueFilter.Assignee, IssueFilter.Mention], scopes: ['vso.code', 'vso.identity', 'vso.project', 'vso.profile', 'vso.work'], }, - [HostedProviderId.Jira]: { + [IssueIntegrationId.Jira]: { domain: 'atlassian.net', - id: HostedProviderId.Jira, + id: IssueIntegrationId.Jira, scopes: [], }, - [HostedProviderId.Trello]: { + [IssueIntegrationId.Trello]: { domain: 'trello.com', - id: HostedProviderId.Trello, + id: IssueIntegrationId.Trello, scopes: [], }, }; diff --git a/src/plus/integrations/providers/providersApi.ts b/src/plus/integrations/providers/providersApi.ts index fff25682c3ec6..2f8c07baa9dea 100644 --- a/src/plus/integrations/providers/providersApi.ts +++ b/src/plus/integrations/providers/providersApi.ts @@ -13,10 +13,10 @@ import type { GetPullRequestsOptions, GetReposForAzureProjectFn, GetReposOptions, + IntegrationId, IssueFilter, PagingMode, ProviderAccount, - ProviderId, ProviderInfo, ProviderIssue, ProviderPullRequest, @@ -26,7 +26,7 @@ import type { Providers, PullRequestFilter, } from './models'; -import { HostedProviderId, providersMetadata, SelfHostedProviderId } from './models'; +import { HostingIntegrationId, IssueIntegrationId, providersMetadata, SelfHostedIntegrationId } from './models'; export class ProvidersApi { private readonly providers: Providers; @@ -34,8 +34,8 @@ export class ProvidersApi { constructor(private readonly container: Container) { const providerApis = ProviderApis(); this.providers = { - [HostedProviderId.GitHub]: { - ...providersMetadata[HostedProviderId.GitHub], + [HostingIntegrationId.GitHub]: { + ...providersMetadata[HostingIntegrationId.GitHub], provider: providerApis.github, getCurrentUserFn: providerApis.github.getCurrentUser.bind(providerApis.github) as getCurrentUserFn, getPullRequestsForReposFn: providerApis.github.getPullRequestsForRepos.bind( @@ -45,8 +45,8 @@ export class ProvidersApi { providerApis.github, ) as GetIssuesForReposFn, }, - [SelfHostedProviderId.GitHubEnterprise]: { - ...providersMetadata[SelfHostedProviderId.GitHubEnterprise], + [SelfHostedIntegrationId.GitHubEnterprise]: { + ...providersMetadata[SelfHostedIntegrationId.GitHubEnterprise], provider: providerApis.github, getCurrentUserFn: providerApis.github.getCurrentUser.bind(providerApis.github) as getCurrentUserFn, getPullRequestsForReposFn: providerApis.github.getPullRequestsForRepos.bind( @@ -56,8 +56,8 @@ export class ProvidersApi { providerApis.github, ) as GetIssuesForReposFn, }, - [HostedProviderId.GitLab]: { - ...providersMetadata[HostedProviderId.GitLab], + [HostingIntegrationId.GitLab]: { + ...providersMetadata[HostingIntegrationId.GitLab], provider: providerApis.gitlab, getCurrentUserFn: providerApis.gitlab.getCurrentUser.bind(providerApis.gitlab) as getCurrentUserFn, getPullRequestsForReposFn: providerApis.gitlab.getPullRequestsForRepos.bind( @@ -73,8 +73,8 @@ export class ProvidersApi { providerApis.gitlab, ) as GetIssuesForRepoFn, }, - [SelfHostedProviderId.GitLabSelfHosted]: { - ...providersMetadata[SelfHostedProviderId.GitLabSelfHosted], + [SelfHostedIntegrationId.GitLabSelfHosted]: { + ...providersMetadata[SelfHostedIntegrationId.GitLabSelfHosted], provider: providerApis.gitlab, getCurrentUserFn: providerApis.gitlab.getCurrentUser.bind(providerApis.gitlab) as getCurrentUserFn, getPullRequestsForReposFn: providerApis.gitlab.getPullRequestsForRepos.bind( @@ -90,8 +90,8 @@ export class ProvidersApi { providerApis.gitlab, ) as GetIssuesForRepoFn, }, - [HostedProviderId.Bitbucket]: { - ...providersMetadata[HostedProviderId.Bitbucket], + [HostingIntegrationId.Bitbucket]: { + ...providersMetadata[HostingIntegrationId.Bitbucket], provider: providerApis.bitbucket, getCurrentUserFn: providerApis.bitbucket.getCurrentUser.bind( providerApis.bitbucket, @@ -103,8 +103,8 @@ export class ProvidersApi { providerApis.bitbucket, ) as GetPullRequestsForRepoFn, }, - [HostedProviderId.AzureDevOps]: { - ...providersMetadata[HostedProviderId.AzureDevOps], + [HostingIntegrationId.AzureDevOps]: { + ...providersMetadata[HostingIntegrationId.AzureDevOps], provider: providerApis.azureDevOps, getCurrentUserForInstanceFn: providerApis.azureDevOps.getCurrentUserForInstance.bind( providerApis.azureDevOps, @@ -122,41 +122,41 @@ export class ProvidersApi { providerApis.azureDevOps, ) as GetReposForAzureProjectFn, }, - [HostedProviderId.Jira]: { - ...providersMetadata[HostedProviderId.Jira], + [IssueIntegrationId.Jira]: { + ...providersMetadata[IssueIntegrationId.Jira], provider: providerApis.jira, }, - [HostedProviderId.Trello]: { - ...providersMetadata[HostedProviderId.Trello], + [IssueIntegrationId.Trello]: { + ...providersMetadata[IssueIntegrationId.Trello], provider: providerApis.trello, }, }; } - getScopesForProvider(providerId: ProviderId): string[] | undefined { + getScopesForProvider(providerId: IntegrationId): string[] | undefined { return this.providers[providerId]?.scopes; } - getProviderDomain(providerId: ProviderId): string | undefined { + getProviderDomain(providerId: IntegrationId): string | undefined { return this.providers[providerId]?.domain; } - getProviderPullRequestsPagingMode(providerId: ProviderId): PagingMode | undefined { + getProviderPullRequestsPagingMode(providerId: IntegrationId): PagingMode | undefined { return this.providers[providerId]?.pullRequestsPagingMode; } - getProviderIssuesPagingMode(providerId: ProviderId): PagingMode | undefined { + getProviderIssuesPagingMode(providerId: IntegrationId): PagingMode | undefined { return this.providers[providerId]?.issuesPagingMode; } - providerSupportsPullRequestFilters(providerId: ProviderId, filters: PullRequestFilter[]): boolean { + providerSupportsPullRequestFilters(providerId: IntegrationId, filters: PullRequestFilter[]): boolean { return ( this.providers[providerId]?.supportedPullRequestFilters != null && filters.every(filter => this.providers[providerId]?.supportedPullRequestFilters?.includes(filter)) ); } - providerSupportsIssueFilters(providerId: ProviderId, filters: IssueFilter[]): boolean { + providerSupportsIssueFilters(providerId: IntegrationId, filters: IssueFilter[]): boolean { return ( this.providers[providerId]?.supportedIssueFilters != null && filters.every(filter => this.providers[providerId]?.supportedIssueFilters?.includes(filter)) @@ -191,7 +191,7 @@ export class ProvidersApi { } async getPullRequestsForRepos( - providerId: ProviderId, + providerId: IntegrationId, reposOrIds: ProviderReposInput, options?: GetPullRequestsOptions, ): Promise> { @@ -250,7 +250,7 @@ export class ProvidersApi { } async getPullRequestsForRepo( - providerId: ProviderId, + providerId: IntegrationId, repo: ProviderRepoInput, options?: GetPullRequestsOptions, ): Promise> { @@ -310,7 +310,7 @@ export class ProvidersApi { } async getIssuesForRepos( - providerId: ProviderId, + providerId: IntegrationId, reposOrIds: ProviderReposInput, options?: GetIssuesOptions, ): Promise> { @@ -328,7 +328,7 @@ export class ProvidersApi { throw new Error(`Provider with id ${providerId} does not support getting issues for repositories`); } - if (provider.id === HostedProviderId.AzureDevOps) { + if (provider.id === HostingIntegrationId.AzureDevOps) { throw new Error( `Provider with id ${providerId} does not support getting issues for repositories; use getIssuesForAzureProject instead`, ); @@ -375,7 +375,7 @@ export class ProvidersApi { } async getIssuesForRepo( - providerId: ProviderId, + providerId: IntegrationId, repo: ProviderRepoInput, options?: GetIssuesOptions, ): Promise> { @@ -393,7 +393,7 @@ export class ProvidersApi { throw new Error(`Provider with id ${providerId} does not support getting issues for a repository`); } - if (provider.id === HostedProviderId.AzureDevOps) { + if (provider.id === HostingIntegrationId.AzureDevOps) { throw new Error( `Provider with id ${providerId} does not support getting issues for a repository; use getIssuesForAzureProject instead`, ); @@ -446,19 +446,19 @@ export class ProvidersApi { project: string, options?: GetIssuesOptions, ): Promise> { - const provider = this.providers[HostedProviderId.AzureDevOps]; + const provider = this.providers[HostingIntegrationId.AzureDevOps]; if (provider == null) { - throw new Error(`Provider with id ${HostedProviderId.AzureDevOps} not registered`); + throw new Error(`Provider with id ${HostingIntegrationId.AzureDevOps} not registered`); } const token = await this.getProviderToken(provider); if (token == null) { - throw new Error(`Not connected to provider ${HostedProviderId.AzureDevOps}`); + throw new Error(`Not connected to provider ${HostingIntegrationId.AzureDevOps}`); } if (provider.getIssuesForAzureProjectFn == null) { throw new Error( - `Provider with id ${HostedProviderId.AzureDevOps} does not support getting issues for an Azure project`, + `Provider with id ${HostingIntegrationId.AzureDevOps} does not support getting issues for an Azure project`, ); } @@ -510,19 +510,19 @@ export class ProvidersApi { project: string, options?: GetReposOptions, ): Promise> { - const provider = this.providers[HostedProviderId.AzureDevOps]; + const provider = this.providers[HostingIntegrationId.AzureDevOps]; if (provider == null) { - throw new Error(`Provider with id ${HostedProviderId.AzureDevOps} not registered`); + throw new Error(`Provider with id ${HostingIntegrationId.AzureDevOps} not registered`); } const token = await this.getProviderToken(provider); if (token == null) { - throw new Error(`Not connected to provider ${HostedProviderId.AzureDevOps}`); + throw new Error(`Not connected to provider ${HostingIntegrationId.AzureDevOps}`); } if (provider.getReposForAzureProjectFn == null) { throw new Error( - `Provider with id ${HostedProviderId.AzureDevOps} does not support getting repositories for Azure projects`, + `Provider with id ${HostingIntegrationId.AzureDevOps} does not support getting repositories for Azure projects`, ); } @@ -568,7 +568,7 @@ export class ProvidersApi { }; } - async getCurrentUser(providerId: ProviderId): Promise { + async getCurrentUser(providerId: IntegrationId): Promise { const provider = this.providers[providerId]; if (provider == null) { throw new Error(`Provider with id ${providerId} not registered`); @@ -587,7 +587,7 @@ export class ProvidersApi { return account; } - async getCurrentUserForInstance(providerId: ProviderId, namespace: string): Promise { + async getCurrentUserForInstance(providerId: IntegrationId, namespace: string): Promise { const provider = this.providers[providerId]; if (provider == null) { throw new Error(`Provider with id ${providerId} not registered`); From ea9e511e08918ed0fe426d608faec0c5e788fbf6 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Tue, 27 Feb 2024 09:16:10 -0700 Subject: [PATCH 0573/1012] Renames RemoteProviderReference -> ProviderReference --- src/annotations/autolinks.ts | 6 +++--- src/git/models/author.ts | 4 ++-- src/git/models/defaultBranch.ts | 4 ++-- src/git/models/issue.ts | 6 +++--- src/git/models/pullRequest.ts | 4 ++-- src/git/models/remoteProvider.ts | 4 ++-- src/git/models/repositoryMetadata.ts | 4 ++-- src/git/remotes/remoteProvider.ts | 6 ++---- src/plus/webviews/graph/protocol.ts | 4 ++-- 9 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/annotations/autolinks.ts b/src/annotations/autolinks.ts index 13514d6b99de5..058ec1c2d812f 100644 --- a/src/annotations/autolinks.ts +++ b/src/annotations/autolinks.ts @@ -6,7 +6,7 @@ import type { Container } from '../container'; import type { IssueOrPullRequest } from '../git/models/issue'; import { getIssueOrPullRequestHtmlIcon, getIssueOrPullRequestMarkdownIcon } from '../git/models/issue'; import type { GitRemote } from '../git/models/remote'; -import type { RemoteProviderReference } from '../git/models/remoteProvider'; +import type { ProviderReference } from '../git/models/remoteProvider'; import type { ResourceDescriptor } from '../plus/integrations/integration'; import type { MaybePausedResult } from '../system/cancellation'; import { configuration } from '../system/configuration'; @@ -22,7 +22,7 @@ const emptyAutolinkMap = Object.freeze(new Map()); const numRegex = //g; export interface Autolink { - provider?: RemoteProviderReference; + provider?: ProviderReference; id: string; prefix: string; title?: string; @@ -150,7 +150,7 @@ export class Autolinks implements Disposable { }) getAutolinks(message: string, remote?: GitRemote, options?: { excludeCustom?: boolean }): Map { const refsets: [ - RemoteProviderReference | undefined, + ProviderReference | undefined, (AutolinkReference | DynamicAutolinkReference)[] | CacheableAutolinkReference[], ][] = []; if (remote?.provider?.autolinks?.length) { diff --git a/src/git/models/author.ts b/src/git/models/author.ts index 8d2ef94dda48f..48fb86030a7e2 100644 --- a/src/git/models/author.ts +++ b/src/git/models/author.ts @@ -1,7 +1,7 @@ -import type { RemoteProviderReference } from './remoteProvider'; +import type { ProviderReference } from './remoteProvider'; export interface Account { - provider: RemoteProviderReference; + provider: ProviderReference; name: string | undefined; email: string | undefined; avatarUrl: string | undefined; diff --git a/src/git/models/defaultBranch.ts b/src/git/models/defaultBranch.ts index 95fd4a0ac51b5..9e6efcdfb4606 100644 --- a/src/git/models/defaultBranch.ts +++ b/src/git/models/defaultBranch.ts @@ -1,6 +1,6 @@ -import type { RemoteProviderReference } from './remoteProvider'; +import type { ProviderReference } from './remoteProvider'; export interface DefaultBranch { - provider: RemoteProviderReference; + provider: ProviderReference; name: string; } diff --git a/src/git/models/issue.ts b/src/git/models/issue.ts index a3a427297c6b8..32b02b94871d5 100644 --- a/src/git/models/issue.ts +++ b/src/git/models/issue.ts @@ -1,13 +1,13 @@ import { ColorThemeKind, ThemeColor, ThemeIcon, window } from 'vscode'; import type { Colors } from '../../constants'; -import type { RemoteProviderReference } from './remoteProvider'; +import type { ProviderReference } from './remoteProvider'; export type IssueOrPullRequestType = 'issue' | 'pullrequest'; export type IssueOrPullRequestState = 'opened' | 'closed' | 'merged'; export interface IssueOrPullRequest { readonly type: IssueOrPullRequestType; - readonly provider: RemoteProviderReference; + readonly provider: ProviderReference; readonly id: string; readonly nodeId: string | undefined; readonly title: string; @@ -224,7 +224,7 @@ export class Issue implements IssueShape { readonly type = 'issue'; constructor( - public readonly provider: RemoteProviderReference, + public readonly provider: ProviderReference, public readonly id: string, public readonly nodeId: string | undefined, public readonly title: string, diff --git a/src/git/models/pullRequest.ts b/src/git/models/pullRequest.ts index 5c87184632721..5dd9c98e9180e 100644 --- a/src/git/models/pullRequest.ts +++ b/src/git/models/pullRequest.ts @@ -3,7 +3,7 @@ import { formatDate, fromNow } from '../../system/date'; import { memoize } from '../../system/decorators/memoize'; import type { IssueOrPullRequest, IssueOrPullRequestState as PullRequestState } from './issue'; import { shortenRevision } from './reference'; -import type { RemoteProviderReference } from './remoteProvider'; +import type { ProviderReference } from './remoteProvider'; export type { PullRequestState }; @@ -128,7 +128,7 @@ export class PullRequest implements PullRequestShape { readonly type = 'pullrequest'; constructor( - public readonly provider: RemoteProviderReference, + public readonly provider: ProviderReference, public readonly author: { readonly name: string; readonly avatarUrl: string; diff --git a/src/git/models/remoteProvider.ts b/src/git/models/remoteProvider.ts index 4df7057fa1a7f..644db72aee269 100644 --- a/src/git/models/remoteProvider.ts +++ b/src/git/models/remoteProvider.ts @@ -1,11 +1,11 @@ -export interface RemoteProviderReference { +export interface ProviderReference { readonly id: string; readonly name: string; readonly domain: string; readonly icon: string; } -export interface Provider extends RemoteProviderReference { +export interface Provider extends ProviderReference { getIgnoreSSLErrors(): boolean | 'force'; reauthenticate(): Promise; trackRequestException(): void; diff --git a/src/git/models/repositoryMetadata.ts b/src/git/models/repositoryMetadata.ts index 393040e7cc4e4..44002f99d2ec0 100644 --- a/src/git/models/repositoryMetadata.ts +++ b/src/git/models/repositoryMetadata.ts @@ -1,7 +1,7 @@ -import type { RemoteProviderReference } from './remoteProvider'; +import type { ProviderReference } from './remoteProvider'; export interface RepositoryMetadata { - provider: RemoteProviderReference; + provider: ProviderReference; owner: string; name: string; isFork: boolean; diff --git a/src/git/remotes/remoteProvider.ts b/src/git/remotes/remoteProvider.ts index 9a9689e8d593e..80695e73fb992 100644 --- a/src/git/remotes/remoteProvider.ts +++ b/src/git/remotes/remoteProvider.ts @@ -7,7 +7,7 @@ import type { ResourceDescriptor } from '../../plus/integrations/integration'; import { memoize } from '../../system/decorators/memoize'; import { encodeUrl } from '../../system/encoding'; import { openUrl } from '../../system/utils'; -import type { RemoteProviderReference } from '../models/remoteProvider'; +import type { ProviderReference } from '../models/remoteProvider'; import type { RemoteResource } from '../models/remoteResource'; import { RemoteResourceType } from '../models/remoteResource'; import type { Repository } from '../models/repository'; @@ -23,9 +23,7 @@ export type RemoteProviderId = | 'gitlab' | 'google-source'; -export abstract class RemoteProvider - implements RemoteProviderReference -{ +export abstract class RemoteProvider implements ProviderReference { protected readonly _name: string | undefined; constructor( diff --git a/src/plus/webviews/graph/protocol.ts b/src/plus/webviews/graph/protocol.ts index 4a75c83179b82..78e94dcee9543 100644 --- a/src/plus/webviews/graph/protocol.ts +++ b/src/plus/webviews/graph/protocol.ts @@ -34,7 +34,7 @@ import type { GitStashReference, GitTagReference, } from '../../../git/models/reference'; -import type { RemoteProviderReference } from '../../../git/models/remoteProvider'; +import type { ProviderReference } from '../../../git/models/remoteProvider'; import type { GitSearchResultData, SearchQuery } from '../../../git/search'; import type { DateTimeFormat } from '../../../system/date'; import type { WebviewItemContext, WebviewItemGroupContext } from '../../../system/webview'; @@ -489,7 +489,7 @@ export interface GraphPullRequestContextValue { url: string; repoPath: string; refs?: PullRequestRefs; - provider: RemoteProviderReference; + provider: ProviderReference; } export interface GraphBranchContextValue { From 62ec0eafbb6b4c8ada1cff703e3555cc7728b83a Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Wed, 28 Feb 2024 17:15:42 -0700 Subject: [PATCH 0574/1012] Updates connected key --- src/constants.ts | 4 ++-- src/plus/integrations/integration.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/constants.ts b/src/constants.ts index 04eeed2d1d57b..145d9a9ede2fa 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -4,7 +4,7 @@ import type { ViewShowBranchComparison } from './config'; import type { Environment } from './container'; import type { StoredSearchQuery } from './git/search'; import type { Subscription } from './plus/gk/account/subscription'; -import type { HostingIntegration } from './plus/integrations/integration'; +import type { Integration } from './plus/integrations/integration'; import type { TrackedUsage, TrackedUsageKeys } from './telemetry/usageTracker'; export const extensionPrefix = 'gitlens'; @@ -899,7 +899,7 @@ export type WorkspaceStorage = { 'views:searchAndCompare:pinned': StoredSearchAndCompareItems; 'views:commitDetails:autolinksExpanded': boolean; } & { [key in `confirm:ai:tos:${AIProviders}`]: boolean } & { - [key in `connected:${HostingIntegration['key']}`]: boolean; + [key in `connected:${Integration['key']}`]: boolean; }; export interface Stored { diff --git a/src/plus/integrations/integration.ts b/src/plus/integrations/integration.ts index 02d2bfacdd9d2..c7b23dcc08242 100644 --- a/src/plus/integrations/integration.ts +++ b/src/plus/integrations/integration.ts @@ -87,7 +87,7 @@ export abstract class BaseIntegration Date: Fri, 8 Mar 2024 16:11:43 -0500 Subject: [PATCH 0575/1012] Renames to *Base --- src/plus/integrations/integration.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/plus/integrations/integration.ts b/src/plus/integrations/integration.ts index c7b23dcc08242..75b882d361773 100644 --- a/src/plus/integrations/integration.ts +++ b/src/plus/integrations/integration.ts @@ -55,6 +55,7 @@ export type ProviderKeyById = T extends Suppo export type ResourceDescriptor = { key: string } & Record; export type IntegrationType = 'issues' | 'hosting'; export type Integration = IssueIntegration | HostingIntegration; + export function isHostingIntegration(integration: Integration): integration is HostingIntegration { return integration.type === 'hosting'; } @@ -62,7 +63,7 @@ export function isIssueIntegration(integration: Integration): integration is Iss return integration.type === 'issues'; } -export abstract class BaseIntegration { +abstract class IntegrationBase { private readonly _onDidChange = new EventEmitter(); get onDidChange(): Event { return this._onDidChange.event; @@ -315,8 +316,9 @@ export abstract class BaseIntegration extends BaseIntegration { +> extends IntegrationBase { readonly type: IntegrationType = 'issues'; + @gate() @debug() async getAccountForResource(resource: T): Promise { @@ -400,8 +402,9 @@ export abstract class IssueIntegration< export abstract class HostingIntegration< ID extends SupportedIntegrationIds = SupportedIntegrationIds, T extends ResourceDescriptor = ResourceDescriptor, -> extends BaseIntegration { +> extends IntegrationBase { readonly type: IntegrationType = 'hosting'; + @gate() @debug() async getAccountForEmail( From 14ef5be4eb5fe6d947f6b70255cd5e702709f4d3 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Mon, 11 Mar 2024 12:37:18 -0400 Subject: [PATCH 0576/1012] Fixes #3180 focus view feedback button --- src/webviews/apps/plus/focus/components/focus-app.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/webviews/apps/plus/focus/components/focus-app.ts b/src/webviews/apps/plus/focus/components/focus-app.ts index 54cd39d647b92..0708670cae4a4 100644 --- a/src/webviews/apps/plus/focus/components/focus-app.ts +++ b/src/webviews/apps/plus/focus/components/focus-app.ts @@ -304,14 +304,14 @@ export class GlFocusApp extends LitElement { .subscription=${this.subscriptionState} id="subscription-gate-badge" > - + >
    From a9a50e9f82fdd3ef1a08c3dfddcad7db7aab4a83 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Mon, 11 Mar 2024 12:40:11 -0400 Subject: [PATCH 0577/1012] Updates CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 181642e91c1e4..0c482fe75f769 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds a new `gitlens.views.collapseWorktreesWhenPossible` setting to specify whether to try to collapse the opened worktrees into a single (common) repository in the views when possible +### Fixed + +- Fixes [#3180](https://github.com/gitkraken/vscode-gitlens/issues/3180) - Focus View feedback button is not working + ## [14.9.0] - 2024-03-06 ### Added From 88d153587951d0c8f8eb050ec805cde5a22432d9 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Mon, 11 Mar 2024 12:06:36 -0700 Subject: [PATCH 0578/1012] Adds Jira integration internals with autolinks Adds caching, onConnect/onDisconnect and autolinks Bumps providers api library Moves onConnect to include cases of stored sessions --- package.json | 2 +- src/annotations/autolinks.ts | 117 +++- src/constants.ts | 17 + src/container.ts | 4 +- src/git/models/author.ts | 1 + src/git/models/issue.ts | 19 +- src/plus/gk/serverConnection.ts | 8 + .../integrationAuthentication.ts | 13 +- src/plus/integrations/authentication/jira.ts | 153 +++++ src/plus/integrations/integration.ts | 22 + src/plus/integrations/integrationService.ts | 18 +- .../integrations/providers/github/github.ts | 6 + .../integrations/providers/gitlab/gitlab.ts | 2 + src/plus/integrations/providers/jira.ts | 285 +++++++++ src/plus/integrations/providers/models.ts | 202 +++++- .../integrations/providers/providersApi.ts | 602 +++++++++--------- .../plus/focus/components/gk-issue-row.ts | 2 +- .../apps/plus/focus/components/issue-row.ts | 2 +- .../commitDetails/commitDetailsWebview.ts | 2 +- yarn.lock | 12 +- 20 files changed, 1111 insertions(+), 378 deletions(-) create mode 100644 src/plus/integrations/authentication/jira.ts create mode 100644 src/plus/integrations/providers/jira.ts diff --git a/package.json b/package.json index 23dd0e2a35ecb..402cb7defe53d 100644 --- a/package.json +++ b/package.json @@ -16620,7 +16620,7 @@ }, "dependencies": { "@gitkraken/gitkraken-components": "10.2.5", - "@gitkraken/provider-apis": "0.10.0", + "@gitkraken/provider-apis": "0.17.3", "@gitkraken/shared-web-components": "0.1.1-rc.15", "@lit/react": "1.0.3", "@microsoft/fast-element": "1.12.0", diff --git a/src/annotations/autolinks.ts b/src/annotations/autolinks.ts index 058ec1c2d812f..0f10cc8fe0b84 100644 --- a/src/annotations/autolinks.ts +++ b/src/annotations/autolinks.ts @@ -32,6 +32,16 @@ export interface Autolink { description?: string; descriptor?: ResourceDescriptor; + tokenize?: + | (( + text: string, + outputFormat: 'html' | 'markdown' | 'plaintext', + tokenMapping: Map, + enrichedAutolinks?: Map, + prs?: Set, + footnotes?: Map, + ) => string) + | null; } export type EnrichedAutolink = [ @@ -139,23 +149,59 @@ export class Autolinks implements Disposable { } } - getAutolinks(message: string, remote?: GitRemote): Map; - // eslint-disable-next-line @typescript-eslint/unified-signatures - getAutolinks(message: string, remote: GitRemote, options?: { excludeCustom?: boolean }): Map; + async getAutolinks(message: string, remote?: GitRemote): Promise>; + async getAutolinks( + message: string, + remote: GitRemote, + // eslint-disable-next-line @typescript-eslint/unified-signatures + options?: { excludeCustom?: boolean }, + ): Promise>; @debug({ args: { 0: '', 1: false, }, }) - getAutolinks(message: string, remote?: GitRemote, options?: { excludeCustom?: boolean }): Map { + async getAutolinks( + message: string, + remote?: GitRemote, + options?: { excludeCustom?: boolean }, + ): Promise> { const refsets: [ ProviderReference | undefined, (AutolinkReference | DynamicAutolinkReference)[] | CacheableAutolinkReference[], ][] = []; - if (remote?.provider?.autolinks?.length) { - refsets.push([remote.provider, remote.provider.autolinks]); + const connectedIssueIntegrations = this.container.integrations.getConnected('issues'); + // Connected issue integration autolinks + if (connectedIssueIntegrations.length) { + await Promise.all( + connectedIssueIntegrations.map(async integration => { + const autoLinks = await integration.autolinks(); + if (autoLinks.length) { + refsets.push([integration, autoLinks]); + } + }), + ); + } + + // Remote-specific autolinks and remote integration autolinks + if (remote?.provider != null) { + const autoLinks = []; + const integration = remote.getIntegration(); + const integrationAutolinks = await integration?.autolinks(); + if (integrationAutolinks?.length) { + autoLinks.push(...integrationAutolinks); + } + if (remote?.provider?.autolinks.length) { + autoLinks.push(...remote.provider.autolinks); + } + + if (autoLinks.length) { + refsets.push([remote.provider, autoLinks]); + } } + + // Custom-configured autolinks if (this._references.length && (remote?.provider == null || !options?.excludeCustom)) { refsets.push([undefined, this._references]); } @@ -219,7 +265,7 @@ export class Autolinks implements Disposable { remote: GitRemote | undefined, ): Promise | undefined> { if (typeof messageOrAutolinks === 'string') { - messageOrAutolinks = this.getAutolinks(messageOrAutolinks, remote); + messageOrAutolinks = await this.getAutolinks(messageOrAutolinks, remote); } if (messageOrAutolinks.size === 0) return undefined; @@ -274,27 +320,44 @@ export class Autolinks implements Disposable { const tokenMapping = new Map(); - for (const ref of this._references) { - if (this.ensureAutolinkCached(ref)) { - if (ref.tokenize != null) { - text = ref.tokenize(text, outputFormat, tokenMapping, enrichedAutolinks, prs, footnotes); + if (enrichedAutolinks != null && enrichedAutolinks.size > 0) { + for (const [, [, link]] of enrichedAutolinks) { + if (this.ensureAutolinkCached(link)) { + if (link.tokenize != null) { + text = link.tokenize(text, outputFormat, tokenMapping, enrichedAutolinks, prs, footnotes); + } + } + } + } else { + for (const ref of this._references) { + if (this.ensureAutolinkCached(ref)) { + if (ref.tokenize != null) { + text = ref.tokenize(text, outputFormat, tokenMapping, enrichedAutolinks, prs, footnotes); + } } } - } - if (remotes != null && remotes.length !== 0) { - remotes = [...remotes].sort((a, b) => { - const aConnected = a.maybeIntegrationConnected; - const bConnected = b.maybeIntegrationConnected; - return aConnected !== bConnected ? (aConnected ? -1 : bConnected ? 1 : 0) : 0; - }); - for (const r of remotes) { - if (r.provider == null) continue; - - for (const ref of r.provider.autolinks) { - if (this.ensureAutolinkCached(ref)) { - if (ref.tokenize != null) { - text = ref.tokenize(text, outputFormat, tokenMapping, enrichedAutolinks, prs, footnotes); + if (remotes != null && remotes.length !== 0) { + remotes = [...remotes].sort((a, b) => { + const aConnected = a.maybeIntegrationConnected; + const bConnected = b.maybeIntegrationConnected; + return aConnected !== bConnected ? (aConnected ? -1 : bConnected ? 1 : 0) : 0; + }); + for (const r of remotes) { + if (r.provider == null) continue; + + for (const ref of r.provider.autolinks) { + if (this.ensureAutolinkCached(ref)) { + if (ref.tokenize != null) { + text = ref.tokenize( + text, + outputFormat, + tokenMapping, + enrichedAutolinks, + prs, + footnotes, + ); + } } } } @@ -317,8 +380,8 @@ export class Autolinks implements Disposable { } private ensureAutolinkCached( - ref: CacheableAutolinkReference | DynamicAutolinkReference, - ): ref is CacheableAutolinkReference | DynamicAutolinkReference { + ref: CacheableAutolinkReference | DynamicAutolinkReference | Autolink, + ): ref is CacheableAutolinkReference | DynamicAutolinkReference | Autolink { if (isDynamic(ref)) return true; if (!ref.prefix || !ref.url) return false; if (ref.tokenize !== undefined || ref.tokenize === null) return true; diff --git a/src/constants.ts b/src/constants.ts index 145d9a9ede2fa..f1e36175a8225 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -872,6 +872,8 @@ export type GlobalStorage = { [key in `provider:authentication:skip:${string}`]: boolean; } & { [key in `gk:${string}:checkin`]: Stored } & { [key in `gk:${string}:organizations`]: Stored; +} & { [key in `jira:${string}:organizations`]: Stored } & { + [key in `jira:${string}:projects`]: Stored; }; export type DeprecatedWorkspaceStorage = { @@ -956,6 +958,21 @@ export interface StoredOrganization { role: 'owner' | 'admin' | 'billing' | 'user'; } +export interface StoredJiraOrganization { + key: string; + id: string; + name: string; + url: string; + avatarUrl: string; +} + +export interface StoredJiraProject { + key: string; + id: string; + name: string; + resourceId: string; +} + export interface StoredAvatar { uri: string; timestamp: number; diff --git a/src/container.ts b/src/container.ts index 47934eaf73baf..aa9200796aea5 100644 --- a/src/container.ts +++ b/src/container.ts @@ -567,7 +567,9 @@ export class Container { private _integrationAuthentication: IntegrationAuthenticationService | undefined; get integrationAuthentication() { if (this._integrationAuthentication == null) { - this._disposables.push((this._integrationAuthentication = new IntegrationAuthenticationService(this))); + this._disposables.push( + (this._integrationAuthentication = new IntegrationAuthenticationService(this, this._connection)), + ); } return this._integrationAuthentication; diff --git a/src/git/models/author.ts b/src/git/models/author.ts index 48fb86030a7e2..ef480dbf78142 100644 --- a/src/git/models/author.ts +++ b/src/git/models/author.ts @@ -5,4 +5,5 @@ export interface Account { name: string | undefined; email: string | undefined; avatarUrl: string | undefined; + username: string | undefined; } diff --git a/src/git/models/issue.ts b/src/git/models/issue.ts index 32b02b94871d5..61d5d22a28d22 100644 --- a/src/git/models/issue.ts +++ b/src/git/models/issue.ts @@ -19,14 +19,14 @@ export interface IssueOrPullRequest { } export interface IssueLabel { - color: string; + color?: string; name: string; } export interface IssueMember { name: string; - avatarUrl: string; - url: string; + avatarUrl?: string; + url?: string; } export interface IssueRepository { @@ -38,7 +38,7 @@ export interface IssueShape extends IssueOrPullRequest { updatedDate: Date; author: IssueMember; assignees: IssueMember[]; - repository: IssueRepository; + repository?: IssueRepository; labels?: IssueLabel[]; commentsCount?: number; thumbsUpCount?: number; @@ -198,10 +198,13 @@ export function serializeIssue(value: IssueShape): IssueShape { avatarUrl: value.author.avatarUrl, url: value.author.url, }, - repository: { - owner: value.repository.owner, - repo: value.repository.repo, - }, + repository: + value.repository == null + ? undefined + : { + owner: value.repository.owner, + repo: value.repository.repo, + }, assignees: value.assignees.map(assignee => ({ name: assignee.name, avatarUrl: assignee.avatarUrl, diff --git a/src/plus/gk/serverConnection.ts b/src/plus/gk/serverConnection.ts index 5e8dfb3dc56a5..733211afc6b77 100644 --- a/src/plus/gk/serverConnection.ts +++ b/src/plus/gk/serverConnection.ts @@ -17,6 +17,7 @@ interface FetchOptions { interface GKFetchOptions extends FetchOptions { token?: string; unAuthenticated?: boolean; + query?: string; } export class ServerConnection implements Disposable { @@ -220,6 +221,13 @@ export class ServerConnection implements Disposable { headers['gk-org-id'] = organizationId; } + if (options?.query != null) { + if (url instanceof URL) { + url.search = options.query; + } else if (typeof url === 'string') { + url = `${url}?${options.query}`; + } + } // TODO@eamodio handle common response errors return this.fetch( diff --git a/src/plus/integrations/authentication/integrationAuthentication.ts b/src/plus/integrations/authentication/integrationAuthentication.ts index be7a044745e8b..2a506d5c36020 100644 --- a/src/plus/integrations/authentication/integrationAuthentication.ts +++ b/src/plus/integrations/authentication/integrationAuthentication.ts @@ -3,12 +3,14 @@ import { authentication } from 'vscode'; import { wrapForForcedInsecureSSL } from '@env/fetch'; import type { Container } from '../../../container'; import { debug } from '../../../system/decorators/log'; +import type { ServerConnection } from '../../gk/serverConnection'; import type { IntegrationId } from '../providers/models'; -import { HostingIntegrationId, SelfHostedIntegrationId } from '../providers/models'; +import { HostingIntegrationId, IssueIntegrationId, SelfHostedIntegrationId } from '../providers/models'; import { AzureDevOpsAuthenticationProvider } from './azureDevOps'; import { BitbucketAuthenticationProvider } from './bitbucket'; import { GitHubEnterpriseAuthenticationProvider } from './github'; import { GitLabAuthenticationProvider } from './gitlab'; +import { JiraAuthenticationProvider } from './jira'; import type { ProviderAuthenticationSession } from './models'; interface StoredSession { @@ -44,7 +46,10 @@ export interface IntegrationAuthenticationProvider { export class IntegrationAuthenticationService implements Disposable { private readonly providers = new Map(); - constructor(private readonly container: Container) {} + constructor( + private readonly container: Container, + private readonly connection: ServerConnection, + ) {} dispose() { this.providers.clear(); @@ -136,6 +141,7 @@ export class IntegrationAuthenticationService implements Disposable { case SelfHostedIntegrationId.GitHubEnterprise: case HostingIntegrationId.GitLab: case SelfHostedIntegrationId.GitLabSelfHosted: + case IssueIntegrationId.Jira: return true; default: return false; @@ -163,6 +169,9 @@ export class IntegrationAuthenticationService implements Disposable { case SelfHostedIntegrationId.GitLabSelfHosted: provider = new GitLabAuthenticationProvider(); break; + case IssueIntegrationId.Jira: + provider = new JiraAuthenticationProvider(this.connection); + break; default: throw new Error(`Provider '${providerId}' is not supported`); } diff --git a/src/plus/integrations/authentication/jira.ts b/src/plus/integrations/authentication/jira.ts new file mode 100644 index 0000000000000..be2fb7022ffa3 --- /dev/null +++ b/src/plus/integrations/authentication/jira.ts @@ -0,0 +1,153 @@ +import type { CancellationToken, Disposable } from 'vscode'; +import { CancellationTokenSource, window } from 'vscode'; +import { Logger } from '../../../system/logger'; +import { cancellable } from '../../../system/promise'; +import { openUrl } from '../../../system/utils'; +import type { ServerConnection } from '../../gk/serverConnection'; +import type { + IntegrationAuthenticationProvider, + IntegrationAuthenticationSessionDescriptor, +} from './integrationAuthentication'; +import type { ProviderAuthenticationSession } from './models'; + +type ConnectionType = 'oauth' | 'personal_access_token'; + +type ProviderTokenData = { + accessToken: string; + type: ConnectionType; + domain: string; + expiresIn: number; + scopes: string; +}; + +type ProviderAuthorizationData = { + url: string; +}; + +/* type ProviderRsp = { + data: T | null; + error: string | null; +}; */ + +type providerInput = 'jira' | 'trello' | 'gitlab' | 'github' | 'bitbucket' | 'azure'; + +export class JiraAuthenticationProvider implements IntegrationAuthenticationProvider { + constructor(private readonly connection: ServerConnection) {} + + private readonly authProviderId = 'jira'; + + getSessionId(descriptor?: IntegrationAuthenticationSessionDescriptor): string { + return descriptor?.domain ?? ''; + } + + private async getTokenData( + provider: providerInput, + refresh: boolean = false, + ): Promise { + const tokenRsp = await this.connection.fetchGkDevApi( + `v1/provider-tokens/${provider}${refresh ? '/refresh' : ''}`, + { method: refresh ? 'POST' : 'GET' }, + ); + if (!tokenRsp.ok) { + // TODO: Handle errors + const error = (await tokenRsp.json())?.error; + if (error != null) { + Logger.error(`Failed to ${refresh ? 'refresh' : 'get'} ${provider} token from cloud: ${error}`); + } + return undefined; + } + + return (await tokenRsp.json())?.data as Promise; + } + + private async authorize(provider: providerInput): Promise { + const authorizeRsp = await this.connection.fetchGkDevApi( + `v1/provider-tokens/${provider}/authorize`, + { + method: 'GET', + }, + { + query: 'source=gitlens', + }, + ); + if (!authorizeRsp.ok) { + // TODO: HANDLE ERROR + const error = (await authorizeRsp.json())?.error; + if (error != null) { + Logger.error(`Failed to authorize with ${provider}: ${error}`); + } + return undefined; + } + + return (await authorizeRsp.json())?.data as Promise; + } + + async createSession( + descriptor?: IntegrationAuthenticationSessionDescriptor, + ): Promise { + let tokenData = await this.getTokenData(this.authProviderId); + + if (tokenData != null && tokenData.expiresIn < 60) { + tokenData = await this.getTokenData(this.authProviderId, true); + } + + if (!tokenData) { + const authorizeJiraUrl = (await this.authorize(this.authProviderId))?.url; + + if (!authorizeJiraUrl) return undefined; + + void (await openUrl(authorizeJiraUrl)); + + const cancellation = new CancellationTokenSource(); + try { + await cancellable(this.openCompletionInput(cancellation.token), 2 * 60 * 1000, cancellation.token); + tokenData = await this.getTokenData(this.authProviderId); + } catch { + tokenData = undefined; + } finally { + cancellation.dispose(); + } + } + + if (!tokenData) return undefined; + + return { + id: this.getSessionId(descriptor), + accessToken: tokenData.accessToken, + scopes: descriptor?.scopes ?? [], + account: { + id: '', + label: '', + }, + expiresAt: new Date(tokenData.expiresIn * 1000 + Date.now()), + }; + } + + private async openCompletionInput(cancellationToken: CancellationToken) { + const input = window.createInputBox(); + input.ignoreFocusOut = true; + + const disposables: Disposable[] = []; + + try { + if (cancellationToken.isCancellationRequested) return; + + await new Promise(resolve => { + disposables.push( + cancellationToken.onCancellationRequested(() => input.hide()), + input.onDidHide(() => resolve(undefined)), + input.onDidAccept(() => resolve(undefined)), + ); + + input.title = 'Connect to Jira'; + input.placeholder = 'Please enter the provided authorization code'; + input.prompt = ''; + + input.show(); + }); + } finally { + input.dispose(); + disposables.forEach(d => void d.dispose()); + } + } +} diff --git a/src/plus/integrations/integration.ts b/src/plus/integrations/integration.ts index 75b882d361773..2b111febf6c46 100644 --- a/src/plus/integrations/integration.ts +++ b/src/plus/integrations/integration.ts @@ -1,5 +1,7 @@ import type { CancellationToken, Event, MessageItem } from 'vscode'; import { EventEmitter, window } from 'vscode'; +import type { DynamicAutolinkReference } from '../../annotations/autolinks'; +import type { AutolinkReference } from '../../config'; import type { Container } from '../../container'; import { AuthenticationError, CancellationError, ProviderRequestClientError } from '../../errors'; import type { PagedResult } from '../../git/gitProvider'; @@ -88,6 +90,12 @@ abstract class IntegrationBase { + return []; + } + private get connectedKey(): `connected:${Integration['key']}` { return `connected:${this.key}`; } @@ -119,6 +127,8 @@ abstract class IntegrationBase; + @gate() @log() async disconnect(options?: { silent?: boolean; currentSessionOnly?: boolean }): Promise { @@ -176,8 +186,12 @@ abstract class IntegrationBase; + @log() async reauthenticate(): Promise { if (this._session === undefined) return; @@ -266,6 +280,7 @@ abstract class IntegrationBase { this._onDidChange.fire(); this.container.integrations.connected(this.key); + void this.providerOnConnect?.(); }); } @@ -370,6 +385,13 @@ export abstract class IssueIntegration< } } + async getProjectsForUser(): Promise { + const resources = await this.getResourcesForUser(); + if (resources == null) return undefined; + + return this.getProjectsForResources(resources); + } + protected abstract getProviderProjectsForResources( session: ProviderAuthenticationSession, resources: T[], diff --git a/src/plus/integrations/integrationService.ts b/src/plus/integrations/integrationService.ts index 1bf47e8b962aa..872792d365989 100644 --- a/src/plus/integrations/integrationService.ts +++ b/src/plus/integrations/integrationService.ts @@ -12,6 +12,7 @@ import { filterMap, flatten } from '../../system/iterable'; import type { HostingIntegration, Integration, + IntegrationType, IssueIntegration, ProviderKey, ResourceDescriptor, @@ -24,7 +25,13 @@ import { AzureDevOpsIntegration } from './providers/azureDevOps'; import { BitbucketIntegration } from './providers/bitbucket'; import { GitHubEnterpriseIntegration, GitHubIntegration } from './providers/github'; import { GitLabIntegration, GitLabSelfHostedIntegration } from './providers/gitlab'; -import { HostingIntegrationId, isSelfHostedIntegrationId, SelfHostedIntegrationId } from './providers/models'; +import { JiraIntegration } from './providers/jira'; +import { + HostingIntegrationId, + isSelfHostedIntegrationId, + IssueIntegrationId, + SelfHostedIntegrationId, +} from './providers/models'; import { ProvidersApi } from './providers/providersApi'; export interface ConnectionStateChangeEvent { @@ -122,6 +129,9 @@ export class IntegrationService implements Disposable { case HostingIntegrationId.AzureDevOps: provider = new AzureDevOpsIntegration(this.container, this._providersApi); break; + case IssueIntegrationId.Jira: + provider = new JiraIntegration(this.container, this._providersApi); + break; default: throw new Error(`Provider '${id}' is not supported`); } @@ -155,6 +165,12 @@ export class IntegrationService implements Disposable { } } + getConnected(type: 'issues'): IssueIntegration[]; + getConnected(type: 'hosting'): HostingIntegration[]; + getConnected(type: IntegrationType): Integration[] { + return [...this._integrations.values()].filter(p => p.maybeConnected && p.type === type); + } + async getMyIssues( providerIds?: HostingIntegrationId[], cancellation?: CancellationToken, diff --git a/src/plus/integrations/providers/github/github.ts b/src/plus/integrations/providers/github/github.ts index 693ac0ef74fc4..f4b6ec524baf0 100644 --- a/src/plus/integrations/providers/github/github.ts +++ b/src/plus/integrations/providers/github/github.ts @@ -243,6 +243,7 @@ export class GitHubApi implements Disposable { name: string | null; email: string | null; avatarUrl: string; + login: string | null; }; } | null @@ -266,6 +267,7 @@ export class GitHubApi implements Disposable { name email avatarUrl(size: $avatarSize) + login } } } @@ -305,6 +307,7 @@ export class GitHubApi implements Disposable { options.avatarSize, ) : undefined, + username: author.login ?? undefined, }; } catch (ex) { if (ex instanceof ProviderRequestNotFoundError) return undefined; @@ -335,6 +338,7 @@ export class GitHubApi implements Disposable { name: string | null; email: string | null; avatarUrl: string; + login: string | null; }[] | null | undefined; @@ -354,6 +358,7 @@ export class GitHubApi implements Disposable { name email avatarUrl(size: $avatarSize) + login } } } @@ -392,6 +397,7 @@ export class GitHubApi implements Disposable { options.avatarSize, ) : undefined, + username: author.login ?? undefined, }; } catch (ex) { if (ex instanceof ProviderRequestNotFoundError) return undefined; diff --git a/src/plus/integrations/providers/gitlab/gitlab.ts b/src/plus/integrations/providers/gitlab/gitlab.ts index 503993d7da3f7..99cf5c6ac61ed 100644 --- a/src/plus/integrations/providers/gitlab/gitlab.ts +++ b/src/plus/integrations/providers/gitlab/gitlab.ts @@ -139,6 +139,7 @@ export class GitLabApi implements Disposable { name: user.name || undefined, email: commit.author_email || undefined, avatarUrl: user.avatarUrl || undefined, + username: user.username || undefined, }; } catch (ex) { if (ex instanceof ProviderRequestNotFoundError) return undefined; @@ -170,6 +171,7 @@ export class GitLabApi implements Disposable { name: user.name || undefined, email: user.publicEmail || undefined, avatarUrl: user.avatarUrl || undefined, + username: user.username || undefined, }; } catch (ex) { if (ex instanceof ProviderRequestNotFoundError) return undefined; diff --git a/src/plus/integrations/providers/jira.ts b/src/plus/integrations/providers/jira.ts new file mode 100644 index 0000000000000..fc79170538358 --- /dev/null +++ b/src/plus/integrations/providers/jira.ts @@ -0,0 +1,285 @@ +import type { AuthenticationSession, CancellationToken } from 'vscode'; +import type { DynamicAutolinkReference } from '../../../annotations/autolinks'; +import type { AutolinkReference } from '../../../config'; +import type { Account } from '../../../git/models/author'; +import type { SearchedIssue } from '../../../git/models/issue'; +import { filterMap, flatten } from '../../../system/iterable'; +import type { IntegrationAuthenticationProviderDescriptor } from '../authentication/integrationAuthentication'; +import type { ResourceDescriptor } from '../integration'; +import { IssueIntegration } from '../integration'; +import { IssueFilter, IssueIntegrationId, providersMetadata, toAccount, toSearchedIssue } from './models'; + +const metadata = providersMetadata[IssueIntegrationId.Jira]; +const authProvider = Object.freeze({ id: metadata.id, scopes: metadata.scopes }); + +export interface JiraBaseDescriptor extends ResourceDescriptor { + id: string; + name: string; +} +export interface JiraOrganizationDescriptor extends JiraBaseDescriptor { + url: string; + avatarUrl: string; +} + +export interface JiraProjectDescriptor extends JiraBaseDescriptor { + resourceId: string; +} + +export class JiraIntegration extends IssueIntegration { + readonly authProvider: IntegrationAuthenticationProviderDescriptor = authProvider; + readonly id = IssueIntegrationId.Jira; + protected readonly key = this.id; + readonly name: string = 'Jira'; + + get domain(): string { + return metadata.domain; + } + + protected get apiBaseUrl(): string { + return 'https://api.atlassian.com'; + } + + private _autolinks: Map | undefined; + override autolinks(): (AutolinkReference | DynamicAutolinkReference)[] { + if (this._session == null || this._organizations == null || this._projects == null) return []; + + this._autolinks ||= new Map(); + + const cachedAutolinks = this._autolinks.get(this._session.accessToken); + if (cachedAutolinks != null) { + return cachedAutolinks; + } + + const autolinks: (AutolinkReference | DynamicAutolinkReference)[] = []; + const organizations = this._organizations.get(this._session.accessToken); + if (organizations != null) { + for (const organization of organizations) { + const projects = this._projects.get(`${this._session.accessToken}:${organization.id}`); + if (projects != null) { + for (const project of projects) { + const prefix = `${project.key}-`; + autolinks.push({ + type: 'issue', + url: `${organization.url}/browse/${prefix}`, + prefix: prefix, + title: `Open Issue ${prefix} on ${organization.name}`, + description: `${organization.name} Issue ${prefix}`, + }); + } + } + } + } + + this._autolinks.set(this._session.accessToken, autolinks); + + return autolinks; + } + + protected override async getProviderAccountForResource( + { accessToken }: AuthenticationSession, + resource: JiraOrganizationDescriptor, + ): Promise { + const user = await this.api.getCurrentUserForResource(this.id, resource.id, { + accessToken: accessToken, + }); + + if (user == null) return undefined; + return toAccount(user, this); + } + + private _organizations: Map | undefined; + protected override async getProviderResourcesForUser( + { accessToken }: AuthenticationSession, + force: boolean = false, + ): Promise { + this._organizations ||= new Map(); + + const cachedResources = this._organizations.get(accessToken); + + if (cachedResources == null || force) { + const resources = await this.api.getJiraResourcesForCurrentUser({ accessToken: accessToken }); + this._organizations.set( + accessToken, + resources != null ? resources.map(r => ({ ...r, key: r.id })) : undefined, + ); + } + + return this._organizations.get(accessToken); + } + + private _projects: Map | undefined; + protected override async getProviderProjectsForResources( + { accessToken }: AuthenticationSession, + resources: JiraOrganizationDescriptor[], + force: boolean = false, + ): Promise { + this._projects ||= new Map(); + + let resourcesWithoutProjects = []; + if (force) { + resourcesWithoutProjects = resources; + } else { + for (const resource of resources) { + const resourceKey = `${accessToken}:${resource.id}`; + const cachedProjects = this._projects.get(resourceKey); + if (cachedProjects == null) { + resourcesWithoutProjects.push(resource); + } + } + } + + if (resourcesWithoutProjects.length > 0) { + const jiraProjectBaseDescriptors = await this.api.getJiraProjectsForResources( + resourcesWithoutProjects.map(r => r.id), + { accessToken: accessToken }, + ); + + for (const resource of resourcesWithoutProjects) { + const projects = jiraProjectBaseDescriptors?.filter(p => p.resourceId === resource.id); + if (projects != null) { + this._projects.set( + `${accessToken}:${resource.id}`, + projects.map(p => ({ ...p })), + ); + } + } + } + + return resources.reduce((projects, resource) => { + const resourceProjects = this._projects!.get(`${accessToken}:${resource.id}`); + if (resourceProjects != null) { + projects.push(...resourceProjects); + } + return projects; + }, []); + } + + protected override async getProviderIssuesForProject( + { accessToken }: AuthenticationSession, + project: JiraProjectDescriptor, + options?: { user: string; filters: IssueFilter[] }, + ): Promise { + let results; + + const getSearchedUserIssuesForFilter = async ( + user: string, + filter: IssueFilter, + ): Promise => { + const results = await this.api.getIssuesForProject(this.id, project.name, project.resourceId, { + authorLogin: filter === IssueFilter.Author ? user : undefined, + assigneeLogins: filter === IssueFilter.Assignee ? [user] : undefined, + mentionLogin: filter === IssueFilter.Mention ? user : undefined, + accessToken: accessToken, + }); + + return results + ?.map(issue => toSearchedIssue(issue, this, filter)) + .filter((result): result is SearchedIssue => result !== undefined); + }; + + if (options?.user != null && options.filters.length > 0) { + const resultsPromise = Promise.allSettled( + options.filters.map(filter => getSearchedUserIssuesForFilter(options.user, filter)), + ); + + results = [ + ...flatten( + filterMap(await resultsPromise, r => + r.status === 'fulfilled' && r.value != null ? r.value : undefined, + ), + ), + ]; + + const resultsById = new Map(); + for (const result of results) { + if (resultsById.has(result.issue.id)) { + const existing = resultsById.get(result.issue.id)!; + existing.reasons = [...existing.reasons, ...result.reasons]; + } else { + resultsById.set(result.issue.id, result); + } + } + + return [...resultsById.values()]; + } + + results = await this.api.getIssuesForProject(this.id, project.name, project.resourceId, { + accessToken: accessToken, + }); + return results + ?.map(issue => toSearchedIssue(issue, this)) + .filter((result): result is SearchedIssue => result !== undefined); + } + + protected override async searchProviderMyIssues( + session: AuthenticationSession, + resources?: JiraOrganizationDescriptor[], + _cancellation?: CancellationToken, + ): Promise { + const myResources = resources ?? (await this.getProviderResourcesForUser(session)); + if (!myResources) return undefined; + + const results: SearchedIssue[] = []; + for (const resource of myResources) { + const userLogin = (await this.getProviderAccountForResource(session, resource))?.username; + const resourceIssues = await this.api.getIssuesForResourceForCurrentUser(this.id, resource.id, { + accessToken: session.accessToken, + }); + const formattedIssues = resourceIssues + ?.map(issue => toSearchedIssue(issue, this, undefined, userLogin)) + .filter((result): result is SearchedIssue => result != null); + if (formattedIssues != null) { + results.push(...formattedIssues); + } + } + + return results; + } + + protected override async providerOnConnect(): Promise { + this._autolinks = undefined; + if (this._session == null) return; + const storedOrganizations = this.container.storage.get(`jira:${this._session.accessToken}:organizations`); + const storedProjects = this.container.storage.get(`jira:${this._session.accessToken}:projects`); + let organizations = storedOrganizations?.data?.map(o => ({ ...o })); + let projects = storedProjects?.data?.map(p => ({ ...p })); + + if (storedOrganizations == null) { + organizations = await this.getProviderResourcesForUser(this._session, true); + await this.container.storage.store(`jira:${this._session.accessToken}:organizations`, { + v: 1, + timestamp: Date.now(), + data: organizations, + }); + } + + this._organizations ||= new Map(); + this._organizations.set(this._session.accessToken, organizations); + + if (storedProjects == null && organizations?.length) { + projects = await this.getProviderProjectsForResources(this._session, organizations); + await this.container.storage.store(`jira:${this._session.accessToken}:projects`, { + v: 1, + timestamp: Date.now(), + data: projects, + }); + } + + this._projects ||= new Map(); + for (const project of projects ?? []) { + const projectKey = `${this._session.accessToken}:${project.resourceId}`; + const projects = this._projects.get(projectKey); + if (projects == null) { + this._projects.set(projectKey, [project]); + } else { + projects.push(project); + } + } + } + + protected override providerOnDisconnect(): void { + this._organizations = undefined; + this._projects = undefined; + this._autolinks = undefined; + } +} diff --git a/src/plus/integrations/providers/models.ts b/src/plus/integrations/providers/models.ts index e75cab2d60a20..9c8079e71e416 100644 --- a/src/plus/integrations/providers/models.ts +++ b/src/plus/integrations/providers/models.ts @@ -10,8 +10,13 @@ import type { GitRepository, Issue, Jira, + JiraProject, + JiraResource, Trello, } from '@gitkraken/provider-apis'; +import type { Account as UserAccount } from '../../../git/models/author'; +import type { SearchedIssue } from '../../../git/models/issue'; +import type { ProviderReference } from '../../../git/models/remoteProvider'; export type ProviderAccount = Account; export type ProviderReposInput = (string | number)[] | GetRepoInput[]; @@ -19,6 +24,9 @@ export type ProviderRepoInput = GetRepoInput; export type ProviderPullRequest = GitPullRequest; export type ProviderRepository = GitRepository; export type ProviderIssue = Issue; +export type ProviderEnterpriseOptions = EnterpriseOptions; +export type ProviderJiraProject = JiraProject; +export type ProviderJiraResource = JiraResource; export type IntegrationId = HostingIntegrationId | IssueIntegrationId | SelfHostedIntegrationId; @@ -124,6 +132,11 @@ export interface GetIssuesForRepoIdsInput extends GetIssuesOptions { repoIds: (string | number)[]; } +export interface GetIssuesForProjectInput extends GetIssuesOptions { + project: string; + resourceId: string; +} + export interface GetIssuesForAzureProjectInput extends GetIssuesOptions { namespace: string; project: string; @@ -147,38 +160,56 @@ export interface PageInfo { export type GetPullRequestsForReposFn = ( input: (GetPullRequestsForReposInput | GetPullRequestsForRepoIdsInput) & PagingInput, options?: EnterpriseOptions, -) => Promise<{ data: GitPullRequest[]; pageInfo?: PageInfo }>; +) => Promise<{ data: ProviderPullRequest[]; pageInfo?: PageInfo }>; export type GetPullRequestsForRepoFn = ( input: GetPullRequestsForRepoInput & PagingInput, options?: EnterpriseOptions, -) => Promise<{ data: GitPullRequest[]; pageInfo?: PageInfo }>; +) => Promise<{ data: ProviderPullRequest[]; pageInfo?: PageInfo }>; export type GetIssuesForReposFn = ( input: (GetIssuesForReposInput | GetIssuesForRepoIdsInput) & PagingInput, options?: EnterpriseOptions, -) => Promise<{ data: Issue[]; pageInfo?: PageInfo }>; +) => Promise<{ data: ProviderIssue[]; pageInfo?: PageInfo }>; export type GetIssuesForRepoFn = ( input: GetIssuesForRepoInput & PagingInput, options?: EnterpriseOptions, -) => Promise<{ data: Issue[]; pageInfo?: PageInfo }>; +) => Promise<{ data: ProviderIssue[]; pageInfo?: PageInfo }>; export type GetIssuesForAzureProjectFn = ( input: GetIssuesForAzureProjectInput & PagingInput, options?: EnterpriseOptions, -) => Promise<{ data: Issue[]; pageInfo?: PageInfo }>; +) => Promise<{ data: ProviderIssue[]; pageInfo?: PageInfo }>; export type GetReposForAzureProjectFn = ( input: GetReposForAzureProjectInput & PagingInput, options?: EnterpriseOptions, -) => Promise<{ data: GitRepository[]; pageInfo?: PageInfo }>; +) => Promise<{ data: ProviderRepository[]; pageInfo?: PageInfo }>; -export type getCurrentUserFn = (options?: EnterpriseOptions) => Promise<{ data: Account }>; -export type getCurrentUserForInstanceFn = ( +export type GetCurrentUserFn = (options?: EnterpriseOptions) => Promise<{ data: ProviderAccount }>; +export type GetCurrentUserForInstanceFn = ( input: { namespace: string }, options?: EnterpriseOptions, -) => Promise<{ data: Account }>; +) => Promise<{ data: ProviderAccount }>; +export type GetCurrentUserForResourceFn = ( + input: { resourceId: string }, + options?: EnterpriseOptions, +) => Promise<{ data: ProviderAccount }>; + +export type GetJiraResourcesForCurrentUserFn = (options?: EnterpriseOptions) => Promise<{ data: JiraResource[] }>; +export type GetJiraProjectsForResourcesFn = ( + input: { resourceIds: string[] }, + options?: EnterpriseOptions, +) => Promise<{ data: JiraProject[] }>; +export type GetIssuesForProjectFn = ( + input: GetIssuesForProjectInput, + options?: EnterpriseOptions, +) => Promise<{ data: ProviderIssue[] }>; +export type GetIssuesForResourceForCurrentUserFn = ( + input: { resourceId: string }, + options?: EnterpriseOptions, +) => Promise<{ data: ProviderIssue[] }>; export interface ProviderInfo extends ProviderMetadata { provider: GitHub | GitLab | Bitbucket | Jira | Trello | AzureDevOps; @@ -187,9 +218,14 @@ export interface ProviderInfo extends ProviderMetadata { getIssuesForReposFn?: GetIssuesForReposFn; getIssuesForRepoFn?: GetIssuesForRepoFn; getIssuesForAzureProjectFn?: GetIssuesForAzureProjectFn; - getCurrentUserFn?: getCurrentUserFn; - getCurrentUserForInstanceFn?: getCurrentUserForInstanceFn; + getCurrentUserFn?: GetCurrentUserFn; + getCurrentUserForInstanceFn?: GetCurrentUserForInstanceFn; + getCurrentUserForResourceFn?: GetCurrentUserForResourceFn; + getJiraResourcesForCurrentUserFn?: GetJiraResourcesForCurrentUserFn; + getJiraProjectsForResourcesFn?: GetJiraProjectsForResourcesFn; + getIssuesForProjectFn?: GetIssuesForProjectFn; getReposForAzureProjectFn?: GetReposForAzureProjectFn; + getIssuesForResourceForCurrentUserFn?: GetIssuesForResourceForCurrentUserFn; } export interface ProviderMetadata { @@ -200,6 +236,7 @@ export interface ProviderMetadata { scopes: string[]; supportedPullRequestFilters?: PullRequestFilter[]; supportedIssueFilters?: IssueFilter[]; + usesPAT?: boolean; } export type Providers = Record; @@ -221,6 +258,7 @@ export const providersMetadata: ProvidersMetadata = { // Use 'username' property on account for issue filters supportedIssueFilters: [IssueFilter.Author, IssueFilter.Assignee, IssueFilter.Mention], scopes: ['repo', 'read:user', 'user:email'], + usesPAT: true, }, [SelfHostedIntegrationId.GitHubEnterprise]: { domain: '', @@ -237,6 +275,7 @@ export const providersMetadata: ProvidersMetadata = { // Use 'username' property on account for issue filters supportedIssueFilters: [IssueFilter.Author, IssueFilter.Assignee, IssueFilter.Mention], scopes: ['repo', 'read:user', 'user:email'], + usesPAT: true, }, [HostingIntegrationId.GitLab]: { domain: 'gitlab.com', @@ -252,6 +291,7 @@ export const providersMetadata: ProvidersMetadata = { // Use 'username' property on account for issue filters supportedIssueFilters: [IssueFilter.Author, IssueFilter.Assignee], scopes: ['read_api', 'read_user', 'read_repository'], + usesPAT: true, }, [SelfHostedIntegrationId.GitLabSelfHosted]: { domain: '', @@ -267,6 +307,7 @@ export const providersMetadata: ProvidersMetadata = { // Use 'username' property on account for issue filters supportedIssueFilters: [IssueFilter.Author, IssueFilter.Assignee], scopes: ['read_api', 'read_user', 'read_repository'], + usesPAT: true, }, [HostingIntegrationId.Bitbucket]: { domain: 'bitbucket.org', @@ -275,6 +316,7 @@ export const providersMetadata: ProvidersMetadata = { // Use 'id' property on account for PR filters supportedPullRequestFilters: [PullRequestFilter.Author], scopes: ['account:read', 'repository:read', 'pullrequest:read', 'issue:read'], + usesPAT: true, }, [HostingIntegrationId.AzureDevOps]: { domain: 'dev.azure.com', @@ -286,11 +328,48 @@ export const providersMetadata: ProvidersMetadata = { // Use 'name' property on account for issue filters supportedIssueFilters: [IssueFilter.Author, IssueFilter.Assignee, IssueFilter.Mention], scopes: ['vso.code', 'vso.identity', 'vso.project', 'vso.profile', 'vso.work'], + usesPAT: true, }, [IssueIntegrationId.Jira]: { domain: 'atlassian.net', id: IssueIntegrationId.Jira, - scopes: [], + scopes: [ + 'read:status:jira', + 'read:application-role:jira', + 'write:attachment:jira', + 'read:comment:jira', + 'read:project-category:jira', + 'read:project:jira', + 'read:issue.vote:jira', + 'read:field-configuration:jira', + 'write:issue:jira', + 'read:issue-security-level:jira', + 'write:issue.property:jira', + 'read:issue.changelog:jira', + 'read:avatar:jira', + 'read:issue-meta:jira', + 'read:permission:jira', + 'offline_access', + 'read:issue:jira', + 'read:me', + 'read:audit-log:jira', + 'read:project.component:jira', + 'read:group:jira', + 'read:project-role:jira', + 'write:comment:jira', + 'read:label:jira', + 'write:comment.property:jira', + 'read:issue-details:jira', + 'read:issue-type-hierarchy:jira', + 'read:issue.transition:jira', + 'read:user:jira', + 'read:field:jira', + 'read:issue-type:jira', + 'read:project.property:jira', + 'read:comment.property:jira', + 'read:project-version:jira', + ], + supportedIssueFilters: [IssueFilter.Author, IssueFilter.Assignee, IssueFilter.Mention], }, [IssueIntegrationId.Trello]: { domain: 'trello.com', @@ -298,3 +377,102 @@ export const providersMetadata: ProvidersMetadata = { scopes: [], }, }; + +export function getReasonsForUserIssue(issue: ProviderIssue, userLogin: string): string[] { + const reasons: string[] = []; + let isAuthor = false; + let isAssignee = false; + if (issue.author?.username === userLogin || issue.author?.name === userLogin) { + reasons.push('authored'); + isAuthor = true; + } + if ( + issue.assignees != null && + issue.assignees.some(assignee => assignee.username === userLogin || assignee.name === userLogin) + ) { + reasons.push('assigned'); + isAssignee = true; + } + + // TODO: Impossible to denote all issues we are mentioned on given their properties. for now just + // assume we are mentioned on any of our issues we are not the author or assignee on + if (!isAuthor && !isAssignee) { + reasons.push('mentioned'); + } + + return reasons; +} + +export function toSearchedIssue( + issue: ProviderIssue, + provider: ProviderReference, + filterUsed?: IssueFilter, + userLogin?: string, +): SearchedIssue | undefined { + // TODO: Add some protections/baselines rather than killing the transformation here + if (issue.updatedDate == null || issue.author == null || issue.url == null) return undefined; + + return { + reasons: + filterUsed != null + ? [issueFilterToReason(filterUsed)] + : userLogin != null + ? getReasonsForUserIssue(issue, userLogin) + : [], + issue: { + type: 'issue', + provider: provider, + id: issue.id, + nodeId: undefined, + title: issue.title, + url: issue.url, + date: issue.createdDate, + closedDate: issue.closedDate ?? undefined, + closed: issue.closedDate != null, + state: issue.closedDate != null ? 'closed' : 'opened', + updatedDate: issue.updatedDate, + author: { + name: issue.author.name ?? '', + avatarUrl: issue.author.avatarUrl ?? undefined, + url: issue.author.url ?? undefined, + }, + assignees: + issue.assignees?.map(assignee => ({ + name: assignee.name ?? '', + avatarUrl: assignee.avatarUrl ?? undefined, + url: assignee.url ?? undefined, + })) ?? [], + repository: + issue.repository?.owner?.login != null + ? { + owner: issue.repository.owner.login, + repo: issue.repository.name, + } + : undefined, + labels: issue.labels.map(label => ({ color: label.color ?? undefined, name: label.name })), + commentsCount: issue.commentCount ?? undefined, + thumbsUpCount: issue.upvoteCount ?? undefined, + }, + }; +} + +export function issueFilterToReason(filter: IssueFilter): 'authored' | 'assigned' | 'mentioned' { + switch (filter) { + case IssueFilter.Author: + return 'authored'; + case IssueFilter.Assignee: + return 'assigned'; + case IssueFilter.Mention: + return 'mentioned'; + } +} + +export function toAccount(account: ProviderAccount, provider: ProviderReference): UserAccount { + return { + provider: provider, + name: account.name ?? undefined, + email: account.email ?? undefined, + avatarUrl: account.avatarUrl ?? undefined, + username: account.username ?? undefined, + }; +} diff --git a/src/plus/integrations/providers/providersApi.ts b/src/plus/integrations/providers/providersApi.ts index 2f8c07baa9dea..9754bbdeacd88 100644 --- a/src/plus/integrations/providers/providersApi.ts +++ b/src/plus/integrations/providers/providersApi.ts @@ -1,9 +1,15 @@ import ProviderApis from '@gitkraken/provider-apis'; import type { Container } from '../../../container'; +import { + AuthenticationError, + AuthenticationErrorReason, + ProviderRequestClientError, + ProviderRequestRateLimitError, +} from '../../../errors'; import type { PagedResult } from '../../../git/gitProvider'; import type { - getCurrentUserFn, - getCurrentUserForInstanceFn, + GetCurrentUserFn, + GetCurrentUserForInstanceFn, GetIssuesForAzureProjectFn, GetIssuesForRepoFn, GetIssuesForReposFn, @@ -15,10 +21,13 @@ import type { GetReposOptions, IntegrationId, IssueFilter, + PageInfo, PagingMode, ProviderAccount, ProviderInfo, ProviderIssue, + ProviderJiraProject, + ProviderJiraResource, ProviderPullRequest, ProviderRepoInput, ProviderReposInput, @@ -37,7 +46,7 @@ export class ProvidersApi { [HostingIntegrationId.GitHub]: { ...providersMetadata[HostingIntegrationId.GitHub], provider: providerApis.github, - getCurrentUserFn: providerApis.github.getCurrentUser.bind(providerApis.github) as getCurrentUserFn, + getCurrentUserFn: providerApis.github.getCurrentUser.bind(providerApis.github) as GetCurrentUserFn, getPullRequestsForReposFn: providerApis.github.getPullRequestsForRepos.bind( providerApis.github, ) as GetPullRequestsForReposFn, @@ -48,7 +57,7 @@ export class ProvidersApi { [SelfHostedIntegrationId.GitHubEnterprise]: { ...providersMetadata[SelfHostedIntegrationId.GitHubEnterprise], provider: providerApis.github, - getCurrentUserFn: providerApis.github.getCurrentUser.bind(providerApis.github) as getCurrentUserFn, + getCurrentUserFn: providerApis.github.getCurrentUser.bind(providerApis.github) as GetCurrentUserFn, getPullRequestsForReposFn: providerApis.github.getPullRequestsForRepos.bind( providerApis.github, ) as GetPullRequestsForReposFn, @@ -59,7 +68,7 @@ export class ProvidersApi { [HostingIntegrationId.GitLab]: { ...providersMetadata[HostingIntegrationId.GitLab], provider: providerApis.gitlab, - getCurrentUserFn: providerApis.gitlab.getCurrentUser.bind(providerApis.gitlab) as getCurrentUserFn, + getCurrentUserFn: providerApis.gitlab.getCurrentUser.bind(providerApis.gitlab) as GetCurrentUserFn, getPullRequestsForReposFn: providerApis.gitlab.getPullRequestsForRepos.bind( providerApis.gitlab, ) as GetPullRequestsForReposFn, @@ -76,7 +85,7 @@ export class ProvidersApi { [SelfHostedIntegrationId.GitLabSelfHosted]: { ...providersMetadata[SelfHostedIntegrationId.GitLabSelfHosted], provider: providerApis.gitlab, - getCurrentUserFn: providerApis.gitlab.getCurrentUser.bind(providerApis.gitlab) as getCurrentUserFn, + getCurrentUserFn: providerApis.gitlab.getCurrentUser.bind(providerApis.gitlab) as GetCurrentUserFn, getPullRequestsForReposFn: providerApis.gitlab.getPullRequestsForRepos.bind( providerApis.gitlab, ) as GetPullRequestsForReposFn, @@ -95,7 +104,7 @@ export class ProvidersApi { provider: providerApis.bitbucket, getCurrentUserFn: providerApis.bitbucket.getCurrentUser.bind( providerApis.bitbucket, - ) as getCurrentUserFn, + ) as GetCurrentUserFn, getPullRequestsForReposFn: providerApis.bitbucket.getPullRequestsForRepos.bind( providerApis.bitbucket, ) as GetPullRequestsForReposFn, @@ -108,7 +117,7 @@ export class ProvidersApi { provider: providerApis.azureDevOps, getCurrentUserForInstanceFn: providerApis.azureDevOps.getCurrentUserForInstance.bind( providerApis.azureDevOps, - ) as getCurrentUserForInstanceFn, + ) as GetCurrentUserForInstanceFn, getPullRequestsForReposFn: providerApis.azureDevOps.getPullRequestsForRepos.bind( providerApis.azureDevOps, ) as GetPullRequestsForReposFn, @@ -125,6 +134,15 @@ export class ProvidersApi { [IssueIntegrationId.Jira]: { ...providersMetadata[IssueIntegrationId.Jira], provider: providerApis.jira, + getCurrentUserForResourceFn: providerApis.jira.getCurrentUserForResource.bind(providerApis.jira), + getJiraResourcesForCurrentUserFn: providerApis.jira.getJiraResourcesForCurrentUser.bind( + providerApis.jira, + ), + getJiraProjectsForResourcesFn: providerApis.jira.getJiraProjectsForResources.bind(providerApis.jira), + getIssuesForProjectFn: providerApis.jira.getIssuesForProject.bind(providerApis.jira), + getIssuesForResourceForCurrentUserFn: providerApis.jira.getIssuesForResourceForCurrentUser.bind( + providerApis.jira, + ), }, [IssueIntegrationId.Trello]: { ...providersMetadata[IssueIntegrationId.Trello], @@ -171,7 +189,7 @@ export class ProvidersApi { ); } - async getProviderToken( + private async getProviderToken( provider: ProviderInfo, options?: { createSessionIfNeeded?: boolean }, ): Promise { @@ -190,28 +208,78 @@ export class ProvidersApi { } } - async getPullRequestsForRepos( + private async ensureProviderTokenAndFunction( providerId: IntegrationId, - reposOrIds: ProviderReposInput, - options?: GetPullRequestsOptions, - ): Promise> { + providerFn: keyof ProviderInfo, + accessToken?: string, + ): Promise<{ provider: ProviderInfo; token: string }> { const provider = this.providers[providerId]; if (provider == null) { throw new Error(`Provider with id ${providerId} not registered`); } - const token = await this.getProviderToken(provider); + const token = accessToken ?? (await this.getProviderToken(provider)); if (token == null) { throw new Error(`Not connected to provider ${providerId}`); } - if (provider.getPullRequestsForReposFn == null) { - throw new Error(`Provider with id ${providerId} does not support getting pull requests for repositories`); + if (provider[providerFn] == null) { + throw new Error(`Provider with id ${providerId} does not support function: ${providerFn}`); + } + + return { provider: provider, token: token }; + } + + private handleProviderError(providerId: IntegrationId, token: string, error: any): T { + const provider = this.providers[providerId]; + if (provider == null) { + throw new Error(`Provider with id ${providerId} not registered`); + } + + switch (providerId) { + case IssueIntegrationId.Jira: { + if (error?.response?.status != null) { + if (error.response.status === 401) { + throw new AuthenticationError(providerId, AuthenticationErrorReason.Forbidden, error); + } else if (error.response.status === 429) { + let resetAt: number | undefined; + + const reset = error.response.headers?.['x-ratelimit-reset']; + if (reset != null) { + resetAt = parseInt(reset, 10); + if (Number.isNaN(resetAt)) { + resetAt = undefined; + } + } + + throw new ProviderRequestRateLimitError(error, token, resetAt); + } else if (error.response.status >= 400 && error.response.status < 500) { + throw new ProviderRequestClientError(error); + } + } + throw error; + } + default: { + throw error; + } } + } + async getPagedResult( + provider: ProviderInfo, + args: any, + providerFn: + | (( + input: any, + options?: { token?: string; isPAT?: boolean }, + ) => Promise<{ data: NonNullable[]; pageInfo?: PageInfo }>) + | undefined, + token: string, + cursor: string = '{}', + ): Promise> { let cursorInfo; try { - cursorInfo = JSON.parse(options?.cursor ?? '{}'); + cursorInfo = JSON.parse(cursor); } catch { cursorInfo = {}; } @@ -225,12 +293,15 @@ export class ProvidersApi { } const input = { - ...(this.isRepoIdsInput(reposOrIds) ? { repoIds: reposOrIds } : { repos: reposOrIds }), - ...options, + ...args, ...cursorOrPage, }; - const result = await provider.getPullRequestsForReposFn(input, { token: token, isPAT: true }); + const result = await providerFn?.(input, { token: token, isPAT: provider.usesPAT }); + if (result == null) { + return { values: [] }; + } + const hasMore = result.pageInfo?.hasNextPage ?? false; let nextCursor = '{}'; @@ -249,363 +320,260 @@ export class ProvidersApi { }; } - async getPullRequestsForRepo( + async getPullRequestsForRepos( providerId: IntegrationId, - repo: ProviderRepoInput, - options?: GetPullRequestsOptions, + reposOrIds: ProviderReposInput, + options?: GetPullRequestsOptions & { accessToken?: string }, ): Promise> { - const provider = this.providers[providerId]; - if (provider == null) { - throw new Error(`Provider with id ${providerId} not registered`); - } - - const token = await this.getProviderToken(provider); - if (token == null) { - throw new Error(`Not connected to provider ${providerId}`); - } - - if (provider.getPullRequestsForRepoFn == null) { - throw new Error(`Provider with id ${providerId} does not support getting pull requests for a repository`); - } - - let cursorInfo; - try { - cursorInfo = JSON.parse(options?.cursor ?? '{}'); - } catch { - cursorInfo = {}; - } - const cursorValue = cursorInfo.value; - const cursorType = cursorInfo.type; - let cursorOrPage = {}; - if (cursorType === 'page') { - cursorOrPage = { page: cursorValue }; - } else if (cursorType === 'cursor') { - cursorOrPage = { cursor: cursorValue }; - } + const { provider, token } = await this.ensureProviderTokenAndFunction( + providerId, + 'getPullRequestsForReposFn', + options?.accessToken, + ); - const result = await provider.getPullRequestsForRepoFn( + return this.getPagedResult( + provider, { - repo: repo, + ...(this.isRepoIdsInput(reposOrIds) ? { repoIds: reposOrIds } : { repos: reposOrIds }), ...options, - ...cursorOrPage, }, - { token: token, isPAT: true }, + provider.getPullRequestsForReposFn, + token, + options?.cursor, ); - const hasMore = result.pageInfo?.hasNextPage ?? false; + } - let nextCursor = '{}'; - if (result.pageInfo?.endCursor != null) { - nextCursor = JSON.stringify({ value: result.pageInfo?.endCursor, type: 'cursor' }); - } else if (result.pageInfo?.nextPage != null) { - nextCursor = JSON.stringify({ value: result.pageInfo?.nextPage, type: 'page' }); - } + async getPullRequestsForRepo( + providerId: IntegrationId, + repo: ProviderRepoInput, + options?: GetPullRequestsOptions & { accessToken?: string }, + ): Promise> { + const { provider, token } = await this.ensureProviderTokenAndFunction( + providerId, + 'getPullRequestsForRepoFn', + options?.accessToken, + ); - return { - values: result.data, - paging: { - cursor: nextCursor, - more: hasMore, - }, - }; + return this.getPagedResult( + provider, + { repo: repo, ...options }, + provider.getPullRequestsForRepoFn, + token, + options?.cursor, + ); } async getIssuesForRepos( providerId: IntegrationId, reposOrIds: ProviderReposInput, - options?: GetIssuesOptions, + options?: GetIssuesOptions & { accessToken?: string }, ): Promise> { - const provider = this.providers[providerId]; - if (provider == null) { - throw new Error(`Provider with id ${providerId} not registered`); - } - - const token = await this.getProviderToken(provider); - if (token == null) { - throw new Error(`Not connected to provider ${providerId}`); - } - - if (provider.getIssuesForReposFn == null) { - throw new Error(`Provider with id ${providerId} does not support getting issues for repositories`); - } - - if (provider.id === HostingIntegrationId.AzureDevOps) { - throw new Error( - `Provider with id ${providerId} does not support getting issues for repositories; use getIssuesForAzureProject instead`, - ); - } - - let cursorInfo; - try { - cursorInfo = JSON.parse(options?.cursor ?? '{}'); - } catch { - cursorInfo = {}; - } - const cursorValue = cursorInfo.value; - const cursorType = cursorInfo.type; - let cursorOrPage = {}; - if (cursorType === 'page') { - cursorOrPage = { page: cursorValue }; - } else if (cursorType === 'cursor') { - cursorOrPage = { cursor: cursorValue }; - } - - const input = { - ...(this.isRepoIdsInput(reposOrIds) ? { repoIds: reposOrIds } : { repos: reposOrIds }), - ...options, - ...cursorOrPage, - }; - - const result = await provider.getIssuesForReposFn(input, { token: token, isPAT: true }); - const hasMore = result.pageInfo?.hasNextPage ?? false; - - let nextCursor = '{}'; - if (result.pageInfo?.endCursor != null) { - nextCursor = JSON.stringify({ value: result.pageInfo?.endCursor, type: 'cursor' }); - } else if (result.pageInfo?.nextPage != null) { - nextCursor = JSON.stringify({ value: result.pageInfo?.nextPage, type: 'page' }); - } + const { provider, token } = await this.ensureProviderTokenAndFunction( + providerId, + 'getIssuesForReposFn', + options?.accessToken, + ); - return { - values: result.data, - paging: { - cursor: nextCursor, - more: hasMore, + return this.getPagedResult( + provider, + { + ...(this.isRepoIdsInput(reposOrIds) ? { repoIds: reposOrIds } : { repos: reposOrIds }), + ...options, }, - }; + provider.getIssuesForReposFn, + token, + options?.cursor, + ); } async getIssuesForRepo( providerId: IntegrationId, repo: ProviderRepoInput, - options?: GetIssuesOptions, + options?: GetIssuesOptions & { accessToken?: string }, ): Promise> { - const provider = this.providers[providerId]; - if (provider == null) { - throw new Error(`Provider with id ${providerId} not registered`); - } - - const token = await this.getProviderToken(provider); - if (token == null) { - throw new Error(`Not connected to provider ${providerId}`); - } - - if (provider.getIssuesForRepoFn == null) { - throw new Error(`Provider with id ${providerId} does not support getting issues for a repository`); - } - - if (provider.id === HostingIntegrationId.AzureDevOps) { - throw new Error( - `Provider with id ${providerId} does not support getting issues for a repository; use getIssuesForAzureProject instead`, - ); - } - - let cursorInfo; - try { - cursorInfo = JSON.parse(options?.cursor ?? '{}'); - } catch { - cursorInfo = {}; - } - const cursorValue = cursorInfo.value; - const cursorType = cursorInfo.type; - let cursorOrPage = {}; - if (cursorType === 'page') { - cursorOrPage = { page: cursorValue }; - } else if (cursorType === 'cursor') { - cursorOrPage = { cursor: cursorValue }; - } - - const result = await provider.getIssuesForRepoFn( - { - repo: repo, - ...options, - ...cursorOrPage, - }, - { token: token, isPAT: true }, + const { provider, token } = await this.ensureProviderTokenAndFunction( + providerId, + 'getIssuesForRepoFn', + options?.accessToken, ); - const hasMore = result.pageInfo?.hasNextPage ?? false; - - let nextCursor = '{}'; - if (result.pageInfo?.endCursor != null) { - nextCursor = JSON.stringify({ value: result.pageInfo?.endCursor, type: 'cursor' }); - } else if (result.pageInfo?.nextPage != null) { - nextCursor = JSON.stringify({ value: result.pageInfo?.nextPage, type: 'page' }); - } - - return { - values: result.data, - paging: { - cursor: nextCursor, - more: hasMore, - }, - }; + return this.getPagedResult( + provider, + { repo: repo, ...options }, + provider.getIssuesForRepoFn, + token, + options?.cursor, + ); } async getIssuesForAzureProject( namespace: string, project: string, - options?: GetIssuesOptions, + options?: GetIssuesOptions & { accessToken?: string }, ): Promise> { - const provider = this.providers[HostingIntegrationId.AzureDevOps]; - if (provider == null) { - throw new Error(`Provider with id ${HostingIntegrationId.AzureDevOps} not registered`); - } + const { provider, token } = await this.ensureProviderTokenAndFunction( + HostingIntegrationId.AzureDevOps, + 'getIssuesForAzureProjectFn', + options?.accessToken, + ); - const token = await this.getProviderToken(provider); - if (token == null) { - throw new Error(`Not connected to provider ${HostingIntegrationId.AzureDevOps}`); - } + return this.getPagedResult( + provider, + { namespace: namespace, project: project, ...options }, + provider.getIssuesForAzureProjectFn, + token, + options?.cursor, + ); + } - if (provider.getIssuesForAzureProjectFn == null) { - throw new Error( - `Provider with id ${HostingIntegrationId.AzureDevOps} does not support getting issues for an Azure project`, - ); - } + async getReposForAzureProject( + namespace: string, + project: string, + options?: GetReposOptions & { accessToken?: string }, + ): Promise> { + const { provider, token } = await this.ensureProviderTokenAndFunction( + HostingIntegrationId.AzureDevOps, + 'getReposForAzureProjectFn', + options?.accessToken, + ); - let cursorInfo; - try { - cursorInfo = JSON.parse(options?.cursor ?? '{}'); - } catch { - cursorInfo = {}; - } - const cursorValue = cursorInfo.value; - const cursorType = cursorInfo.type; - let cursorOrPage = {}; - if (cursorType === 'page') { - cursorOrPage = { page: cursorValue }; - } else if (cursorType === 'cursor') { - cursorOrPage = { cursor: cursorValue }; - } + return this.getPagedResult( + provider, + { namespace: namespace, project: project, ...options }, + provider.getReposForAzureProjectFn, + token, + options?.cursor, + ); + } - const result = await provider.getIssuesForAzureProjectFn( - { - namespace: namespace, - project: project, - ...options, - ...cursorOrPage, - }, - { token: token, isPAT: true }, + async getCurrentUser( + providerId: IntegrationId, + options?: { accessToken?: string }, + ): Promise { + const { provider, token } = await this.ensureProviderTokenAndFunction( + providerId, + 'getCurrentUserFn', + options?.accessToken, ); - const hasMore = result.pageInfo?.hasNextPage ?? false; + return (await provider.getCurrentUserFn?.({ token: token, isPAT: provider.usesPAT }))?.data; + } - let nextCursor = '{}'; - if (result.pageInfo?.endCursor != null) { - nextCursor = JSON.stringify({ value: result.pageInfo?.endCursor, type: 'cursor' }); - } else if (result.pageInfo?.nextPage != null) { - nextCursor = JSON.stringify({ value: result.pageInfo?.nextPage, type: 'page' }); - } + async getCurrentUserForInstance( + providerId: IntegrationId, + namespace: string, + options?: { accessToken?: string }, + ): Promise { + const { provider, token } = await this.ensureProviderTokenAndFunction( + providerId, + 'getCurrentUserForInstanceFn', + options?.accessToken, + ); - return { - values: result.data, - paging: { - cursor: nextCursor, - more: hasMore, - }, - }; + return ( + await provider.getCurrentUserForInstanceFn?.( + { namespace: namespace }, + { token: token, isPAT: provider.usesPAT }, + ) + )?.data; } - async getReposForAzureProject( - namespace: string, - project: string, - options?: GetReposOptions, - ): Promise> { - const provider = this.providers[HostingIntegrationId.AzureDevOps]; - if (provider == null) { - throw new Error(`Provider with id ${HostingIntegrationId.AzureDevOps} not registered`); - } + async getCurrentUserForResource( + providerId: IntegrationId, + resourceId: string, + options?: { accessToken?: string }, + ): Promise { + const { provider, token } = await this.ensureProviderTokenAndFunction( + providerId, + 'getCurrentUserForResourceFn', + options?.accessToken, + ); - const token = await this.getProviderToken(provider); - if (token == null) { - throw new Error(`Not connected to provider ${HostingIntegrationId.AzureDevOps}`); + try { + return (await provider.getCurrentUserForResourceFn?.({ resourceId: resourceId }, { token: token }))?.data; + } catch (e) { + return this.handleProviderError(providerId, token, e); } + } - if (provider.getReposForAzureProjectFn == null) { - throw new Error( - `Provider with id ${HostingIntegrationId.AzureDevOps} does not support getting repositories for Azure projects`, - ); - } + async getJiraResourcesForCurrentUser(options?: { + accessToken?: string; + }): Promise { + const { provider, token } = await this.ensureProviderTokenAndFunction( + IssueIntegrationId.Jira, + 'getJiraResourcesForCurrentUserFn', + options?.accessToken, + ); - let cursorInfo; try { - cursorInfo = JSON.parse(options?.cursor ?? '{}'); - } catch { - cursorInfo = {}; - } - const cursorValue = cursorInfo.value; - const cursorType = cursorInfo.type; - let cursorOrPage = {}; - if (cursorType === 'page') { - cursorOrPage = { page: cursorValue }; - } else if (cursorType === 'cursor') { - cursorOrPage = { cursor: cursorValue }; + return (await provider.getJiraResourcesForCurrentUserFn?.({ token: token }))?.data; + } catch (e) { + return this.handleProviderError(IssueIntegrationId.Jira, token, e); } + } - const result = await provider.getReposForAzureProjectFn( - { - namespace: namespace, - project: project, - ...cursorOrPage, - }, - { token: token, isPAT: true }, + async getJiraProjectsForResources( + resourceIds: string[], + options?: { accessToken?: string }, + ): Promise { + const { provider, token } = await this.ensureProviderTokenAndFunction( + IssueIntegrationId.Jira, + 'getJiraProjectsForResourcesFn', + options?.accessToken, ); - const hasMore = result.pageInfo?.hasNextPage ?? false; - - let nextCursor = '{}'; - if (result.pageInfo?.endCursor != null) { - nextCursor = JSON.stringify({ value: result.pageInfo?.endCursor, type: 'cursor' }); - } else if (result.pageInfo?.nextPage != null) { - nextCursor = JSON.stringify({ value: result.pageInfo?.nextPage, type: 'page' }); + try { + return (await provider.getJiraProjectsForResourcesFn?.({ resourceIds: resourceIds }, { token: token })) + ?.data; + } catch (e) { + return this.handleProviderError(IssueIntegrationId.Jira, token, e); } - - return { - values: result.data, - paging: { - cursor: nextCursor, - more: hasMore, - }, - }; } - async getCurrentUser(providerId: IntegrationId): Promise { - const provider = this.providers[providerId]; - if (provider == null) { - throw new Error(`Provider with id ${providerId} not registered`); - } + async getIssuesForProject( + providerId: IntegrationId, + project: string, + resourceId: string, + options?: GetIssuesOptions & { accessToken?: string }, + ): Promise { + const { provider, token } = await this.ensureProviderTokenAndFunction( + providerId, + 'getIssuesForProjectFn', + options?.accessToken, + ); - const token = await this.getProviderToken(provider); - if (token == null) { - throw new Error(`Not connected to provider ${providerId}`); - } + try { + const result = await provider.getIssuesForProjectFn?.( + { project: project, resourceId: resourceId, ...options }, + { token: token }, + ); - if (provider.getCurrentUserFn == null) { - throw new Error(`Provider with id ${providerId} does not support getting current user`); + return result?.data; + } catch (e) { + return this.handleProviderError(providerId, token, e); } - - const { data: account } = await provider.getCurrentUserFn({ token: token, isPAT: true }); - return account; } - async getCurrentUserForInstance(providerId: IntegrationId, namespace: string): Promise { - const provider = this.providers[providerId]; - if (provider == null) { - throw new Error(`Provider with id ${providerId} not registered`); - } + async getIssuesForResourceForCurrentUser( + providerId: IntegrationId, + resourceId: string, + options?: { accessToken?: string }, + ): Promise { + const { provider, token } = await this.ensureProviderTokenAndFunction( + providerId, + 'getIssuesForResourceForCurrentUserFn', + options?.accessToken, + ); - const token = await this.getProviderToken(provider); - if (token == null) { - throw new Error(`Not connected to provider ${providerId}`); - } + try { + const result = await provider.getIssuesForResourceForCurrentUserFn?.( + { resourceId: resourceId }, + { token: token }, + ); - if (provider.getCurrentUserForInstanceFn == null) { - throw new Error(`Provider with id ${providerId} does not support getting current user for an instance`); + return result?.data; + } catch (e) { + return this.handleProviderError(providerId, token, e); } - - const { data: account } = await provider.getCurrentUserForInstanceFn( - { namespace: namespace }, - { token: token, isPAT: true }, - ); - return account; } } diff --git a/src/webviews/apps/plus/focus/components/gk-issue-row.ts b/src/webviews/apps/plus/focus/components/gk-issue-row.ts index 34ff13ec67f03..b3ed3f0c96ba0 100644 --- a/src/webviews/apps/plus/focus/components/gk-issue-row.ts +++ b/src/webviews/apps/plus/focus/components/gk-issue-row.ts @@ -145,7 +145,7 @@ export class GkIssueRow extends LitElement {
    - ${this.issue.repository.repo} + ${this.issue.repository?.repo}

    This enables access to Pull Requests and Issues as well as provide additional information - inside hovers and the Commit Details view, such as auto-linked issues and pull requests and + inside hovers and the Inspect view, such as auto-linked issues and pull requests and avatars.

    {
    - Invite + Invite
    ${this.renderUserSelectionList()}
    - this.onDebounceTitleInput(e)}> + this.onDebounceTitleInput(e)} + />
    - +

    - this.onDebouncedCreateAll(e)}>Create Cloud Patch + this.onDebouncedCreateAll(e)} + >Create Cloud Patch

    ${when( @@ -280,7 +299,7 @@ export class GlPatchCreate extends GlTreeBase {

    `, )}

    - `; + `; } // * { + pointer-events: none; + } + + &:focus { + outline: 1px solid var(--vscode-focusBorder); + outline-offset: -1px; + } + + &:hover { + color: var(--vscode-foreground); + text-decoration: none; + + .vscode-dark & { + background-color: var(--color-background--lighten-15); + } + .vscode-light & { + background-color: var(--color-background--darken-15); + } + } + + &.is-active { + .vscode-dark & { + background-color: var(--color-background--lighten-10); + } + .vscode-light & { + background-color: var(--color-background--darken-10); + } + } + + &.is-disabled { + opacity: 0.5; + pointer-events: none; + } + + &.is-hidden { + display: none; + } +} + +.top-details { + position: sticky; + top: 0; + z-index: 1; + padding: { + top: 0.1rem; + left: var(--gitlens-gutter-width); + right: var(--gitlens-scrollbar-gutter-width); + bottom: 0.5rem; + } + background-color: var(--vscode-sideBar-background); + + &__actionbar { + display: flex; + flex-direction: row; + flex-wrap: wrap; + align-items: center; + justify-content: space-between; + + &-group { + display: flex; + flex: none; + flex-direction: row; + max-width: 100%; + } + + &--highlight { + padding: 0 4px 2px 4px; + border: 1px solid var(--color-background--level-15); + border-radius: 0.3rem; + font-family: var(--vscode-editor-font-family); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + &.is-pinned { + background-color: var(--color-alert-warningBackground); + box-shadow: 0 0 0 0.1rem var(--color-alert-warningBorder); + border-radius: 0.3rem; + + .commit-action:hover, + .commit-action.is-active { + background-color: var(--color-alert-warningHoverBackground); + } + } + } + + &__sha { + margin: 0 0.5rem 0 0.25rem; + } + + &__authors { + flex-basis: 100%; + padding-top: 0.5rem; + } + + &__author { + & + & { + margin-top: 0.5rem; + } + } +} + .title { font-size: 1.6rem; font-weight: 600; @@ -62,6 +177,10 @@ gk-menu-item { } } +.change-list { + margin-bottom: 1rem; +} + // TODO: these form styles should be moved to a common location .message-input { padding-top: 0.8rem; diff --git a/src/webviews/apps/settings/partials/commit-graph.html b/src/webviews/apps/settings/partials/commit-graph.html index 7b284c3bf7a9e..8612a41297036 100644 --- a/src/webviews/apps/settings/partials/commit-graph.html +++ b/src/webviews/apps/settings/partials/commit-graph.html @@ -112,7 +112,7 @@

    value="selection" data-setting /> - +
    - +

    diff --git a/src/webviews/apps/settings/partials/views.commitDetails.html b/src/webviews/apps/settings/partials/views.commitDetails.html index ddc0283c59b9f..d42a28f934163 100644 --- a/src/webviews/apps/settings/partials/views.commitDetails.html +++ b/src/webviews/apps/settings/partials/views.commitDetails.html @@ -1,7 +1,7 @@

    - Commit Details view + Inspect view class="command command--show-view" title="Show View in Side Bar" href="command:gitlens.showCommitDetailsView" - >Commit Details viewInspect view to see rich details for a commit

    diff --git a/src/webviews/apps/settings/settings.html b/src/webviews/apps/settings/settings.html index 412227a08f4ae..e87898702f446 100644 --- a/src/webviews/apps/settings/settings.html +++ b/src/webviews/apps/settings/settings.html @@ -212,8 +212,8 @@

    Jump to

    class="sidebar__jump-link" data-action="jump" href="#commit-details-view" - title="Jump to Commit Details view settings" - >Commit Details viewInspect view
  • diff --git a/src/webviews/apps/shared/components/code-icon.ts b/src/webviews/apps/shared/components/code-icon.ts index 796c4844166f7..ca8a36187423a 100644 --- a/src/webviews/apps/shared/components/code-icon.ts +++ b/src/webviews/apps/shared/components/code-icon.ts @@ -1696,6 +1696,12 @@ export class CodeIcon extends LitElement { :host([icon='gl-cloud-patch-share']):before { content: '\\f129'; } + :host([icon='gl-inspect']):before { + content: '\\f12a'; + } + :host([icon='gl-repository-filled']):before { + content: '\\f12b'; + } @keyframes codicon-spin { 100% { diff --git a/src/webviews/apps/shared/components/commit/commit-identity.ts b/src/webviews/apps/shared/components/commit/commit-identity.ts index a3899c306ee69..d8d4af78b561f 100644 --- a/src/webviews/apps/shared/components/commit/commit-identity.ts +++ b/src/webviews/apps/shared/components/commit/commit-identity.ts @@ -1,5 +1,6 @@ import { css, html, LitElement } from 'lit'; import { customElement, property } from 'lit/decorators.js'; +import { when } from 'lit/directives/when.js'; import { dateConverter } from '../converters/date-converter'; import '../code-icon'; import '../formatted-date'; @@ -8,9 +9,10 @@ import '../formatted-date'; export class CommitIdentity extends LitElement { static override styles = css` :host { - display: grid; - gap: 0rem 1rem; - justify-content: start; + display: flex; + flex-direction: row; + align-items: center; + gap: 0 0.6rem; } a { @@ -19,27 +21,28 @@ export class CommitIdentity extends LitElement { } .avatar { - grid-column: 1; - grid-row: 1 / 3; - width: 36px; + width: 1.8rem; } .thumb { width: 100%; height: auto; + vertical-align: middle; border-radius: 0.4rem; } .name { - grid-column: 2; - grid-row: 1; - font-size: 1.5rem; + flex: 1; + font-size: 1.3rem; + white-space: nowrap; + text-overflow: ellipsis; } .date { - grid-column: 2; - grid-row: 2; + flex: none; + margin-inline-start: auto; font-size: 1.3rem; + color: var(--color-foreground--50); } `; @@ -47,7 +50,7 @@ export class CommitIdentity extends LitElement { name = ''; @property() - email = ''; + url?: string; @property({ converter: dateConverter(), reflect: true }) date: Date | undefined; @@ -55,7 +58,7 @@ export class CommitIdentity extends LitElement { @property() avatarUrl = 'https://www.gravatar.com/avatar/?s=64&d=robohash'; - @property({ type: Boolean }) + @property({ type: Boolean, attribute: 'show-avatar', reflect: true }) showAvatar = false; @property() @@ -68,17 +71,26 @@ export class CommitIdentity extends LitElement { committer = false; @property() - actionLabel = 'committed'; + actionLabel?: string; + + private renderAvatar() { + if (this.showAvatar && this.avatarUrl != null && this.avatarUrl.length > 0) { + return html`${this.name}`; + } + return html``; + } override render() { - const showAvatar = this.showAvatar && this.avatarUrl != null && this.avatarUrl.length > 0; return html` - - ${showAvatar - ? html`${this.name}` - : html``} - - ${this.name} + ${when( + this.url != null, + () => + html`${this.renderAvatar()}${this.name}`, + () => + html`${this.renderAvatar()}${this.name}`, + )} ${this.actionLabel} ${when( + this.behind > 0, + () => html`${this.behind}`, + )}${when( + this.ahead > 0, + () => html`${this.ahead}`, + )}`; + } +} diff --git a/src/webviews/apps/shared/glicons.scss b/src/webviews/apps/shared/glicons.scss index 3051ce6c30100..0034a119749a6 100644 --- a/src/webviews/apps/shared/glicons.scss +++ b/src/webviews/apps/shared/glicons.scss @@ -6,7 +6,7 @@ Must be placed at the end of body in the HTML file of any webview that needs it @font-face { font-family: 'glicons'; font-display: block; - src: url("#{root}/dist/glicons.woff2?2cb9f62ddac44d3fc393ade4471fe802") format("woff2"); + src: url("#{root}/dist/glicons.woff2?07f033418f6676c7f48b3222efcedda3") format("woff2"); } */ @@ -188,3 +188,9 @@ Must be placed at the end of body in the HTML file of any webview that needs it .glicon-cloud-patch-share:before { content: '\f129'; } +.glicon-inspect:before { + content: '\f12a'; +} +.glicon-repository-filled:before { + content: '\f12b'; +} diff --git a/src/webviews/apps/shared/styles/details-base.scss b/src/webviews/apps/shared/styles/details-base.scss index 3d99b016ac99f..f111977150478 100644 --- a/src/webviews/apps/shared/styles/details-base.scss +++ b/src/webviews/apps/shared/styles/details-base.scss @@ -159,13 +159,6 @@ ul { } } -.section--message { - padding: { - top: 1rem; - bottom: 1.75rem; - } -} - .section--empty { > :last-child { margin-top: 0.5rem; @@ -179,65 +172,6 @@ ul { } } -.commit-action { - display: inline-flex; - justify-content: center; - align-items: center; - height: 21px; - border-radius: 0.25em; - color: inherit; - padding: 0.2rem; - vertical-align: text-bottom; - text-decoration: none; - - > * { - pointer-events: none; - } - - &:focus { - outline: 1px solid var(--vscode-focusBorder); - outline-offset: -1px; - } - - &:hover { - color: var(--vscode-foreground); - text-decoration: none; - - .vscode-dark & { - background-color: var(--color-background--lighten-15); - } - .vscode-light & { - background-color: var(--color-background--darken-15); - } - } - - &.is-active { - .vscode-dark & { - background-color: var(--color-background--lighten-10); - } - .vscode-light & { - background-color: var(--color-background--darken-10); - } - } - - &.is-disabled { - opacity: 0.5; - pointer-events: none; - } - - &.is-hidden { - display: none; - } - - &--emphasis-low:not(:hover, :focus, :active) { - opacity: 0.5; - } -} - -.change-list { - margin-bottom: 1rem; -} - .message-block { font-size: 1.3rem; border: 1px solid var(--vscode-input-border); @@ -263,70 +197,6 @@ ul { } } -.top-details { - position: sticky; - top: 0; - z-index: 1; - padding: { - top: 0.1rem; - left: var(--gitlens-gutter-width); - right: var(--gitlens-scrollbar-gutter-width); - bottom: 0.5rem; - } - background-color: var(--vscode-sideBar-background); - - &__actionbar { - display: flex; - flex-direction: row; - flex-wrap: wrap; - align-items: center; - justify-content: space-between; - - &-group { - display: flex; - flex: none; - } - - &--highlight { - margin-left: 0.25em; - padding: 0 4px 2px 4px; - border: 1px solid var(--color-background--level-15); - border-radius: 0.3rem; - font-family: var(--vscode-editor-font-family); - } - - &.is-pinned { - background-color: var(--color-alert-warningBackground); - box-shadow: 0 0 0 0.1rem var(--color-alert-warningBorder); - border-radius: 0.3rem; - - .commit-action:hover, - .commit-action.is-active { - background-color: var(--color-alert-warningHoverBackground); - } - } - } - - &__sha { - margin: 0 0.5rem 0 0.25rem; - } - - &__authors { - flex-basis: 100%; - padding-top: 0.5rem; - } - - &__author { - & + & { - margin-top: 0.5rem; - } - } -} - -.issue > :not(:first-child) { - margin-top: 0.5rem; -} - .commit-detail-panel { max-height: 100vh; overflow: auto; @@ -370,42 +240,3 @@ ul { } } } - -.details-tab { - display: flex; - justify-content: stretch; - align-items: center; - margin-bottom: 0.4rem; - gap: 0.2rem; - - & > * { - flex: 1; - } - - &__item { - appearance: none; - padding: 0.4rem; - color: var(--color-foreground--85); - background-color: transparent; - border: none; - border-bottom: 0.2rem solid transparent; - cursor: pointer; - // background-color: #00000030; - line-height: 1.8rem; - - gk-badge { - line-height: 1.2; - } - - &:hover { - color: var(--color-foreground); - // background-color: var(--vscode-button-hoverBackground); - background-color: #00000020; - } - - &.is-active { - color: var(--color-foreground); - border-bottom-color: var(--vscode-button-hoverBackground); - } - } -} diff --git a/src/webviews/apps/welcome/components/svg-focus.ts b/src/webviews/apps/welcome/components/svg-focus.ts index c55a7093cc79f..222f20358e7e2 100644 --- a/src/webviews/apps/welcome/components/svg-focus.ts +++ b/src/webviews/apps/welcome/components/svg-focus.ts @@ -164,7 +164,7 @@ export class BlameSvg extends LitElement { 2mo - Labs: add AI explain panel to Commit Details + Labs: add AI explain panel to Inspect #2628 diff --git a/src/webviews/apps/welcome/welcome.html b/src/webviews/apps/welcome/welcome.html index 66006903a0891..83c94c42e9843 100644 --- a/src/webviews/apps/welcome/welcome.html +++ b/src/webviews/apps/welcome/welcome.html @@ -193,9 +193,9 @@

    Side Bar Views

    Commit DetailsInspect GitKraken Labs

    • Explain Commit (AI)
    Use the Explain panel on the -     Commit Details viewInspect view to leverage AI to help you understand the changes introduced by a commit.

    @@ -548,9 +545,9 @@

    Popular views

    Commit DetailsInspect this.createPatchFromWip(params)); break; + case FetchCommandType.method: + onIpc(FetchCommandType, e, () => this.fetch()); + break; + case PublishCommandType.method: + onIpc(PublishCommandType, e, () => this.publish()); + break; + case PushCommandType.method: + onIpc(PushCommandType, e, () => this.push()); + break; + case PullCommandType.method: + onIpc(PullCommandType, e, () => this.pull()); + break; + case SwitchCommandType.method: + onIpc(SwitchCommandType, e, () => this.switch()); + break; } } + private getRepoActionPath() { + if (this._context.mode === 'wip') { + return this._context.wip?.repo.path; + } + return this._context.commit?.repoPath; + } + + private fetch() { + const path = this.getRepoActionPath(); + if (path == null) return; + void RepoActions.fetch(path); + } + + private publish() { + const path = this.getRepoActionPath(); + if (path == null) return; + void executeCoreGitCommand('git.publish', Uri.file(path)); + } + + private push() { + const path = this.getRepoActionPath(); + if (path == null) return; + void RepoActions.push(path); + } + + private pull() { + const path = this.getRepoActionPath(); + if (path == null) return; + void RepoActions.pull(path); + } + + private switch() { + const path = this.getRepoActionPath(); + if (path == null) return; + void RepoActions.switchTo(path); + } + onRefresh(_force?: boolean | undefined): void { if (this._pinned) return; @@ -562,6 +629,27 @@ export class CommitDetailsWebviewProvider } else { void this.updateWipState(repository ?? this.container.git.getBestRepositoryOrFirst()); } + + this.updateTitle(); + } + + private updateTitle() { + if (this.mode === 'commit') { + if (this._context.commit == null) { + this.host.title = this.host.originalTitle; + } else { + let following = 'Commit'; + if (this._context.commit.refType === 'stash') { + following = 'Stash'; + } else if (this._context.commit.isUncommitted) { + following = 'Uncommitted'; + } + + this.host.title = `${this.host.originalTitle}: ${following}`; + } + } else { + this.host.title = `${this.host.originalTitle}: Repo Status`; + } } private async explainCommit(completionId?: string) { @@ -624,7 +712,7 @@ export class CommitDetailsWebviewProvider includeRichContent: current.richStateLoaded, autolinkedIssues: current.autolinkedIssues?.map(serializeIssueOrPullRequest), pullRequest: current.pullRequest != null ? serializePullRequest(current.pullRequest) : undefined, - wip: current.wip, + wip: serializeWipContext(current.wip), orgSettings: current.orgSettings, }); return state; @@ -640,7 +728,7 @@ export class CommitDetailsWebviewProvider } } - let wip: Wip | undefined = undefined; + let wip: WipContext | undefined = undefined; if (repository != null) { if (this._wipSubscription == null) { @@ -648,10 +736,24 @@ export class CommitDetailsWebviewProvider } const changes = await this.getWipChange(repository); - wip = { changes: changes, repositoryCount: this.container.git.openRepositoryCount }; + wip = { + changes: changes, + repo: repository, + repositoryCount: this.container.git.openRepositoryCount, + }; + + if (changes != null) { + const branchDetails = await this.getWipBranchDetails(repository, changes.branchName); + if (branchDetails != null) { + wip.branch = branchDetails.branch; + wip.pullRequest = branchDetails.pullRequest; + } + } if (this._pendingContext == null) { - const success = await this.host.notify(DidChangeWipStateNotificationType, { wip: wip }); + const success = await this.host.notify(DidChangeWipStateNotificationType, { + wip: serializeWipContext(wip), + } as DidChangeWipStateParams); if (success) { this._context.wip = wip; return; @@ -663,6 +765,19 @@ export class CommitDetailsWebviewProvider this.updateState(true); } + private async getWipBranchDetails( + repository: Repository, + branchName: string, + ): Promise<{ branch: GitBranch; pullRequest: PullRequest | undefined } | undefined> { + const branch = await repository.getBranch(branchName); + if (branch == null) return undefined; + + return { + branch: branch, + pullRequest: await branch.getAssociatedPullRequest(), + }; + } + @debug({ args: false }) private async updateRichState(current: Context, cancellation: CancellationToken): Promise { const { commit } = current; @@ -787,6 +902,7 @@ export class CommitDetailsWebviewProvider this.updateNavigation(); } this.updateState(options?.immediate ?? true); + this.updateTitle(); } private subscribeToRepositoryWip(repo: Repository) { @@ -1194,3 +1310,33 @@ export class CommitDetailsWebviewProvider // avatar: (await commit.getAvatarUri())?.toString(true), // }; // } + +function serializeBranch(branch?: GitBranch): GitBranchShape | undefined { + if (branch == null) return undefined; + + return { + name: branch.name, + repoPath: branch.repoPath, + upstream: branch.upstream, + tracking: { + ahead: branch.state.ahead, + behind: branch.state.behind, + }, + }; +} + +function serializeWipContext(wip?: WipContext): Wip | undefined { + if (wip == null) return undefined; + + return { + changes: wip.changes, + repositoryCount: wip.repositoryCount, + branch: serializeBranch(wip.branch), + repo: { + name: wip.repo.name, + path: wip.repo.path, + // type: wip.repo.provider.name, + }, + pullRequest: wip.pullRequest != null ? serializePullRequest(wip.pullRequest) : undefined, + }; +} diff --git a/src/webviews/commitDetails/protocol.ts b/src/webviews/commitDetails/protocol.ts index 1133063b4fd55..a19035d749ada 100644 --- a/src/webviews/commitDetails/protocol.ts +++ b/src/webviews/commitDetails/protocol.ts @@ -51,9 +51,25 @@ export interface WipChange { export type Mode = 'commit' | 'wip'; +export interface GitBranchShape { + name: string; + repoPath: string; + upstream?: { name: string; missing: boolean }; + tracking?: { + ahead: number; + behind: number; + }; +} + export interface Wip { changes: WipChange | undefined; repositoryCount: number; + branch?: GitBranchShape; + pullRequest?: PullRequestShape; + repo: { + name: string; + path: string; + }; } export interface State extends WebviewState { @@ -132,6 +148,12 @@ export interface CreatePatchFromWipParams { } export const CreatePatchFromWipCommandType = new IpcCommandType('commit/wip/createPatch'); +export const FetchCommandType = new IpcCommandType('commit/fetch'); +export const PublishCommandType = new IpcCommandType('commit/publish'); +export const PushCommandType = new IpcCommandType('commit/push'); +export const PullCommandType = new IpcCommandType('commit/pull'); +export const SwitchCommandType = new IpcCommandType('commit/switch'); + // NOTIFICATIONS export interface DidChangeParams { diff --git a/src/webviews/commitDetails/registration.ts b/src/webviews/commitDetails/registration.ts index dc677e67a3f70..e865c586ceb3d 100644 --- a/src/webviews/commitDetails/registration.ts +++ b/src/webviews/commitDetails/registration.ts @@ -10,7 +10,7 @@ export function registerCommitDetailsWebviewView(controller: WebviewsController) { id: 'gitlens.views.commitDetails', fileName: 'commitDetails.html', - title: 'Commit Details', + title: 'Inspect', contextKeyPrefix: `gitlens:webviewView:commitDetails`, trackingFeature: 'commitDetailsView', plusFeature: false, @@ -32,7 +32,7 @@ export function registerGraphDetailsWebviewView(controller: WebviewsController) { id: 'gitlens.views.graphDetails', fileName: 'commitDetails.html', - title: 'Commit Graph Details', + title: 'Commit Graph Inspect', contextKeyPrefix: `gitlens:webviewView:graphDetails`, trackingFeature: 'graphDetailsView', plusFeature: false, diff --git a/walkthroughs/welcome/workspaces-focus.svg b/walkthroughs/welcome/workspaces-focus.svg index 845e542556c33..4d488e33df9f2 100644 --- a/walkthroughs/welcome/workspaces-focus.svg +++ b/walkthroughs/welcome/workspaces-focus.svg @@ -85,7 +85,7 @@ 2mo - Labs: add AI explain panel to Commit Details + Labs: add AI explain panel to Inspect #2628 From 4b715f799d733970488a294baae8343cb6579472 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Fri, 22 Mar 2024 11:24:32 -0400 Subject: [PATCH 0617/1012] Fixes date serialization on WIP state --- src/webviews/commitDetails/commitDetailsWebview.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/webviews/commitDetails/commitDetailsWebview.ts b/src/webviews/commitDetails/commitDetailsWebview.ts index eae61fef424b0..36b1339b29a3a 100644 --- a/src/webviews/commitDetails/commitDetailsWebview.ts +++ b/src/webviews/commitDetails/commitDetailsWebview.ts @@ -751,9 +751,12 @@ export class CommitDetailsWebviewProvider } if (this._pendingContext == null) { - const success = await this.host.notify(DidChangeWipStateNotificationType, { - wip: serializeWipContext(wip), - } as DidChangeWipStateParams); + const success = await this.host.notify( + DidChangeWipStateNotificationType, + serialize({ + wip: serializeWipContext(wip), + }) as DidChangeWipStateParams, + ); if (success) { this._context.wip = wip; return; From 92ab45fa2cac5dc000154dee85947c1386c9426f Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Fri, 22 Mar 2024 12:07:41 -0400 Subject: [PATCH 0618/1012] Fixes perf issue for WIP when active line changes --- src/webviews/commitDetails/commitDetailsWebview.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/webviews/commitDetails/commitDetailsWebview.ts b/src/webviews/commitDetails/commitDetailsWebview.ts index 36b1339b29a3a..83687dd8b4f7a 100644 --- a/src/webviews/commitDetails/commitDetailsWebview.ts +++ b/src/webviews/commitDetails/commitDetailsWebview.ts @@ -603,7 +603,7 @@ export class CommitDetailsWebviewProvider if (this.mode === 'wip') { const repo = this.container.git.getBestRepositoryOrFirst(e.editor); - void this.updateWipState(repo); + void this.updateWipState(repo, true); return; } @@ -719,12 +719,14 @@ export class CommitDetailsWebviewProvider } @debug({ args: false }) - private async updateWipState(repository: Repository | undefined): Promise { + private async updateWipState(repository: Repository | undefined, onlyOnRepoChange = false): Promise { if (this._wipSubscription != null) { const { repo, subscription } = this._wipSubscription; if (repository?.path !== repo.path) { subscription.dispose(); this._wipSubscription = undefined; + } else if (onlyOnRepoChange) { + return; } } From 30c43986d9ac91bcfd5ddb80a12b43c48330ddb5 Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Mon, 25 Mar 2024 18:03:20 -0400 Subject: [PATCH 0619/1012] Fixes spacing in commit details nav --- src/webviews/apps/commitDetails/components/commit-action.css.ts | 1 + src/webviews/apps/commitDetails/components/gl-inspect-nav.ts | 1 + src/webviews/apps/commitDetails/components/gl-status-nav.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/src/webviews/apps/commitDetails/components/commit-action.css.ts b/src/webviews/apps/commitDetails/components/commit-action.css.ts index a7cba0e57776b..62c227479802a 100644 --- a/src/webviews/apps/commitDetails/components/commit-action.css.ts +++ b/src/webviews/apps/commitDetails/components/commit-action.css.ts @@ -11,6 +11,7 @@ export const commitActionStyles = css` padding: 0.2rem; vertical-align: text-bottom; text-decoration: none; + gap: 0.2rem; } .commit-action > * { diff --git a/src/webviews/apps/commitDetails/components/gl-inspect-nav.ts b/src/webviews/apps/commitDetails/components/gl-inspect-nav.ts index f9e81a1425875..9ca5de2f32872 100644 --- a/src/webviews/apps/commitDetails/components/gl-inspect-nav.ts +++ b/src/webviews/apps/commitDetails/components/gl-inspect-nav.ts @@ -21,6 +21,7 @@ export class GlInspectNav extends LitElement { flex-wrap: wrap; align-items: center; justify-content: space-between; + gap: 0.2rem; } :host([pinned]) { diff --git a/src/webviews/apps/commitDetails/components/gl-status-nav.ts b/src/webviews/apps/commitDetails/components/gl-status-nav.ts index eaa358406f14b..4ba3567d5b2a8 100644 --- a/src/webviews/apps/commitDetails/components/gl-status-nav.ts +++ b/src/webviews/apps/commitDetails/components/gl-status-nav.ts @@ -22,6 +22,7 @@ export class GlStatusNav extends LitElement { /* flex-wrap: wrap; */ align-items: center; justify-content: space-between; + gap: 0.2rem; } .commit-action--overflowed { From bddad5e25e70d2700dbb2197b0fa8aa9c06fc4a3 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 25 Mar 2024 18:32:21 -0400 Subject: [PATCH 0620/1012] Focus provider feature exploration (#3137) Fixes issues Fixes wrong bucket Updates bucketing Adds repository location Improves ref matching and 'waiting for review' bucket assignment Adds expiration to cached prs, issues and enriched items Adds polling to indicator with setting to customize poll rate Fixes pinning and snoozing button commands, adds pinned ui group Removes GitHub enterprise Removes setting, makes provider persistent, moves indicator to container Reworks categorization Adds collapsable groups Adds basic merge support Uses deep link for switch and moves logic to provider Updates types to allow for issue provider issues Hides unimplemented actions Updates PR date property Indicator and quick focus improvements - Loading spinner when indicator is starting up - Action text next to top item # in status bar text - Links on hover to open a particular category - Indentation on quickpick focus item details - Update to command to allow initialGroup in state Adds mute and hide options to indicator tooltips Adds "new" indicators on new items since last view Updates 'get' call in focus provider Disables indicators by default Co-authored-by: Ramin Tadayon --- .vscode/queries.github-graphql-nb | 2 +- package.json | 50 +- src/commands/gitCommands.ts | 22 +- src/commands/gitCommands.utils.ts | 3 +- src/commands/quickCommand.buttons.ts | 29 + src/config.ts | 10 + src/constants.ts | 1 + src/container.ts | 30 +- src/git/models/issue.ts | 9 + src/git/models/pullRequest.ts | 17 +- src/gk/models/repositoryIdentities.ts | 12 +- src/plus/focus/focus.ts | 409 ++++++++++++ src/plus/focus/focusIndicator.ts | 316 ++++++++++ src/plus/focus/focusProvider.ts | 585 ++++++++++++++++++ src/plus/integrations/integration.ts | 35 +- .../integrations/providers/azureDevOps.ts | 17 +- src/plus/integrations/providers/bitbucket.ts | 17 +- src/plus/integrations/providers/github.ts | 20 +- .../integrations/providers/github/github.ts | 84 +++ .../integrations/providers/github/models.ts | 106 +++- src/plus/integrations/providers/gitlab.ts | 17 +- .../integrations/providers/gitlab/gitlab.ts | 3 +- .../integrations/providers/gitlab/models.ts | 7 +- src/plus/repos/repositoryIdentityService.ts | 78 ++- src/quickpicks/items/directive.ts | 7 + src/uris/deepLinks/deepLink.ts | 14 + src/uris/deepLinks/deepLinkService.ts | 93 ++- src/webviews/settings/settingsWebview.ts | 1 + 28 files changed, 1910 insertions(+), 84 deletions(-) create mode 100644 src/plus/focus/focus.ts create mode 100644 src/plus/focus/focusIndicator.ts create mode 100644 src/plus/focus/focusProvider.ts diff --git a/.vscode/queries.github-graphql-nb b/.vscode/queries.github-graphql-nb index bbb476a99192c..9e1b121b29c0a 100644 --- a/.vscode/queries.github-graphql-nb +++ b/.vscode/queries.github-graphql-nb @@ -1 +1 @@ -{"cells":[{"code":"### Get Default Branch & Tip","kind":"markdown"},{"code":"query getDefaultBranchAndTip(\r\n\t$owner: String!\r\n\t$repo: String!\r\n) {\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\tdefaultBranchRef {\r\n\t\t\tname\r\n\t\t\ttarget { oid }\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\"\r\n}","kind":"code"},{"code":"### Get Branches","kind":"markdown"},{"code":"query getBranches(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$branchQuery: String\r\n\t$cursor: String\r\n\t$limit: Int = 100\r\n) {\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\trefs(query: $branchQuery, refPrefix: \"refs/heads/\", first: $limit, after: $cursor, orderBy: { field: TAG_COMMIT_DATE, direction: DESC }) {\r\n\t\t\tpageInfo {\r\n\t\t\t\tendCursor\r\n\t\t\t\thasNextPage\r\n\t\t\t}\r\n\t\t\tnodes {\r\n\t\t\t\tname\r\n\t\t\t\ttarget {\r\n\t\t\t\t\toid\r\n\t\t\t\t\tcommitUrl\r\n\t\t\t\t\t...on Commit {\r\n\t\t\t\t\t\tauthoredDate\r\n\t\t\t\t\t\tcommittedDate\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\"\r\n}","kind":"code"},{"code":"### Get Blame","kind":"markdown"},{"code":"query getBlame(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: String!\r\n\t$path: String!\r\n) {\r\n\tviewer { name }\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\tobject(expression: $ref) {\r\n\t\t\t...on Commit {\r\n\t\t\t\tblame(path: $path) {\r\n\t\t\t\t\tranges {\r\n\t\t\t\t\t\tstartingLine\r\n\t\t\t\t\t\tendingLine\r\n\t\t\t\t\t\tage\r\n\t\t\t\t\t\tcommit {\r\n\t\t\t\t\t\t\toid\r\n\t\t\t\t\t\t\tparents(first: 3) { nodes { oid } }\r\n\t\t\t\t\t\t\tmessage\r\n\t\t\t\t\t\t\tadditions\r\n\t\t\t\t\t\t\tchangedFiles\r\n\t\t\t\t\t\t\tdeletions\r\n\t\t\t\t\t\t\tauthor {\r\n\t\t\t\t\t\t\t\tavatarUrl\r\n\t\t\t\t\t\t\t\tdate\r\n\t\t\t\t\t\t\t\temail\r\n\t\t\t\t\t\t\t\tname\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\tcommitter {\r\n\t\t\t\t\t\t\t\tdate\r\n\t\t\t\t\t\t\t\temail\r\n\t\t\t\t\t\t\t\tname\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"gitkraken\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"0b8f151bd0458340b7779a64884c97754c3cedb8\",\r\n\t\"path\": \"package.json\"\r\n}","kind":"code"},{"code":"### Get Commit for File","kind":"markdown"},{"code":"query getCommitForFile(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: String!\r\n\t$path: String!\r\n) {\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\tref(qualifiedName: $ref) {\r\n\t\t\ttarget {\r\n\t\t\t\t... on Commit {\r\n\t\t\t\t\thistory(first: 1, path: $path) {\r\n\t\t\t\t\t\tnodes {\r\n\t\t\t\t\t\t\toid\r\n\t\t\t\t\t\t\tparents(first: 3) { nodes { oid } }\r\n\t\t\t\t\t\t\tmessage\r\n\t\t\t\t\t\t\tadditions\r\n\t\t\t\t\t\t\tchangedFiles\r\n\t\t\t\t\t\t\tdeletions\r\n\t\t\t\t\t\t\tauthor {\r\n\t\t\t\t\t\t\t\tdate\r\n\t\t\t\t\t\t\t\temail\r\n\t\t\t\t\t\t\t\tname\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\tcommitter { date }\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"refs/heads/main\",\r\n\t\"path\": \"src/extension.ts\"\r\n}","kind":"code"},{"code":"### Get Current User","kind":"markdown"},{"code":"query getCurrentUser(\r\n\t$owner: String!\r\n\t$repo: String!\r\n) {\r\n\tviewer { name }\r\n\trepository(name: $repo owner: $owner) {\r\n\t\tviewerPermission\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\"\r\n}","kind":"code"},{"code":"### Get Commit","kind":"markdown"},{"code":"query getCommit(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: GitObjectID!\r\n) {\r\n\trepository(name: $repo owner: $owner) {\r\n\t\tobject(oid: $ref) {\r\n\t\t\t...on Commit {\r\n\t\t\t\toid\r\n\t\t\t\tparents(first: 3) { nodes { oid } }\r\n\t\t\t\tmessage\r\n\t\t\t\tadditions\r\n\t\t\t\tchangedFiles\r\n\t\t\t\tdeletions\r\n\t\t\t\tauthor {\r\n\t\t\t\t\tdate\r\n\t\t\t\t\temail\r\n\t\t\t\t\tname\r\n\t\t\t\t}\r\n\t\t\t\tcommitter { date }\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"54f28933055124d6ba3808a787f6947c929f9db0\"\r\n}","kind":"code"},{"code":"### Get Commits","kind":"markdown"},{"code":"query getCommits(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: String!\r\n\t$path: String\r\n\t$author: CommitAuthor\r\n\t$after: String\r\n\t$before: String\r\n\t$limit: Int = 100\r\n\t$since: GitTimestamp\r\n\t$until: GitTimestamp\r\n) {\r\n\tviewer { name }\r\n\trepository(name: $repo, owner: $owner) {\r\n\t\tobject(expression: $ref) {\r\n\t\t\t... on Commit {\r\n\t\t\t\thistory(first: $limit, author: $author, path: $path, after: $after, before: $before, since: $since, until: $until) {\r\n\t\t\t\t\tpageInfo {\r\n\t\t\t\t\t\tstartCursor\r\n\t\t\t\t\t\tendCursor\r\n\t\t\t\t\t\thasNextPage\r\n\t\t\t\t\t\thasPreviousPage\r\n\t\t\t\t\t}\r\n\t\t\t\t\tnodes {\r\n\t\t\t\t\t\t... on Commit {\r\n\t\t\t\t\t\t\toid\r\n\t\t\t\t\t\t\tmessage\r\n\t\t\t\t\t\t\tparents(first: 3) { nodes { oid } }\r\n\t\t\t\t\t\t\tadditions\r\n\t\t\t\t\t\t\tchangedFiles\r\n\t\t\t\t\t\t\tdeletions\r\n\t\t\t\t\t\t\tauthor {\r\n\t\t\t\t\t\t\t\tavatarUrl\r\n\t\t\t\t\t\t\t\tdate\r\n\t\t\t\t\t\t\t\temail\r\n\t\t\t\t\t\t\t\tname\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\tcommitter {\r\n\t\t\t\t\t\t\t\t date\r\n\t\t\t\t\t\t\t\t email\r\n\t\t\t\t\t\t\t\t name\r\n\t\t\t\t\t\t\t }\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"HEAD\",\r\n\t\"-path\": \"src/extension.ts\",\r\n\t\"since\": \"2022-02-07T00:00:00Z\"\r\n}","kind":"code"},{"code":"### Get Tags","kind":"markdown"},{"code":"query getTags(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$tagQuery: String\r\n\t$cursor: String\r\n\t$limit: Int = 100\r\n) {\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\trefs(query: $tagQuery, refPrefix: \"refs/tags/\", first: $limit, after: $cursor, orderBy: { field: TAG_COMMIT_DATE, direction: DESC }) {\r\n\t\t\tpageInfo {\r\n\t\t\t\tendCursor\r\n\t\t\t\thasNextPage\r\n\t\t\t}\r\n\t\t\tnodes {\r\n\t\t\t\tname\r\n\t\t\t\ttarget {\r\n\t\t\t\t\toid\r\n\t\t\t\t\tcommitUrl\r\n\t\t\t\t\t...on Commit {\r\n\t\t\t\t\t\tauthoredDate\r\n\t\t\t\t\t\tcommittedDate\r\n\t\t\t\t\t\tmessage\r\n\t\t\t\t\t}\r\n\t\t\t\t\t...on Tag {\r\n\t\t\t\t\t\tmessage\r\n\t\t\t\t\t\ttagger { date }\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\"\r\n}","kind":"code"},{"code":"### Get collaborators ","kind":"markdown"},{"code":"query getCollaborators (\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$cursor: String\r\n\t$limit: Int = 100\r\n) {\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\tcollaborators(affiliation: ALL, first: $limit, after: $cursor) {\r\n\t\t\tpageInfo {\r\n\t\t\t\tendCursor\r\n\t\t\t\thasNextPage\r\n\t\t\t}\r\n\t\t\tnodes {\r\n\t\t\t\tname\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\"\r\n}","kind":"code"},{"code":"### Resolve reference","kind":"markdown"},{"code":"query resolveReference(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: String!\r\n\t$path: String!\r\n) {\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\tobject(expression: $ref) {\r\n\t\t\t... on Commit {\r\n\t\t\t\thistory(first: 1, path: $path) {\r\n\t\t\t\t\tnodes { oid }\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"d790e9db047769de079f6838c3578f3a47bf5930^\",\r\n\t\"path\": \"CODE_OF_CONDUCT.md\"\r\n}","kind":"code"},{"code":"### Get branches that contain commit","kind":"markdown"},{"code":"query getCommitBranches(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$since: GitTimestamp!\r\n\t$until: GitTimestamp!\r\n) {\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\trefs(first: 20, refPrefix: \"refs/heads/\", orderBy: { field: TAG_COMMIT_DATE, direction: DESC }) {\r\n\t\t\tnodes {\r\n\t\t\t\tname\r\n\t\t\t\ttarget {\r\n\t\t\t\t\t... on Commit {\r\n\t\t\t\t\t\thistory(first: 3, since: $since until: $until) {\r\n\t\t\t\t\t\t\tnodes { oid }\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"since\": \"2022-01-06T01:07:46-04:00\",\r\n\t\"until\": \"2022-01-06T01:07:46-05:00\"\r\n}","kind":"code"},{"code":"query getCommitBranch(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: String!\r\n\t$since: GitTimestamp!\r\n\t$until: GitTimestamp!\r\n) {\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\tref(qualifiedName: $ref) {\r\n\t\t\ttarget {\r\n\t\t\t\t... on Commit {\r\n\t\t\t\t\thistory(first: 3, since: $since until: $until) {\r\n\t\t\t\t\t\tnodes { oid }\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"refs/heads/main\",\r\n\t\"since\": \"2022-01-06T01:07:46-04:00\",\r\n\t\"until\": \"2022-01-06T01:07:46-05:00\"\r\n}","kind":"code"},{"code":"### Get commit count for branch (ref)","kind":"markdown"},{"code":"query getCommitCount(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: String!\r\n) {\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\tref(qualifiedName: $ref) {\r\n\t\t\ttarget {\r\n\t\t\t\t... on Commit {\r\n\t\t\t\t\thistory(first: 1) {\r\n\t\t\t\t\t\ttotalCount\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"refs/heads/main\"\r\n}","kind":"code"},{"code":"### Get commit refs (sha)","kind":"markdown"},{"code":"query getCommitRefs(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: String!\r\n\t$path: String\r\n\t$since: GitTimestamp\r\n\t$until: GitTimestamp\r\n\t$limit: Int = 1\r\n) {\r\n\tviewer { name }\r\n\trepository(name: $repo, owner: $owner) {\r\n\t\tref(qualifiedName: $ref) {\r\n\t\t\thistory(first: $limit, path: $path, since: $since, until: $until) {\r\n\t\t\t\tnodes { oid, message }\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"refs/heads/main\",\r\n\t\"path\": \"extension.ts\",\r\n\t\"limit\": 2\r\n}","kind":"code"},{"code":"### Get next file commit","kind":"markdown"},{"code":"query getCommitDate(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: GitObjectID!\r\n) {\r\n\trepository(name: $repo owner: $owner) {\r\n\t\tobject(oid: $ref) {\r\n\t\t\t...on Commit {\r\n\t\t\t\tcommitter { date }\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"a03ff942c40665c451bd4c7768f46e3e5f00e97c\"\r\n}","kind":"code"},{"code":"query getNextCommitCursor(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: String!\r\n\t$path: String!\r\n\t$since: GitTimestamp!\r\n) {\r\n\trepository(name: $repo owner: $owner) {\r\n\t\tobject(expression: $ref) {\r\n\t\t\t... on Commit {\r\n\t\t\t\thistory(first:1, path: $path, since: $since) {\r\n\t\t\t\t\ttotalCount\r\n\t\t\t\t\tpageInfo { startCursor }\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"b062e960b6ee5ca7ac081dd84d9217bd4b2051e0\",\r\n \"path\": \"src/extension.ts\",\r\n \"since\": \"2021-11-03T02:46:29-04:00\"\r\n}","kind":"code"},{"code":"query getNextCommit(\r\n\t$owner: String!\r\n\t$repo: String!\r\n $ref: String!\r\n $path: String!\r\n\t$before: String!\r\n) {\trepository(name: $repo owner: $owner) {\r\n object(expression: $ref) {\r\n ... on Commit {\r\n history(last:4, path: $path, before: $before) {\r\n totalCount\r\n pageInfo {\r\n startCursor\r\n }\r\n nodes {\r\n oid\r\n message\r\n committedDate\r\n }\r\n }\r\n }\r\n }\r\n }\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"496c35eaeff2c33d3f1256a25d83198ace6aa6b0\",\r\n \"path\": \"src/extension.ts\",\r\n \"before\": \"496c35eaeff2c33d3f1256a25d83198ace6aa6b0 4\"\r\n}","kind":"code"},{"code":"### Get Pull Request for Branch","kind":"markdown"},{"code":"query getPullRequestForBranch(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$branch: String!\r\n\t$limit: Int!\r\n\t$include: [PullRequestState!]\r\n\t$avatarSize: Int\r\n) {\r\n\trepository(name: $repo, owner: $owner) {\r\n\t\trefs(query: $branch, refPrefix: \"refs/heads/\", first: 1) {\r\n\t\t\tnodes {\r\n\t\t\t\tassociatedPullRequests(first: $limit, orderBy: {field: UPDATED_AT, direction: DESC}, states: $include) {\r\n\t\t\t\t\tnodes {\r\n\t\t\t\t\t\tauthor {\r\n\t\t\t\t\t\t\tlogin\r\n\t\t\t\t\t\t\tavatarUrl(size: $avatarSize)\r\n\t\t\t\t\t\t\turl\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t\tpermalink\r\n\t\t\t\t\t\tnumber\r\n\t\t\t\t\t\ttitle\r\n\t\t\t\t\t\tstate\r\n\t\t\t\t\t\tcreatedAt\r\n\t\t\t\t\t\tupdatedAt\r\n\t\t\t\t\t\tclosedAt\r\n\t\t\t\t\t\tmergedAt\r\n\t\t\t\t\t\trepository {\r\n\t\t\t\t\t\t\tisFork\r\n\t\t\t\t\t\t\towner {\r\n\t\t\t\t\t\t\t\tlogin\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"gitkraken\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"branch\": \"main\",\r\n\t\"limit\": 1\r\n}","kind":"code"},{"code":"### Get My Assigned Pull Requests","kind":"markdown"},{"code":"query getMyAssignedPullRequests($assigned: String!) {\r\n search(first: 100, query: $assigned, type: ISSUE) {\r\n nodes {\r\n ... on PullRequest {\r\n assignees(first: 100) {\r\n nodes {\r\n login\r\n avatarUrl\r\n url\r\n }\r\n }\r\n author {\r\n login\r\n avatarUrl\r\n url\r\n }\r\n baseRefName\r\n baseRefOid\r\n baseRepository {\r\n name\r\n owner {\r\n login\r\n }\r\n url\r\n }\r\n checksUrl\r\n isDraft\r\n isCrossRepository\r\n isReadByViewer\r\n headRefName\r\n headRefOid\r\n headRepository {\r\n name\r\n owner {\r\n login\r\n }\r\n url\r\n }\r\n permalink\r\n number\r\n title\r\n state\r\n additions\r\n deletions\r\n createdAt\r\n updatedAt\r\n closedAt\r\n mergeable\r\n mergedAt\r\n mergedBy {\r\n login\r\n }\r\n reactions(content: THUMBS_UP) {\r\n totalCount\r\n }\r\n repository {\r\n isFork\r\n owner {\r\n login\r\n }\r\n }\r\n reviewDecision\r\n reviewRequests(first: 100) {\r\n nodes {\r\n asCodeOwner\r\n requestedReviewer {\r\n ... on User {\r\n login\r\n avatarUrl\r\n url\r\n }\r\n }\r\n }\r\n }\r\n totalCommentsCount\r\n }\r\n }\r\n }\r\n}\r\n\r\nvariables {\r\n \"assigned\": \"assignee:@me is:pr is:open archived:false repo:gitkraken/vscode-gitlens\"\r\n}","kind":"code"},{"code":"### Get My Assigned Issues","kind":"markdown"},{"code":"query MyQuery($assigned: String!) {\r\n search(first: 2, query: $assigned, type: ISSUE) {\r\n nodes {\r\n ... on Issue {\r\n assignees(first: 100) {\r\n nodes {\r\n login\r\n url\r\n avatarUrl\r\n }\r\n }\r\n author {\r\n login\r\n avatarUrl\r\n url\r\n }\r\n comments {\r\n totalCount\r\n }\r\n number\r\n title\r\n url\r\n createdAt\r\n closedAt\r\n closed\r\n updatedAt\r\n labels(first: 20) {\r\n nodes {\r\n color\r\n name\r\n }\r\n }\r\n reactions(content: THUMBS_UP) {\r\n totalCount\r\n }\r\n repository {\r\n name\r\n owner {\r\n login\r\n }\r\n }\r\n }\r\n }\r\n }\r\n}\r\n\r\nvariables {\r\n \"assigned\": \"assignee:@me type:issue is:open archived:false repo:gitkraken/vscode-gitlens\"\r\n}","kind":"code"}]} \ No newline at end of file +{"cells":[{"code":"### Get Default Branch & Tip","kind":"markdown"},{"code":"query getDefaultBranchAndTip(\r\n\t$owner: String!\r\n\t$repo: String!\r\n) {\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\tdefaultBranchRef {\r\n\t\t\tname\r\n\t\t\ttarget { oid }\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\"\r\n}","kind":"code"},{"code":"### Get Branches","kind":"markdown"},{"code":"query getBranches(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$branchQuery: String\r\n\t$cursor: String\r\n\t$limit: Int = 100\r\n) {\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\trefs(query: $branchQuery, refPrefix: \"refs/heads/\", first: $limit, after: $cursor, orderBy: { field: TAG_COMMIT_DATE, direction: DESC }) {\r\n\t\t\tpageInfo {\r\n\t\t\t\tendCursor\r\n\t\t\t\thasNextPage\r\n\t\t\t}\r\n\t\t\tnodes {\r\n\t\t\t\tname\r\n\t\t\t\ttarget {\r\n\t\t\t\t\toid\r\n\t\t\t\t\tcommitUrl\r\n\t\t\t\t\t...on Commit {\r\n\t\t\t\t\t\tauthoredDate\r\n\t\t\t\t\t\tcommittedDate\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\"\r\n}","kind":"code"},{"code":"### Get Blame","kind":"markdown"},{"code":"query getBlame(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: String!\r\n\t$path: String!\r\n) {\r\n\tviewer { name }\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\tobject(expression: $ref) {\r\n\t\t\t...on Commit {\r\n\t\t\t\tblame(path: $path) {\r\n\t\t\t\t\tranges {\r\n\t\t\t\t\t\tstartingLine\r\n\t\t\t\t\t\tendingLine\r\n\t\t\t\t\t\tage\r\n\t\t\t\t\t\tcommit {\r\n\t\t\t\t\t\t\toid\r\n\t\t\t\t\t\t\tparents(first: 3) { nodes { oid } }\r\n\t\t\t\t\t\t\tmessage\r\n\t\t\t\t\t\t\tadditions\r\n\t\t\t\t\t\t\tchangedFiles\r\n\t\t\t\t\t\t\tdeletions\r\n\t\t\t\t\t\t\tauthor {\r\n\t\t\t\t\t\t\t\tavatarUrl\r\n\t\t\t\t\t\t\t\tdate\r\n\t\t\t\t\t\t\t\temail\r\n\t\t\t\t\t\t\t\tname\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\tcommitter {\r\n\t\t\t\t\t\t\t\tdate\r\n\t\t\t\t\t\t\t\temail\r\n\t\t\t\t\t\t\t\tname\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"gitkraken\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"0b8f151bd0458340b7779a64884c97754c3cedb8\",\r\n\t\"path\": \"package.json\"\r\n}","kind":"code"},{"code":"### Get Commit for File","kind":"markdown"},{"code":"query getCommitForFile(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: String!\r\n\t$path: String!\r\n) {\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\tref(qualifiedName: $ref) {\r\n\t\t\ttarget {\r\n\t\t\t\t... on Commit {\r\n\t\t\t\t\thistory(first: 1, path: $path) {\r\n\t\t\t\t\t\tnodes {\r\n\t\t\t\t\t\t\toid\r\n\t\t\t\t\t\t\tparents(first: 3) { nodes { oid } }\r\n\t\t\t\t\t\t\tmessage\r\n\t\t\t\t\t\t\tadditions\r\n\t\t\t\t\t\t\tchangedFiles\r\n\t\t\t\t\t\t\tdeletions\r\n\t\t\t\t\t\t\tauthor {\r\n\t\t\t\t\t\t\t\tdate\r\n\t\t\t\t\t\t\t\temail\r\n\t\t\t\t\t\t\t\tname\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\tcommitter { date }\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"refs/heads/main\",\r\n\t\"path\": \"src/extension.ts\"\r\n}","kind":"code"},{"code":"### Get Current User","kind":"markdown"},{"code":"query getCurrentUser(\r\n\t$owner: String!\r\n\t$repo: String!\r\n) {\r\n\tviewer { name }\r\n\trepository(name: $repo owner: $owner) {\r\n\t\tviewerPermission\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\"\r\n}","kind":"code"},{"code":"### Get Commit","kind":"markdown"},{"code":"query getCommit(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: GitObjectID!\r\n) {\r\n\trepository(name: $repo owner: $owner) {\r\n\t\tobject(oid: $ref) {\r\n\t\t\t...on Commit {\r\n\t\t\t\toid\r\n\t\t\t\tparents(first: 3) { nodes { oid } }\r\n\t\t\t\tmessage\r\n\t\t\t\tadditions\r\n\t\t\t\tchangedFiles\r\n\t\t\t\tdeletions\r\n\t\t\t\tauthor {\r\n\t\t\t\t\tdate\r\n\t\t\t\t\temail\r\n\t\t\t\t\tname\r\n\t\t\t\t}\r\n\t\t\t\tcommitter { date }\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"54f28933055124d6ba3808a787f6947c929f9db0\"\r\n}","kind":"code"},{"code":"### Get Commits","kind":"markdown"},{"code":"query getCommits(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: String!\r\n\t$path: String\r\n\t$author: CommitAuthor\r\n\t$after: String\r\n\t$before: String\r\n\t$limit: Int = 100\r\n\t$since: GitTimestamp\r\n\t$until: GitTimestamp\r\n) {\r\n\tviewer { name }\r\n\trepository(name: $repo, owner: $owner) {\r\n\t\tobject(expression: $ref) {\r\n\t\t\t... on Commit {\r\n\t\t\t\thistory(first: $limit, author: $author, path: $path, after: $after, before: $before, since: $since, until: $until) {\r\n\t\t\t\t\tpageInfo {\r\n\t\t\t\t\t\tstartCursor\r\n\t\t\t\t\t\tendCursor\r\n\t\t\t\t\t\thasNextPage\r\n\t\t\t\t\t\thasPreviousPage\r\n\t\t\t\t\t}\r\n\t\t\t\t\tnodes {\r\n\t\t\t\t\t\t... on Commit {\r\n\t\t\t\t\t\t\toid\r\n\t\t\t\t\t\t\tmessage\r\n\t\t\t\t\t\t\tparents(first: 3) { nodes { oid } }\r\n\t\t\t\t\t\t\tadditions\r\n\t\t\t\t\t\t\tchangedFiles\r\n\t\t\t\t\t\t\tdeletions\r\n\t\t\t\t\t\t\tauthor {\r\n\t\t\t\t\t\t\t\tavatarUrl\r\n\t\t\t\t\t\t\t\tdate\r\n\t\t\t\t\t\t\t\temail\r\n\t\t\t\t\t\t\t\tname\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\tcommitter {\r\n\t\t\t\t\t\t\t\t date\r\n\t\t\t\t\t\t\t\t email\r\n\t\t\t\t\t\t\t\t name\r\n\t\t\t\t\t\t\t }\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"HEAD\",\r\n\t\"-path\": \"src/extension.ts\",\r\n\t\"since\": \"2022-02-07T00:00:00Z\"\r\n}","kind":"code"},{"code":"### Get Tags","kind":"markdown"},{"code":"query getTags(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$tagQuery: String\r\n\t$cursor: String\r\n\t$limit: Int = 100\r\n) {\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\trefs(query: $tagQuery, refPrefix: \"refs/tags/\", first: $limit, after: $cursor, orderBy: { field: TAG_COMMIT_DATE, direction: DESC }) {\r\n\t\t\tpageInfo {\r\n\t\t\t\tendCursor\r\n\t\t\t\thasNextPage\r\n\t\t\t}\r\n\t\t\tnodes {\r\n\t\t\t\tname\r\n\t\t\t\ttarget {\r\n\t\t\t\t\toid\r\n\t\t\t\t\tcommitUrl\r\n\t\t\t\t\t...on Commit {\r\n\t\t\t\t\t\tauthoredDate\r\n\t\t\t\t\t\tcommittedDate\r\n\t\t\t\t\t\tmessage\r\n\t\t\t\t\t}\r\n\t\t\t\t\t...on Tag {\r\n\t\t\t\t\t\tmessage\r\n\t\t\t\t\t\ttagger { date }\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\"\r\n}","kind":"code"},{"code":"### Get collaborators ","kind":"markdown"},{"code":"query getCollaborators (\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$cursor: String\r\n\t$limit: Int = 100\r\n) {\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\tcollaborators(affiliation: ALL, first: $limit, after: $cursor) {\r\n\t\t\tpageInfo {\r\n\t\t\t\tendCursor\r\n\t\t\t\thasNextPage\r\n\t\t\t}\r\n\t\t\tnodes {\r\n\t\t\t\tname\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\"\r\n}","kind":"code"},{"code":"### Resolve reference","kind":"markdown"},{"code":"query resolveReference(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: String!\r\n\t$path: String!\r\n) {\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\tobject(expression: $ref) {\r\n\t\t\t... on Commit {\r\n\t\t\t\thistory(first: 1, path: $path) {\r\n\t\t\t\t\tnodes { oid }\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"d790e9db047769de079f6838c3578f3a47bf5930^\",\r\n\t\"path\": \"CODE_OF_CONDUCT.md\"\r\n}","kind":"code"},{"code":"### Get branches that contain commit","kind":"markdown"},{"code":"query getCommitBranches(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$since: GitTimestamp!\r\n\t$until: GitTimestamp!\r\n) {\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\trefs(first: 20, refPrefix: \"refs/heads/\", orderBy: { field: TAG_COMMIT_DATE, direction: DESC }) {\r\n\t\t\tnodes {\r\n\t\t\t\tname\r\n\t\t\t\ttarget {\r\n\t\t\t\t\t... on Commit {\r\n\t\t\t\t\t\thistory(first: 3, since: $since until: $until) {\r\n\t\t\t\t\t\t\tnodes { oid }\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"since\": \"2022-01-06T01:07:46-04:00\",\r\n\t\"until\": \"2022-01-06T01:07:46-05:00\"\r\n}","kind":"code"},{"code":"query getCommitBranch(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: String!\r\n\t$since: GitTimestamp!\r\n\t$until: GitTimestamp!\r\n) {\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\tref(qualifiedName: $ref) {\r\n\t\t\ttarget {\r\n\t\t\t\t... on Commit {\r\n\t\t\t\t\thistory(first: 3, since: $since until: $until) {\r\n\t\t\t\t\t\tnodes { oid }\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"refs/heads/main\",\r\n\t\"since\": \"2022-01-06T01:07:46-04:00\",\r\n\t\"until\": \"2022-01-06T01:07:46-05:00\"\r\n}","kind":"code"},{"code":"### Get commit count for branch (ref)","kind":"markdown"},{"code":"query getCommitCount(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: String!\r\n) {\r\n\trepository(owner: $owner, name: $repo) {\r\n\t\tref(qualifiedName: $ref) {\r\n\t\t\ttarget {\r\n\t\t\t\t... on Commit {\r\n\t\t\t\t\thistory(first: 1) {\r\n\t\t\t\t\t\ttotalCount\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"refs/heads/main\"\r\n}","kind":"code"},{"code":"### Get commit refs (sha)","kind":"markdown"},{"code":"query getCommitRefs(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: String!\r\n\t$path: String\r\n\t$since: GitTimestamp\r\n\t$until: GitTimestamp\r\n\t$limit: Int = 1\r\n) {\r\n\tviewer { name }\r\n\trepository(name: $repo, owner: $owner) {\r\n\t\tref(qualifiedName: $ref) {\r\n\t\t\thistory(first: $limit, path: $path, since: $since, until: $until) {\r\n\t\t\t\tnodes { oid, message }\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"refs/heads/main\",\r\n\t\"path\": \"extension.ts\",\r\n\t\"limit\": 2\r\n}","kind":"code"},{"code":"### Get next file commit","kind":"markdown"},{"code":"query getCommitDate(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: GitObjectID!\r\n) {\r\n\trepository(name: $repo owner: $owner) {\r\n\t\tobject(oid: $ref) {\r\n\t\t\t...on Commit {\r\n\t\t\t\tcommitter { date }\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"a03ff942c40665c451bd4c7768f46e3e5f00e97c\"\r\n}","kind":"code"},{"code":"query getNextCommitCursor(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$ref: String!\r\n\t$path: String!\r\n\t$since: GitTimestamp!\r\n) {\r\n\trepository(name: $repo owner: $owner) {\r\n\t\tobject(expression: $ref) {\r\n\t\t\t... on Commit {\r\n\t\t\t\thistory(first:1, path: $path, since: $since) {\r\n\t\t\t\t\ttotalCount\r\n\t\t\t\t\tpageInfo { startCursor }\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"b062e960b6ee5ca7ac081dd84d9217bd4b2051e0\",\r\n \"path\": \"src/extension.ts\",\r\n \"since\": \"2021-11-03T02:46:29-04:00\"\r\n}","kind":"code"},{"code":"query getNextCommit(\r\n\t$owner: String!\r\n\t$repo: String!\r\n $ref: String!\r\n $path: String!\r\n\t$before: String!\r\n) {\trepository(name: $repo owner: $owner) {\r\n object(expression: $ref) {\r\n ... on Commit {\r\n history(last:4, path: $path, before: $before) {\r\n totalCount\r\n pageInfo {\r\n startCursor\r\n }\r\n nodes {\r\n oid\r\n message\r\n committedDate\r\n }\r\n }\r\n }\r\n }\r\n }\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"eamodio\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"ref\": \"496c35eaeff2c33d3f1256a25d83198ace6aa6b0\",\r\n \"path\": \"src/extension.ts\",\r\n \"before\": \"496c35eaeff2c33d3f1256a25d83198ace6aa6b0 4\"\r\n}","kind":"code"},{"code":"### Get Pull Request for Branch","kind":"markdown"},{"code":"query getPullRequestForBranch(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$branch: String!\r\n\t$limit: Int!\r\n\t$include: [PullRequestState!]\r\n\t$avatarSize: Int\r\n) {\r\n\trepository(name: $repo, owner: $owner) {\r\n\t\trefs(query: $branch, refPrefix: \"refs/heads/\", first: 1) {\r\n\t\t\tnodes {\r\n\t\t\t\tassociatedPullRequests(first: $limit, orderBy: {field: UPDATED_AT, direction: DESC}, states: $include) {\r\n\t\t\t\t\tnodes {\r\n\t\t\t\t\t\tauthor {\r\n\t\t\t\t\t\t\tlogin\r\n\t\t\t\t\t\t\tavatarUrl(size: $avatarSize)\r\n\t\t\t\t\t\t\turl\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t\tpermalink\r\n\t\t\t\t\t\tnumber\r\n\t\t\t\t\t\ttitle\r\n\t\t\t\t\t\tstate\r\n\t\t\t\t\t\tcreatedAt\r\n\t\t\t\t\t\tupdatedAt\r\n\t\t\t\t\t\tclosedAt\r\n\t\t\t\t\t\tmergedAt\r\n\t\t\t\t\t\trepository {\r\n\t\t\t\t\t\t\tisFork\r\n\t\t\t\t\t\t\towner {\r\n\t\t\t\t\t\t\t\tlogin\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"gitkraken\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"branch\": \"main\",\r\n\t\"limit\": 1\r\n}","kind":"code"},{"code":"### Get My Assigned Pull Requests","kind":"markdown"},{"code":"query getMyAssignedPullRequests($assigned: String!) {\r\n search(first: 100, query: $assigned, type: ISSUE) {\r\n nodes {\r\n ... on PullRequest {\r\n assignees(first: 100) {\r\n nodes {\r\n login\r\n avatarUrl\r\n url\r\n }\r\n }\r\n author {\r\n login\r\n avatarUrl\r\n url\r\n }\r\n baseRefName\r\n baseRefOid\r\n baseRepository {\r\n name\r\n owner {\r\n login\r\n }\r\n url\r\n }\r\n checksUrl\r\n isDraft\r\n isCrossRepository\r\n isReadByViewer\r\n headRefName\r\n headRefOid\r\n headRepository {\r\n name\r\n owner {\r\n login\r\n }\r\n url\r\n }\r\n permalink\r\n number\r\n title\r\n state\r\n additions\r\n deletions\r\n createdAt\r\n updatedAt\r\n closedAt\r\n mergeable\r\n mergedAt\r\n mergedBy {\r\n login\r\n }\r\n reactions(content: THUMBS_UP) {\r\n totalCount\r\n }\r\n repository {\r\n isFork\r\n owner {\r\n login\r\n }\r\n viewerPermission\r\n }\r\n reviewDecision\r\n reviewRequests(first: 100) {\r\n nodes {\r\n asCodeOwner\r\n requestedReviewer {\r\n ... on User {\r\n login\r\n avatarUrl\r\n url\r\n }\r\n }\r\n }\r\n }\r\n totalCommentsCount\r\n viewerCanUpdate\r\n }\r\n }\r\n }\r\n}\r\n\r\nvariables {\r\n \"assigned\": \"assignee:@me is:pr is:open archived:false repo:gitkraken/vscode-gitlens\"\r\n}","kind":"code"},{"code":"### Get My Assigned Issues","kind":"markdown"},{"code":"query MyQuery($assigned: String!) {\r\n search(first: 2, query: $assigned, type: ISSUE) {\r\n nodes {\r\n ... on Issue {\r\n assignees(first: 100) {\r\n nodes {\r\n login\r\n url\r\n avatarUrl\r\n }\r\n }\r\n author {\r\n login\r\n avatarUrl\r\n url\r\n }\r\n comments {\r\n totalCount\r\n }\r\n number\r\n title\r\n url\r\n createdAt\r\n closedAt\r\n closed\r\n updatedAt\r\n labels(first: 20) {\r\n nodes {\r\n color\r\n name\r\n }\r\n }\r\n reactions(content: THUMBS_UP) {\r\n totalCount\r\n }\r\n repository {\r\n name\r\n owner {\r\n login\r\n }\r\n }\r\n }\r\n }\r\n }\r\n}\r\n\r\nvariables {\r\n \"assigned\": \"assignee:@me type:issue is:open archived:false repo:gitkraken/vscode-gitlens\"\r\n}","kind":"code"},{"code":"### Get PR CI Checks","kind":"markdown"},{"code":"query getPullRequest(\r\n\t$owner: String!\r\n\t$repo: String!\r\n\t$number: Int!\r\n) {\r\n\trepository(name: $repo, owner: $owner) {\r\n\t\tpullRequest(number: $number) {\r\n\t\t\ttitle\r\n \t\tcommits(last: 1) {\r\n\t\t\t\tnodes {\r\n\t\t\t\t\tcommit {\r\n\t\t\t\t\t\toid\r\n\t\t\t\t\t\tstatusCheckRollup {\r\n\t\t\t\t\t\t\tstate\r\n\t\t\t\t\t\t\tcontexts(first: 10) {\r\n \t\t\t\tedges {\r\n \t\t\t\t\tnode {\r\n \t\t\t\t\t... on CheckRun {\r\n\t\t\t\t\t\t\t\t\t\t\tname\r\n\t\t\t\t\t\t\t\t\t\t\tstatus\r\n\t\t\t\t\t\t\t\t\t\t\tconclusion\r\n\t\t\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t\t\t}\r\n \t\t\t\t}\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\nvariables {\r\n\t\"owner\": \"gitkraken\",\r\n\t\"repo\": \"vscode-gitlens\",\r\n\t\"number\": 3036\r\n}","kind":"code"}]} \ No newline at end of file diff --git a/package.json b/package.json index cda75c4055803..9d8299d4eece7 100644 --- a/package.json +++ b/package.json @@ -2796,6 +2796,34 @@ "markdownDescription": "Specifies whether to allow opening multiple instances of the _Focus_", "scope": "window", "order": 10 + }, + "gitlens.focus.experimental.indicators.enabled": { + "type": "boolean", + "default": false, + "markdownDescription": "(Experimental) Specifies whether to enable status bar indicators for _Focus_", + "scope": "window", + "order": 21 + }, + "gitlens.focus.experimental.indicators.openQuickFocus": { + "type": "boolean", + "default": true, + "markdownDescription": "(Experimental) Specifies whether to open _Focus_ or _Quick Focus_ when clicking on the indicators", + "scope": "window", + "order": 22 + }, + "gitlens.focus.experimental.indicators.data.enabled": { + "type": "boolean", + "default": true, + "markdownDescription": "(Experimental) Specifies whether the status bar indicators will fetch data for _Focus_.", + "scope": "window", + "order": 23 + }, + "gitlens.focus.experimental.indicators.data.refreshRate": { + "type": "number", + "default": 30, + "markdownDescription": "(Experimental) Specifies the rate (in minutes) at which to refresh the status bar indicators for _Focus_. Use 0 to disable automatic refreshing", + "scope": "window", + "order": 24 } } }, @@ -5261,11 +5289,17 @@ "title": "Show File History View", "category": "GitLens" }, + { + "command": "gitlens.quickFocus", + "title": "Quick Focus", + "category": "GitLens", + "icon": "$(target)" + }, { "command": "gitlens.showFocusPage", "title": "Show Focus", "category": "GitLens", - "icon": "$(layers)" + "icon": "$(target)" }, { "command": "gitlens.focus.split", @@ -5273,6 +5307,12 @@ "category": "GitLens", "icon": "$(split-horizontal)" }, + { + "command": "gitlens.focus.experimental.updateIndicators", + "title": "Update Focus Indicators", + "category": "GitLens", + "icon": "$(sync)" + }, { "command": "gitlens.showGraph", "title": "Show Commit Graph", @@ -9160,6 +9200,10 @@ "command": "gitlens.showFileHistoryView", "when": "gitlens:enabled" }, + { + "command": "gitlens.quickFocus", + "when": "gitlens:prerelease" + }, { "command": "gitlens.showFocusPage", "when": "gitlens:enabled" @@ -9168,6 +9212,10 @@ "command": "gitlens.focus.split", "when": "gitlens:enabled && config.gitlens.focus.allowMultiple" }, + { + "command": "gitlens.focus.experimental.updateIndicators", + "when": "false" + }, { "command": "gitlens.showGraph", "when": "gitlens:enabled" diff --git a/src/commands/gitCommands.ts b/src/commands/gitCommands.ts index a1cdd46a80679..e320f122f9554 100644 --- a/src/commands/gitCommands.ts +++ b/src/commands/gitCommands.ts @@ -2,6 +2,7 @@ import type { Disposable, InputBox, QuickInputButton, QuickPick, QuickPickItem } import { InputBoxValidationSeverity, QuickInputButtons, window } from 'vscode'; import { Commands } from '../constants'; import { Container } from '../container'; +import type { FocusCommandArgs } from '../plus/focus/focus'; import { Directive, isDirective, isDirectiveQuickPickItem } from '../quickpicks/items/directive'; import { command } from '../system/command'; import { configuration } from '../system/configuration'; @@ -62,7 +63,8 @@ export type GitCommandsCommandArgs = | StatusGitCommandArgs | SwitchGitCommandArgs | TagGitCommandArgs - | WorktreeGitCommandArgs; + | WorktreeGitCommandArgs + | FocusCommandArgs; export type GitCommandsCommandArgsWithCompletion = GitCommandsCommandArgs & { completion?: Deferred }; @@ -107,6 +109,7 @@ export class GitCommandsCommand extends Command { Commands.GitCommandsWorktreeOpen, Commands.CopyWorkingChangesToWorktree, + Commands.QuickFocus, ]); } @@ -206,12 +209,16 @@ export class GitCommandsCommand extends Command { case Commands.GitCommandsWorktreeOpen: args = { command: 'worktree', state: { subcommand: 'open' } }; break; + case Commands.CopyWorkingChangesToWorktree: args = { command: 'worktree', state: { subcommand: 'copy-changes', changes: { type: 'working-tree' } }, }; break; + case Commands.QuickFocus: + args = { command: 'focus', ...args }; + break; } return this.execute(args); @@ -414,6 +421,7 @@ export class GitCommandsCommand extends Command { case Directive.Back: return (await commandsStep?.command?.previous()) ?? commandsStep; case Directive.Noop: + case Directive.Reload: return commandsStep.command?.retry(); case Directive.Cancel: default: @@ -844,6 +852,8 @@ export class GitCommandsCommand extends Command { if (items.length === 1) { const [item] = items; if (isDirectiveQuickPickItem(item)) { + await item.onDidSelect?.(); + switch (item.directive) { case Directive.Cancel: resolve(undefined); @@ -857,6 +867,13 @@ export class GitCommandsCommand extends Command { void loadMore(); return; + case Directive.Noop: + return; + + case Directive.Reload: + resolve(await commandsStep.command?.retry()); + return; + case Directive.StartPreviewTrial: void Container.instance.subscription.startPreviewTrial(); resolve(undefined); @@ -876,9 +893,6 @@ export class GitCommandsCommand extends Command { void Container.instance.subscription.purchase(); resolve(undefined); return; - - case Directive.Noop: - return; } } } diff --git a/src/commands/gitCommands.utils.ts b/src/commands/gitCommands.utils.ts index 6a9f88c28bd6e..7021412e83bf4 100644 --- a/src/commands/gitCommands.utils.ts +++ b/src/commands/gitCommands.utils.ts @@ -1,5 +1,6 @@ import type { RecentUsage } from '../constants'; import type { Container } from '../container'; +import { FocusCommand } from '../plus/focus/focus'; import { configuration } from '../system/configuration'; import { getContext } from '../system/context'; import { BranchGitCommand } from './git/branch'; @@ -108,7 +109,7 @@ export class PickCommandStep implements QuickPickStep { } } - this.hiddenItems = []; + this.hiddenItems = [new FocusCommand(container, args?.command === 'focus' ? args : undefined)]; } private _command: QuickCommand | undefined; diff --git a/src/commands/quickCommand.buttons.ts b/src/commands/quickCommand.buttons.ts index 131d48b8d9bef..8c7f2991c0ac9 100644 --- a/src/commands/quickCommand.buttons.ts +++ b/src/commands/quickCommand.buttons.ts @@ -112,6 +112,35 @@ export const PickCommitToggleQuickInputButton = class extends ToggleQuickInputBu } }; +export const MergeQuickInputButton: QuickInputButton = { + iconPath: new ThemeIcon('merge'), + tooltip: 'Merge', +}; + +export const PinQuickInputButton: QuickInputButton = { + iconPath: new ThemeIcon('pinned'), + tooltip: 'Pin', +}; + +export const UnpinQuickInputButton: QuickInputButton = { + iconPath: new ThemeIcon('pin'), + tooltip: 'Unpin', +}; + +export const SnoozeQuickInputButton: QuickInputButton = { + iconPath: new ThemeIcon('bell-slash'), + tooltip: 'Snooze', +}; + +export const RefreshQuickInputButton: QuickInputButton = { + iconPath: new ThemeIcon('refresh'), + tooltip: 'Refresh', +}; + +export const UnsnoozeQuickInputButton: QuickInputButton = { + iconPath: new ThemeIcon('bell'), + tooltip: 'Unsnooze', +}; export const OpenInNewWindowQuickInputButton: QuickInputButton = { iconPath: new ThemeIcon('empty-window'), tooltip: 'Open in New Window', diff --git a/src/config.ts b/src/config.ts index 0d350a5a82777..7327b91ba27ce 100644 --- a/src/config.ts +++ b/src/config.ts @@ -84,6 +84,16 @@ export interface Config { }; readonly focus: { readonly allowMultiple: boolean; + readonly experimental: { + readonly indicators: { + readonly enabled: boolean; + readonly openQuickFocus: boolean; + readonly data: { + readonly enabled: boolean; + readonly refreshRate: number; + }; + }; + }; }; readonly gitCommands: { readonly avatars: boolean; diff --git a/src/constants.ts b/src/constants.ts index f1e36175a8225..f25e3441a78f7 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -213,6 +213,7 @@ export const enum Commands { OpenWorkingFileInDiffRight = 'gitlens.openWorkingFileInDiffRight', PullRepositories = 'gitlens.pullRepositories', PushRepositories = 'gitlens.pushRepositories', + QuickFocus = 'gitlens.quickFocus', GitCommands = 'gitlens.gitCommands', GitCommandsBranch = 'gitlens.gitCommands.branch', GitCommandsBranchCreate = 'gitlens.gitCommands.branch.create', diff --git a/src/container.ts b/src/container.ts index b7dea38085ac5..78ca9ed6f8aa4 100644 --- a/src/container.ts +++ b/src/container.ts @@ -20,6 +20,8 @@ import { LineHoverController } from './hovers/lineHoverController'; import type { RepositoryPathMappingProvider } from './pathMapping/repositoryPathMappingProvider'; import { DraftService } from './plus/drafts/draftsService'; import { EnrichmentService } from './plus/focus/enrichmentService'; +import { FocusIndicator } from './plus/focus/focusIndicator'; +import { FocusProvider } from './plus/focus/focusProvider'; import { AccountAuthenticationProvider } from './plus/gk/account/authenticationProvider'; import { OrganizationService } from './plus/gk/account/organizationService'; import { SubscriptionService } from './plus/gk/account/subscriptionService'; @@ -188,6 +190,7 @@ export class Container { private _disposables: Disposable[]; private _terminalLinks: GitTerminalLinkProvider | undefined; private _webviews: WebviewsController; + private _focusIndicator: FocusIndicator | undefined; private constructor( context: ExtensionContext, @@ -229,6 +232,7 @@ export class Container { this._disposables.push((this._keyboard = new Keyboard())); this._disposables.push((this._vsls = new VslsController(this))); this._disposables.push((this._eventBus = new EventBus())); + this._disposables.push((this._focusProvider = new FocusProvider(this))); this._disposables.push((this._fileAnnotationController = new FileAnnotationController(this))); this._disposables.push((this._lineAnnotationController = new LineAnnotationController(this))); @@ -285,17 +289,30 @@ export class Container { this._disposables.push((this._homeView = registerHomeWebviewView(this._webviews))); this._disposables.push((this._accountView = registerAccountWebviewView(this._webviews))); + if (configuration.get('focus.experimental.indicators.enabled')) { + this._disposables.push((this._focusIndicator = new FocusIndicator(this, this._focusProvider))); + } + if (configuration.get('terminalLinks.enabled')) { this._disposables.push((this._terminalLinks = new GitTerminalLinkProvider(this))); } this._disposables.push( configuration.onDidChange(e => { - if (!configuration.changed(e, 'terminalLinks.enabled')) return; + if (configuration.changed(e, 'terminalLinks.enabled')) { + this._terminalLinks?.dispose(); + this._terminalLinks = undefined; + if (configuration.get('terminalLinks.enabled')) { + this._disposables.push((this._terminalLinks = new GitTerminalLinkProvider(this))); + } + } - this._terminalLinks?.dispose(); - if (configuration.get('terminalLinks.enabled')) { - this._disposables.push((this._terminalLinks = new GitTerminalLinkProvider(this))); + if (configuration.changed(e, 'focus.experimental.indicators.enabled')) { + this._focusIndicator?.dispose(); + this._focusIndicator = undefined; + if (configuration.get('focus.experimental.indicators.enabled')) { + this._disposables.push((this._focusIndicator = new FocusIndicator(this, this._focusProvider))); + } } }), ); @@ -510,6 +527,11 @@ export class Container { return this._fileHistoryView; } + private readonly _focusProvider: FocusProvider; + get focus(): FocusProvider { + return this._focusProvider; + } + private readonly _git: GitProviderService; get git() { return this._git; diff --git a/src/git/models/issue.ts b/src/git/models/issue.ts index 25ab8e11a5d47..6ed0d9ccd3c32 100644 --- a/src/git/models/issue.ts +++ b/src/git/models/issue.ts @@ -4,6 +4,14 @@ import type { ProviderReference } from './remoteProvider'; export type IssueOrPullRequestType = 'issue' | 'pullrequest'; export type IssueOrPullRequestState = 'opened' | 'closed' | 'merged'; +export enum RepositoryAccessLevel { + Admin = 100, + Maintain = 40, + Write = 30, + Triage = 20, + Read = 10, + None = 0, +} export interface IssueOrPullRequest { readonly type: IssueOrPullRequestType; @@ -35,6 +43,7 @@ export interface IssueMember { export interface IssueRepository { owner: string; repo: string; + accessLevel?: RepositoryAccessLevel; } export interface IssueShape extends IssueOrPullRequest { diff --git a/src/git/models/pullRequest.ts b/src/git/models/pullRequest.ts index 828a7a122d299..da7ba5a5ef530 100644 --- a/src/git/models/pullRequest.ts +++ b/src/git/models/pullRequest.ts @@ -1,7 +1,7 @@ import { Container } from '../../container'; import { formatDate, fromNow } from '../../system/date'; import { memoize } from '../../system/decorators/memoize'; -import type { IssueOrPullRequest, IssueOrPullRequestState as PullRequestState } from './issue'; +import type { IssueOrPullRequest, IssueRepository, IssueOrPullRequestState as PullRequestState } from './issue'; import { shortenRevision } from './reference'; import type { ProviderReference } from './remoteProvider'; @@ -19,6 +19,18 @@ export const enum PullRequestMergeableState { Conflicting = 'Conflicting', } +export const enum PullRequestStatusCheckRollupState { + Success = 'success', + Pending = 'pending', + Failed = 'failed', +} + +export const enum PullRequestMergeMethod { + Merge = 'merge', + Squash = 'squash', + Rebase = 'rebase', +} + export interface PullRequestRef { owner: string; repo: string; @@ -135,12 +147,14 @@ export class PullRequest implements PullRequestShape { public readonly nodeId: string | undefined, public readonly title: string, public readonly url: string, + public readonly repository: IssueRepository, public readonly state: PullRequestState, public readonly createdDate: Date, public readonly updatedDate: Date, public readonly closedDate?: Date, public readonly mergedDate?: Date, public readonly mergeableState?: PullRequestMergeableState, + public readonly viewerCanUpdate?: boolean, public readonly refs?: PullRequestRefs, public readonly isDraft?: boolean, public readonly additions?: number, @@ -150,6 +164,7 @@ export class PullRequest implements PullRequestShape { public readonly reviewDecision?: PullRequestReviewDecision, public readonly reviewRequests?: PullRequestReviewer[], public readonly assignees?: PullRequestMember[], + public readonly statusCheckRollupState?: PullRequestStatusCheckRollupState, ) {} get closed(): boolean { diff --git a/src/gk/models/repositoryIdentities.ts b/src/gk/models/repositoryIdentities.ts index 9d0d3cc4f22b0..79eb114bdeaca 100644 --- a/src/gk/models/repositoryIdentities.ts +++ b/src/gk/models/repositoryIdentities.ts @@ -8,11 +8,7 @@ export type GkProviderId = Branded< >; export type GkRepositoryId = Branded; -export interface RepositoryIdentity { - readonly id: GkRepositoryId; - readonly createdAt: Date; - readonly updatedAt: Date; - +export interface RepositoryIdentityDescriptor { readonly name: string; readonly initialCommitSha?: string; @@ -29,6 +25,12 @@ export interface RepositoryIdentity { }; } +export interface RepositoryIdentity extends RepositoryIdentityDescriptor { + readonly id: GkRepositoryId; + readonly createdAt: Date; + readonly updatedAt: Date; +} + type BaseRepositoryIdentityRequest = { // name: string; initialCommitSha?: string; diff --git a/src/plus/focus/focus.ts b/src/plus/focus/focus.ts new file mode 100644 index 0000000000000..9c174b1cda38f --- /dev/null +++ b/src/plus/focus/focus.ts @@ -0,0 +1,409 @@ +import { ThemeIcon, Uri } from 'vscode'; +import type { + PartialStepState, + StepGenerator, + StepResultGenerator, + StepSelection, + StepState, +} from '../../commands/quickCommand'; +import { + canPickStepContinue, + createPickStep, + endSteps, + QuickCommand, + StepResultBreak, +} from '../../commands/quickCommand'; +import { + MergeQuickInputButton, + PinQuickInputButton, + RefreshQuickInputButton, + SnoozeQuickInputButton, + UnpinQuickInputButton, + UnsnoozeQuickInputButton, +} from '../../commands/quickCommand.buttons'; +import type { Container } from '../../container'; +import type { QuickPickItemOfT } from '../../quickpicks/items/common'; +import { createQuickPickItemOfT, createQuickPickSeparator } from '../../quickpicks/items/common'; +import type { DirectiveQuickPickItem } from '../../quickpicks/items/directive'; +import { createDirectiveQuickPickItem, Directive } from '../../quickpicks/items/directive'; +import { command } from '../../system/command'; +import { fromNow } from '../../system/date'; +import { interpolate } from '../../system/string'; +import { openUrl } from '../../system/utils'; +import type { FocusAction, FocusActionCategory, FocusGroup, FocusItem } from './focusProvider'; +import { groupAndSortFocusItems } from './focusProvider'; + +const actionGroupMap = new Map([ + ['mergeable', ['Ready to Merge', 'Ready to merge']], + ['mergeable-conflicts', ['Resolve Conflicts', 'You need to resolve merge conflicts, before this can be merged']], + ['failed-checks', ['Failed Checks', 'You need to resolve the failing checks']], + ['conflicts', ['Resolve Conflicts', 'You need to resolve merge conflicts']], + ['needs-review', ['Needs Your Review', `\${author} requested your review`]], + ['changes-requested', ['Changes Requested', 'Reviewers requested changes before this can be merged']], + ['waiting-for-review', ['Waiting for Review', 'Waiting for reviewers to approve this pull request']], +]); + +const groupMap = new Map([ + ['pinned', ['Pinned', new ThemeIcon('pinned')]], + ['mergeable', ['Ready to Merge', new ThemeIcon('rocket')]], + ['blocked', ['Blocked', new ThemeIcon('error')]], //bracket-error + ['follow-up', ['Requires Follow-up', new ThemeIcon('report')]], + ['needs-attention', ['Needs Your Attention', new ThemeIcon('bell-dot')]], //comment-unresolved + ['needs-review', ['Needs Your Review', new ThemeIcon('comment-draft')]], // feedback + ['waiting-for-review', ['Waiting for Review', new ThemeIcon('gitlens-clock')]], + ['snoozed', ['Snoozed', new ThemeIcon('bell-slash')]], +]); + +export interface FocusItemQuickPickItem extends QuickPickItemOfT {} + +interface Context { + items: FocusItem[]; + title: string; + collapsed: Map; +} + +interface State { + item?: FocusItem; + action?: FocusAction; + initialGroup?: FocusGroup; +} + +export interface FocusCommandArgs { + readonly command: 'focus'; + confirm?: boolean; + state?: Partial; +} + +type FocusStepState = RequireSome, 'item'>; + +function assertsFocusStepState(state: StepState): asserts state is FocusStepState { + if (state.item != null) return; + + debugger; + throw new Error('Missing item'); +} + +@command() +export class FocusCommand extends QuickCommand { + constructor(container: Container, args?: FocusCommandArgs) { + super(container, 'focus', 'focus', 'Focus', { description: 'focus on a pull request or issue' }); + + const counter = 0; + + this.initialState = { + counter: counter, + confirm: args?.confirm, + ...args?.state, + }; + } + + protected async *steps(state: PartialStepState): StepGenerator { + if (this.container.git.isDiscoveringRepositories) { + await this.container.git.isDiscoveringRepositories; + } + + const collapsed = new Map([['snoozed', true]]); + if (state.initialGroup != null) { + // set all to true except the initial group + for (const [group] of groupMap) { + collapsed.set(group, group !== state.initialGroup); + } + } + + const context: Context = { + items: await this.container.focus.getCategorizedItems(), + title: this.title, + collapsed: collapsed, + }; + + while (this.canStepsContinue(state)) { + context.title = this.title; + + if (state.counter < 1 || state.item == null) { + const result = yield* this.pickFocusItemStep(state, context, { + picked: state.item?.id, + }); + if (result === StepResultBreak) continue; + + state.item = result; + } + + assertsFocusStepState(state); + + if (this.confirm(state.confirm)) { + const result = yield* this.confirmStep(state, context); + if (result === StepResultBreak) continue; + + state.action = result; + } + + switch (state.action) { + case 'merge': { + await this.container.focus.merge(state.item); + break; + } + case 'open': + void openUrl(state.item.url); + break; + case 'review': + case 'switch': { + void this.container.focus.switchTo(state.item); + break; + } + // case 'change-reviewers': + // await this.container.focus.changeReviewers(state.item); + // break; + // case 'decline-review': + // await this.container.focus.declineReview(state.item); + // break; + // case 'nudge': + // await this.container.focus.nudge(state.item); + // break; + } + + endSteps(state); + } + + return state.counter < 0 ? StepResultBreak : undefined; + } + + private *pickFocusItemStep( + state: StepState, + context: Context, + { picked }: { picked?: string }, + ): StepResultGenerator { + function getItems(categorizedItems: FocusItem[]) { + const items: (FocusItemQuickPickItem | DirectiveQuickPickItem)[] = []; + + if (categorizedItems?.length) { + const uiGroups = groupAndSortFocusItems(categorizedItems); + for (const [ui, groupItems] of uiGroups) { + if (!groupItems.length) continue; + + items.push( + createQuickPickSeparator(groupItems.length ? groupItems.length.toString() : undefined), + createDirectiveQuickPickItem(Directive.Reload, false, { + label: `${groupMap.get(ui)![0]?.toUpperCase()}\u00a0$(${ + context.collapsed.get(ui) ? 'chevron-down' : 'chevron-up' + })`, //'\u00a0', + //detail: groupMap.get(group)?.[0].toUpperCase(), + iconPath: groupMap.get(ui)![1], + onDidSelect: () => { + context.collapsed.set(ui, !context.collapsed.get(ui)); + }, + }), + ); + + if (context.collapsed.get(ui)) continue; + + items.push( + ...groupItems.map(i => { + const buttons = []; + + if (i.actionableCategory === 'mergeable') { + buttons.push(MergeQuickInputButton); + } + + buttons.push( + i.pinned ? UnpinQuickInputButton : PinQuickInputButton, + i.snoozed ? UnsnoozeQuickInputButton : SnoozeQuickInputButton, + ); + + return { + label: i.title, + // description: `${i.repoAndOwner}#${i.id}, by @${i.author}`, + description: `#${i.id} ${i.isNew ? '(New since last view)' : ''}`, + detail: ` ${actionGroupMap.get(i.actionableCategory)![0]} \u2022 ${fromNow( + i.date, + )} by @${i.author} \u2022 ${i.repoAndOwner}`, + + buttons: buttons, + iconPath: i.avatarUrl != null ? Uri.parse(i.avatarUrl) : undefined, + item: i, + picked: i.id === picked, + }; + }), + ); + } + } + + return items; + } + + const items = getItems(context.items); + + const step = createPickStep({ + title: context.title, + placeholder: !items.length ? 'All done! Take a vacation' : 'Choose an item to focus on', + matchOnDetail: true, + ignoreFocusOut: true, + items: !items.length ? [createDirectiveQuickPickItem(Directive.Cancel, undefined, { label: 'OK' })] : items, + buttons: [RefreshQuickInputButton], + // onDidChangeValue: async (quickpick, value) => {}, + onDidClickButton: async (quickpick, button) => { + if (button === RefreshQuickInputButton) { + quickpick.busy = true; + + try { + context.items = await this.container.focus.getCategorizedItems({ force: true }); + const items = getItems(context.items); + + quickpick.placeholder = !items.length + ? 'All done! Take a vacation' + : 'Choose an item to focus on'; + quickpick.items = items; + } finally { + quickpick.busy = false; + } + } + }, + + onDidClickItemButton: async (quickpick, button, { item }) => { + switch (button) { + case SnoozeQuickInputButton: + await this.container.focus.snooze(item); + break; + + case UnsnoozeQuickInputButton: + await this.container.focus.unsnooze(item); + break; + + case PinQuickInputButton: + await this.container.focus.pin(item); + break; + + case UnpinQuickInputButton: + await this.container.focus.unpin(item); + break; + + case MergeQuickInputButton: + await this.container.focus.merge(item); + break; + } + + quickpick.busy = true; + + try { + context.items = await this.container.focus.getCategorizedItems(); + const items = getItems(context.items); + + quickpick.placeholder = !items.length ? 'All done! Take a vacation' : 'Choose an item to focus on'; + quickpick.items = items; + } finally { + quickpick.busy = false; + } + }, + }); + + const selection: StepSelection = yield step; + return canPickStepContinue(step, state, selection) ? selection[0].item : StepResultBreak; + } + + private *confirmStep(state: FocusStepState, _context: Context): StepResultGenerator { + const confirmations: (QuickPickItemOfT | DirectiveQuickPickItem)[] = [ + createDirectiveQuickPickItem(Directive.Noop, false, { + label: state.item.title, + description: `${state.item.repoAndOwner}#${state.item.id} \u2022 ${fromNow(state.item.date)}`, + detail: interpolate(actionGroupMap.get(state.item.actionableCategory)![1], { + author: state.item.author, + }), + iconPath: state.item.avatarUrl != null ? Uri.parse(state.item.avatarUrl) : undefined, + }), + createQuickPickSeparator(), + createDirectiveQuickPickItem(Directive.Noop, false, { + label: '', + }), + ]; + + for (const action of state.item.suggestedActions) { + switch (action) { + case 'merge': + confirmations.push( + createQuickPickItemOfT( + { + label: 'Merge', + detail: 'Will merge the pull request', + }, + action, + ), + ); + break; + case 'open': + confirmations.push( + createQuickPickItemOfT( + { + label: 'Open on GitHub', + }, + action, + ), + ); + break; + case 'review': + confirmations.push( + createQuickPickItemOfT( + { + label: 'Start Review', + detail: 'Will checkout a branch or worktree to review this pull request', + }, + action, + ), + ); + break; + case 'switch': + confirmations.push( + createQuickPickItemOfT( + { + label: 'Switch to Branch or Worktree', + detail: 'Will checkout the branch or worktree for this pull request', + }, + action, + ), + ); + break; + case 'change-reviewers': + confirmations.push( + createQuickPickItemOfT( + { + label: 'Change Reviewers', + detail: 'Will change the reviewers for this pull request', + }, + action, + ), + ); + break; + case 'decline-review': + confirmations.push( + createQuickPickItemOfT( + { + label: 'Decline Review', + detail: 'Will decline the review for this pull request', + }, + action, + ), + ); + break; + case 'nudge': + confirmations.push( + createQuickPickItemOfT( + { + label: 'Nudge', + detail: 'Will nudge the reviewers on this pull request', + }, + action, + ), + ); + break; + } + } + + const step = this.createConfirmStep( + `Focus on ${state.item.repoAndOwner}#${state.item.id}`, + confirmations, + undefined, + { placeholder: 'Choose an action to perform' }, + ); + + const selection: StepSelection = yield step; + return canPickStepContinue(step, state, selection) ? selection[0].item : StepResultBreak; + } +} diff --git a/src/plus/focus/focusIndicator.ts b/src/plus/focus/focusIndicator.ts new file mode 100644 index 0000000000000..9452d3a2d4915 --- /dev/null +++ b/src/plus/focus/focusIndicator.ts @@ -0,0 +1,316 @@ +import type { ConfigurationChangeEvent, StatusBarItem, ThemeColor } from 'vscode'; +import { Disposable, MarkdownString, StatusBarAlignment, window } from 'vscode'; +import type { Container } from '../../container'; +import { registerCommand } from '../../system/command'; +import { configuration } from '../../system/configuration'; +import { groupByMap } from '../../system/iterable'; +import { pluralize } from '../../system/string'; +import type { FocusItem, FocusProvider, FocusRefreshEvent } from './focusProvider'; +import { focusGroups, groupAndSortFocusItems } from './focusProvider'; + +export class FocusIndicator implements Disposable { + private readonly _disposable: Disposable; + + private _statusBarFocus: StatusBarItem | undefined; + + private _refreshTimer: ReturnType | undefined; + + constructor( + private readonly container: Container, + private readonly focus: FocusProvider, + ) { + this._disposable = Disposable.from( + focus.onDidRefresh(this.onFocusRefreshed, this), + configuration.onDidChange(this.onConfigurationChanged, this), + ...this.registerCommands(), + ); + this.onReady(); + } + + dispose() { + this.clearRefreshTimer(); + this._statusBarFocus?.dispose(); + this._statusBarFocus = undefined!; + this._disposable.dispose(); + } + + private onConfigurationChanged(e: ConfigurationChangeEvent) { + if (!configuration.changed(e, 'focus.experimental.indicators')) return; + + if (configuration.changed(e, 'focus.experimental.indicators.openQuickFocus')) { + this.updateStatusBarFocusCommand(); + } + + if (configuration.changed(e, 'focus.experimental.indicators.data')) { + if (configuration.changed(e, 'focus.experimental.indicators.data.enabled')) { + if ( + configuration.get('focus.experimental.indicators.data.enabled') && + configuration.get('focus.experimental.indicators.data.refreshRate') > 0 + ) { + this.updateStatusBar('loading'); + } else { + this.updateStatusBar('idle'); + } + } else if (configuration.changed(e, 'focus.experimental.indicators.data.refreshRate')) { + this.startRefreshTimer(); + } + } + } + + private onFocusRefreshed(e: FocusRefreshEvent) { + if (this._statusBarFocus == null || !configuration.get('focus.experimental.indicators.data.enabled')) return; + this.updateStatusBar('data', e.items); + } + + private onReady(): void { + if (!configuration.get('focus.experimental.indicators.enabled')) { + return; + } + + this._statusBarFocus = window.createStatusBarItem('gitlens.focus', StatusBarAlignment.Left, 10000 - 2); + this._statusBarFocus.name = 'GitLens Focus'; + if ( + configuration.get('focus.experimental.indicators.data.enabled') && + configuration.get('focus.experimental.indicators.data.refreshRate') > 0 + ) { + this.updateStatusBar('loading'); + } else { + this.updateStatusBar('idle'); + } + this.updateStatusBarFocusCommand(); + this._statusBarFocus.show(); + } + + private updateStatusBarFocusCommand() { + if (this._statusBarFocus == null) return; + + this._statusBarFocus.command = configuration.get('focus.experimental.indicators.openQuickFocus') + ? 'gitlens.quickFocus' + : 'gitlens.showFocusPage'; + } + + private startRefreshTimer(immediate: boolean = false) { + if (this._refreshTimer != null) { + clearInterval(this._refreshTimer); + } + + if (!configuration.get('focus.experimental.indicators.data.enabled')) return; + + const refreshInterval = configuration.get('focus.experimental.indicators.data.refreshRate') * 1000 * 60; + if (refreshInterval <= 0) return; + + if (immediate) { + void this.focus.getCategorizedItems({ force: true }); + } + + this._refreshTimer = setInterval(() => { + void this.focus.getCategorizedItems({ force: true }); + }, refreshInterval); + } + + private clearRefreshTimer() { + if (this._refreshTimer != null) { + clearInterval(this._refreshTimer); + this._refreshTimer = undefined; + } + } + + private updateStatusBar(state: 'loading' | 'idle' | 'data', categorizedItems?: FocusItem[]) { + if (this._statusBarFocus == null) return; + this._statusBarFocus.tooltip = new MarkdownString('', true); + this._statusBarFocus.tooltip.supportHtml = true; + this._statusBarFocus.tooltip.isTrusted = true; + if (state === 'loading') { + this._statusBarFocus.text = '$(loading~spin)'; + this._statusBarFocus.tooltip.appendMarkdown('Loading...'); + this._statusBarFocus.color = undefined; + setTimeout(() => this.startRefreshTimer(true), 5000); + } else if (state === 'idle') { + this.clearRefreshTimer(); + this._statusBarFocus.text = '$(target)'; + this._statusBarFocus.tooltip.appendMarkdown('Click to open Focus'); + this._statusBarFocus.color = undefined; + } else if (state === 'data') { + let color: string | ThemeColor | undefined = undefined; + let topItem: { item: FocusItem; groupLabel: string } | undefined; + const groupedItems = groupAndSortFocusItems(categorizedItems); + if (!groupedItems?.size) { + this._statusBarFocus.tooltip.appendMarkdown('You are all caught up!'); + } else { + for (const group of focusGroups) { + const items = groupedItems.get(group); + if (items?.length) { + if (this._statusBarFocus.tooltip.value.length > 0) { + this._statusBarFocus.tooltip.appendMarkdown(`\n\n---\n\n`); + } + switch (group) { + case 'mergeable': + this._statusBarFocus.tooltip.appendMarkdown( + `$(circle-filled) You have ${pluralize( + 'pull request', + items.length, + )} that can be merged.`, + ); + this._statusBarFocus.tooltip.appendMarkdown('\n'); + this._statusBarFocus.tooltip.appendMarkdown( + `[Show all mergeable](command:gitlens.quickFocus?${encodeURIComponent( + JSON.stringify({ state: { initialGroup: 'mergeable' } }), + )})`, + ); + color = '#00FF00'; + topItem ??= { item: items[0], groupLabel: 'can be merged' }; + break; + case 'blocked': { + const action = groupByMap(items, i => + i.actionableCategory === 'failed-checks' || + i.actionableCategory === 'mergeable-conflicts' || + i.actionableCategory === 'conflicts' + ? i.actionableCategory + : 'blocked', + ); + let item: FocusItem | undefined; + + let actionGroupItems = action.get('failed-checks'); + if (actionGroupItems?.length) { + const message = `You have ${pluralize( + 'pull request', + actionGroupItems.length, + )} that ${actionGroupItems.length > 1 ? 'have' : 'has'} failed CI checks.`; + this._statusBarFocus.tooltip.appendMarkdown( + `$(circle-filled) ${message}`, + ); + item ??= actionGroupItems[0]; + } + + actionGroupItems = action.get('mergeable-conflicts'); + if (actionGroupItems?.length) { + const message = `You have ${pluralize( + 'pull request', + actionGroupItems.length, + )} that can be merged once conflicts are resolved.`; + this._statusBarFocus.tooltip.appendMarkdown( + `$(circle-filled) ${message}`, + ); + item ??= actionGroupItems[0]; + } + + actionGroupItems = action.get('conflicts'); + if (actionGroupItems?.length) { + const message = `You have ${pluralize( + 'pull request', + actionGroupItems.length, + )} that ${actionGroupItems.length > 1 ? 'have' : 'has'} conflicts.`; + this._statusBarFocus.tooltip.appendMarkdown( + `$(circle-filled) ${message}`, + ); + item ??= actionGroupItems[0]; + } + + actionGroupItems = action.get('blocked'); + if (actionGroupItems?.length) { + const message = `You have ${pluralize( + 'pull request', + actionGroupItems.length, + )} that ${actionGroupItems.length > 1 ? 'need' : 'needs'} attention.`; + this._statusBarFocus.tooltip.appendMarkdown( + `$(circle-filled) ${message}`, + ); + item ??= actionGroupItems[0]; + } + + color ??= '#FF0000'; + if (item != null) { + this._statusBarFocus.tooltip.appendMarkdown('\n'); + this._statusBarFocus.tooltip.appendMarkdown( + `[Show all blocked](command:gitlens.quickFocus?${encodeURIComponent( + JSON.stringify({ state: { initialGroup: 'blocked' } }), + )})`, + ); + let label = 'is blocked'; + if (item.actionableCategory === 'failed-checks') { + label = 'failed CI checks'; + } else if ( + item.actionableCategory === 'mergeable-conflicts' || + item.actionableCategory === 'conflicts' + ) { + label = 'has conflicts'; + } + topItem ??= { item: item, groupLabel: label }; + } + break; + } + case 'needs-review': + this._statusBarFocus.tooltip.appendMarkdown( + `$(circle-filled) You have ${pluralize( + 'pull request', + items.length, + )} that ${items.length > 1 ? 'are' : 'is'} waiting for your review.`, + ); + this._statusBarFocus.tooltip.appendMarkdown('\n'); + this._statusBarFocus.tooltip.appendMarkdown( + `[Show all waiting for review](command:gitlens.quickFocus?${encodeURIComponent( + JSON.stringify({ state: { initialGroup: 'needs-review' } }), + )})`, + ); + color ??= '#FFFF00'; + topItem ??= { item: items[0], groupLabel: 'needs your review' }; + break; + case 'follow-up': + this._statusBarFocus.tooltip.appendMarkdown( + `$(circle-filled) You have ${pluralize( + 'pull request', + items.length, + )} that ${items.length > 1 ? 'have' : 'has'} been reviewed and ${ + items.length > 1 ? 'require' : 'requires' + } follow-up.`, + ); + this._statusBarFocus.tooltip.appendMarkdown('\n'); + this._statusBarFocus.tooltip.appendMarkdown( + `[Show all requiring follow-up](command:gitlens.quickFocus?${encodeURIComponent( + JSON.stringify({ state: { initialGroup: 'follow-up' } }), + )})`, + ); + color ??= '#FFA500'; + topItem ??= { item: items[0], groupLabel: 'requires follow-up' }; + break; + } + } + } + } + + this._statusBarFocus.text = topItem ? `$(target) #${topItem.item.id} ${topItem.groupLabel}` : '$(target)'; + this._statusBarFocus.color = color; + } + + this._statusBarFocus.tooltip.appendMarkdown('\n\n---\n\n'); + this._statusBarFocus.tooltip.appendMarkdown( + configuration.get('focus.experimental.indicators.data.enabled') + ? `[Mute](command:gitlens.focus.experimental.updateIndicators?"mute")` + : `[Unmute](command:gitlens.focus.experimental.updateIndicators?"unmute")`, + ); + this._statusBarFocus.tooltip.appendMarkdown('\t\t'); + this._statusBarFocus.tooltip.appendMarkdown( + `[Hide](command:gitlens.focus.experimental.updateIndicators?"hide")`, + ); + } + + private registerCommands(): Disposable[] { + return [ + registerCommand('gitlens.focus.experimental.updateIndicators', (action: string) => { + switch (action) { + case 'mute': + void configuration.updateEffective('focus.experimental.indicators.data.enabled', false); + break; + case 'unmute': + void configuration.updateEffective('focus.experimental.indicators.data.enabled', true); + break; + case 'hide': + this._statusBarFocus?.hide(); + break; + default: + break; + } + }), + ]; + } +} diff --git a/src/plus/focus/focusProvider.ts b/src/plus/focus/focusProvider.ts new file mode 100644 index 0000000000000..be52fe9f6d987 --- /dev/null +++ b/src/plus/focus/focusProvider.ts @@ -0,0 +1,585 @@ +import type { CancellationToken } from 'vscode'; +import { Disposable, env, EventEmitter, Uri } from 'vscode'; +import type { Container } from '../../container'; +import { CancellationError } from '../../errors'; +import type { SearchedIssue } from '../../git/models/issue'; +import { RepositoryAccessLevel } from '../../git/models/issue'; +import type { SearchedPullRequest } from '../../git/models/pullRequest'; +import { + PullRequestMergeableState, + PullRequestReviewDecision, + PullRequestStatusCheckRollupState, +} from '../../git/models/pullRequest'; +import type { ProviderReference } from '../../git/models/remoteProvider'; +import type { GkProviderId, RepositoryIdentityDescriptor } from '../../gk/models/repositoryIdentities'; +import { configuration } from '../../system/configuration'; +import { getSettledValue } from '../../system/promise'; +import type { UriTypes } from '../../uris/deepLinks/deepLink'; +import { DeepLinkType } from '../../uris/deepLinks/deepLink'; +import { HostingIntegrationId } from '../integrations/providers/models'; +import type { EnrichableItem, EnrichedItem } from './enrichmentService'; + +export const focusActionCategories = [ + 'mergeable', + 'mergeable-conflicts', + 'failed-checks', + 'needs-review', + 'conflicts', + 'changes-requested', + 'waiting-for-review', +] as const; +export type FocusActionCategory = (typeof focusActionCategories)[number]; + +export const focusGroups = [ + 'pinned', + 'mergeable', + 'blocked', + 'follow-up', + 'needs-attention', + 'needs-review', + 'waiting-for-review', + 'snoozed', +] as const; +export type FocusGroup = (typeof focusGroups)[number]; + +export const focusCategoryToGroupMap = new Map([ + // ['pinned', 'pinned'], + ['mergeable', 'mergeable'], + ['mergeable-conflicts', 'blocked'], + ['failed-checks', 'blocked'], + ['conflicts', 'blocked'], + ['needs-review', 'needs-review'], + ['changes-requested', 'follow-up'], + ['waiting-for-review', 'waiting-for-review'], + // ['snoozed', 'snoozed'], +]); + +export type FocusAction = 'open' | 'merge' | 'review' | 'switch' | 'change-reviewers' | 'nudge' | 'decline-review'; + +const prActionsMap = new Map([ + ['mergeable', ['merge', 'switch', 'open']], + ['mergeable-conflicts', ['switch', 'open']], + ['failed-checks', ['switch', 'open']], + ['conflicts', ['switch', 'open']], + ['needs-review', ['review', /* 'decline-review', */ 'open']], + ['changes-requested', ['switch', 'open']], + ['waiting-for-review', [/* 'nudge', 'change-reviewers', */ 'switch', 'open']], +]); + +export type FocusItem = { + type: 'pullRequest' | 'issue'; + provider: ProviderReference; + id: string; + uniqueId: string; + isNew: boolean; + title: string; + date: Date; + author: string; + avatarUrl?: string; + repoAndOwner?: string; + url: string; + + enrichable: EnrichableItem; + enriched?: EnrichedItem; + + actionableCategory: FocusActionCategory; + suggestedActions: FocusAction[]; + + pinned: boolean; + snoozed: boolean; + sortTime: number; + + repositoryIdentity?: RepositoryIdentityDescriptor; + ref?: { + branchName: string; + sha: string; + remoteName: string; + }; +}; + +type CachedFocusPromise = { + expiresAt: number; + promise: Promise; +}; + +const cacheExpiration = 1000 * 60 * 30; // 30 minutes + +export interface FocusRefreshEvent { + items: FocusItem[]; +} + +export class FocusProvider implements Disposable { + private readonly _onDidChange = new EventEmitter(); + get onDidChange() { + return this._onDidChange.event; + } + + private readonly _onDidRefresh = new EventEmitter(); + get onDidRefresh() { + return this._onDidRefresh.event; + } + + private readonly _disposable: Disposable; + + constructor(private readonly container: Container) { + this._disposable = Disposable + .from + // configuration.onDidChange(this.onConfigurationChanged, this), + (); + } + + dispose() { + this._disposable.dispose(); + } + + private _issues: CachedFocusPromise | undefined; + private async getIssues(options?: { cancellation?: CancellationToken; force?: boolean }) { + if (options?.force || this._issues == null || this._issues.expiresAt < Date.now()) { + this._issues = { + promise: this.container.integrations.getMyIssues([HostingIntegrationId.GitHub], options?.cancellation), + expiresAt: Date.now() + cacheExpiration, + }; + } + + return this._issues?.promise; + } + + private _prs: CachedFocusPromise | undefined; + private async getPullRequests(options?: { cancellation?: CancellationToken; force?: boolean }) { + if (options?.force || this._prs == null || this._prs.expiresAt < Date.now()) { + this._prs = { + promise: this.container.integrations.getMyPullRequests( + [HostingIntegrationId.GitHub], + options?.cancellation, + ), + expiresAt: Date.now() + cacheExpiration, + }; + } + + return this._prs?.promise; + } + + private _enrichedItems: CachedFocusPromise | undefined; + private async getEnrichedItems(options?: { cancellation?: CancellationToken; force?: boolean }) { + if (options?.force || this._enrichedItems == null || this._enrichedItems.expiresAt < Date.now()) { + this._enrichedItems = { + promise: this.container.enrichments.get(undefined, options?.cancellation), + expiresAt: Date.now() + cacheExpiration, + }; + } + + return this._enrichedItems?.promise; + } + + private _groupedIds: Map | undefined; + + refresh() { + this._issues = undefined; + this._prs = undefined; + this._enrichedItems = undefined; + + this._onDidChange.fire(); + } + + async pin(item: FocusItem) { + item.pinned = true; + this._onDidChange.fire(); + + await this.container.enrichments.pinItem(item.enrichable); + this._enrichedItems = undefined; + this._onDidChange.fire(); + } + + async unpin(item: FocusItem) { + item.pinned = false; + this._onDidChange.fire(); + + if (item.enriched == null) return; + await this.container.enrichments.unpinItem(item.enriched.id); + this._enrichedItems = undefined; + this._onDidChange.fire(); + } + + async snooze(item: FocusItem) { + item.snoozed = true; + this._onDidChange.fire(); + + await this.container.enrichments.snoozeItem(item.enrichable); + this._enrichedItems = undefined; + this._onDidChange.fire(); + } + + async unsnooze(item: FocusItem) { + item.snoozed = false; + this._onDidChange.fire(); + + if (item.enriched == null) return; + await this.container.enrichments.unsnoozeItem(item.enriched.id); + this._enrichedItems = undefined; + this._onDidChange.fire(); + } + + async merge(item: FocusItem): Promise { + if (item.uniqueId == null || item.ref?.sha == null) return; + // TODO: Include other providers. + if (item.provider.id !== 'github') return; + const integrations = await this.container.integrations.get(HostingIntegrationId.GitHub); + await integrations.mergePullRequest({ id: item.uniqueId, headRefSha: item.ref.sha }); + this.refresh(); + } + + async switchTo(item: FocusItem): Promise { + const deepLinkUrl = await this.getItemBranchDeepLink(item); + if (deepLinkUrl == null) return; + + await env.openExternal(deepLinkUrl); + } + + private async getItemBranchDeepLink(item: FocusItem): Promise { + if (item.type !== 'pullRequest' || item.ref == null || item.repositoryIdentity?.remote?.url == null) + return undefined; + const schemeOverride = configuration.get('deepLinks.schemeOverride'); + const scheme = !schemeOverride ? 'vscode' : schemeOverride === true ? env.uriScheme : schemeOverride; + + // TODO: Get the proper pull URL from the provider, rather than tacking .git at the end of the + // url from the head ref. + return env.asExternalUri( + Uri.parse( + `${scheme}://${this.container.context.extension.id}/${'link' satisfies UriTypes}/${ + DeepLinkType.Repository + }/-/${DeepLinkType.Branch}/${item.ref.branchName}?url=${encodeURIComponent( + ensureRemoteUrl(item.repositoryIdentity.remote.url), + )}&action=switch`, + ), + ); + } + + /* async locateItemRepository( + item: FocusItem, + options?: { force?: boolean; openIfNeeded?: boolean; keepOpen?: boolean; prompt?: boolean }, + ): Promise { + if (item.repository != null && !options?.force) return item.repository; + if (item.repositoryIdentity == null) return undefined; + + return this.container.repositoryIdentity.getRepository(item.repositoryIdentity, { + ...options, + skipRefValidation: true, + }); + } + + async getItemBranchRef(item: FocusItem): Promise { + if (item.ref?.remoteName == null || item.repository == null) return undefined; + + const remoteName = item.ref.remoteName; + const remotes = await item.repository.getRemotes({ filter: r => r.provider?.owner === remoteName }); + const matchingRemote = remotes.length > 0 ? remotes[0] : undefined; + let remoteBranchName = `${item.ref.remoteName}/${item.ref.branchName}`; + if (matchingRemote != null) { + remoteBranchName = `${matchingRemote.name}/${item.ref.branchName}`; + const matchingRemoteBranches = ( + await item.repository.getBranches({ filter: b => b.remote && b.name === remoteBranchName }) + )?.values; + if (matchingRemoteBranches?.length) return matchingRemoteBranches[0]; + } + + return createReference(remoteBranchName, item.repository.path, { + refType: 'branch', + id: getBranchId(item.repository.path, true, remoteBranchName), + name: remoteBranchName, + remote: true, + }); + } */ + + async getCategorizedItems( + options?: { force?: boolean; issues?: boolean; prs?: boolean }, + cancellation?: CancellationToken, + ): Promise { + const enrichedItemsPromise = this.getEnrichedItems({ force: options?.force, cancellation: cancellation }); + + if (this.container.git.isDiscoveringRepositories) { + await this.container.git.isDiscoveringRepositories; + } + + if (cancellation?.isCancellationRequested) throw new CancellationError(); + + const [enrichedItemsResult, /*issuesResult,*/ prsResult] = await Promise.allSettled([ + enrichedItemsPromise, + // options?.issues !== false + // ? this.getIssues({ force: options?.force, cancellation: cancellation }) + // : undefined, + options?.prs !== false + ? this.getPullRequests({ force: options?.force, cancellation: cancellation }) + : undefined, + ]); + + if (cancellation?.isCancellationRequested) throw new CancellationError(); + + const enrichedItems = new Map(getSettledValue(enrichedItemsResult)?.map(i => [i.entityId, i])); + + const categorized: FocusItem[] = []; + + // TODO: Since this is all repos we probably should order by repos you are a contributor on (or even filter out one you aren't) + + const prs = getSettledValue(prsResult); + if (prs != null) { + outer: for (const pr of prs) { + if (pr.pullRequest.isDraft) continue; + + const enrichedItem = enrichedItems.get(pr.pullRequest.nodeId!); + + if (pr.reasons.includes('authored')) { + if (pr.pullRequest.statusCheckRollupState === PullRequestStatusCheckRollupState.Failed) { + categorized.push(this.createFocusItem('failed-checks', pr, enrichedItem)); + continue; + } + + const viewerHasMergeAccess = + pr.pullRequest.viewerCanUpdate && + pr.pullRequest.repository.accessLevel != null && + pr.pullRequest.repository.accessLevel >= RepositoryAccessLevel.Write; + + switch (pr.pullRequest.mergeableState) { + case PullRequestMergeableState.Mergeable: + switch (pr.pullRequest.reviewDecision) { + case PullRequestReviewDecision.Approved: + if (viewerHasMergeAccess) { + categorized.push(this.createFocusItem('mergeable', pr, enrichedItem)); + } // TODO: should it be on in any group if you can't merge? maybe need to check if you are a contributor to the repo or something + continue outer; + case PullRequestReviewDecision.ChangesRequested: + categorized.push(this.createFocusItem('changes-requested', pr, enrichedItem)); + continue outer; + case PullRequestReviewDecision.ReviewRequired: + categorized.push(this.createFocusItem('waiting-for-review', pr, enrichedItem)); + continue outer; + case undefined: + if (pr.pullRequest.reviewRequests?.length) { + categorized.push(this.createFocusItem('waiting-for-review', pr, enrichedItem)); + continue outer; + } else { + categorized.push(this.createFocusItem('waiting-for-review', pr, enrichedItem)); + continue outer; + } + break; + } + break; + case PullRequestMergeableState.Conflicting: + if ( + pr.pullRequest.reviewDecision === PullRequestReviewDecision.Approved && + viewerHasMergeAccess + ) { + categorized.push(this.createFocusItem('mergeable-conflicts', pr, enrichedItem)); + } else { + categorized.push(this.createFocusItem('conflicts', pr, enrichedItem)); + } + continue outer; + } + } + + if (pr.reasons.includes('review-requested')) { + // Skip adding if there are failed CI checks + if (pr.pullRequest.statusCheckRollupState === PullRequestStatusCheckRollupState.Failed) continue; + + categorized.push(this.createFocusItem('needs-review', pr, enrichedItem)); + continue; + } + } + } + + // const issues = getSettledValue(issuesResult); + // if (issues != null) { + // for (const issue of issues.splice(0, 3)) { + // let next = false; + + // const enrichedItem = enrichedItems.get(issue.issue.nodeId!); + // if (enrichedItem != null) { + // switch (enrichedItem.type) { + // case 'pin': + // addItemToGroup(grouped, 'Pinned', issue); + // next = true; + // break; + // case 'snooze': + // addItemToGroup(grouped, 'Snoozed', issue); + // next = true; + // break; + // } + + // if (next) continue; + // } + + // if (issue.reasons.includes('assigned')) { + // addItemToGroup(grouped, 'In Progress', issue); + // continue; + // } + // } + // } + + // // Sort the grouped map by the order of the Groups array + // const sorted = new Map(); + // for (const group of actionCategories) { + // const items = categorized.get(group); + // if (items == null) continue; + + // sorted.set( + // group, + // items.sort((a, b) => (a.pinned ? -1 : 1) - (b.pinned ? -1 : 1) || b.sortTime - a.sortTime), + // ); + // } + + this.updateGroupedIds(categorized); + this._onDidRefresh.fire({ items: categorized }); + return categorized; + } + + private createFocusItem( + category: FocusActionCategory, + item: SearchedPullRequest | SearchedIssue, + enriched?: EnrichedItem, + ): FocusItem { + return 'pullRequest' in item + ? { + type: 'pullRequest', + provider: item.pullRequest.provider, + id: item.pullRequest.id, + uniqueId: item.pullRequest.nodeId!, + isNew: + this._groupedIds != null && + this._groupedIds.get(item.pullRequest.nodeId!) != focusCategoryToGroupMap.get(category), + title: item.pullRequest.title, + date: item.pullRequest.updatedDate, + author: item.pullRequest.author.name, + avatarUrl: item.pullRequest.author.avatarUrl, + repoAndOwner: `${item.pullRequest.repository.owner}/${item.pullRequest.repository.repo}`, + url: item.pullRequest.url, + + enrichable: { + type: 'pr', + id: item.pullRequest.nodeId!, + url: item.pullRequest.url, + provider: 'github', + }, + enriched: enriched, + + actionableCategory: category, + suggestedActions: prActionsMap.get(category)!, + + pinned: enriched?.type === 'pin', + snoozed: enriched?.type === 'snooze', + sortTime: item.pullRequest.updatedDate.getTime(), + repositoryIdentity: { + remote: { url: item.pullRequest.refs?.head?.url }, + name: item.pullRequest.repository.repo, + provider: { + // TODO: fix this typing, set according to item + id: 'github' as GkProviderId, + repoDomain: item.pullRequest.repository.owner, + repoName: item.pullRequest.repository.repo, + }, + }, + ref: + item.pullRequest.refs?.head != null + ? { + branchName: item.pullRequest.refs.head.branch, + sha: item.pullRequest.refs.head.sha, + remoteName: item.pullRequest.refs.head.owner, + } + : undefined, + } + : { + type: 'issue', + provider: item.issue.provider, + id: item.issue.id, + uniqueId: item.issue.nodeId!, + isNew: + this._groupedIds != null && + this._groupedIds.get(item.issue.nodeId!) != focusCategoryToGroupMap.get(category), + title: item.issue.title, + date: item.issue.updatedDate, + author: item.issue.author.name, + avatarUrl: item.issue.author.avatarUrl, + repoAndOwner: `${item.issue.repository?.owner}/${item.issue.repository?.repo}`, + url: item.issue.url, + + enrichable: { + type: 'issue', + id: item.issue.nodeId!, + url: item.issue.url, + provider: 'github', + }, + enriched: enriched, + + actionableCategory: category, + suggestedActions: [], + + pinned: enriched?.type === 'pin', + snoozed: enriched?.type === 'snooze', + sortTime: item.issue.updatedDate.getTime(), + repositoryIdentity: + item.issue.repository != null + ? { + name: item.issue.repository?.repo, + provider: { + // TODO: fix this typing, set according to item + id: 'github' as GkProviderId, + repoDomain: item.issue.repository?.owner, + repoName: item.issue.repository?.repo, + }, + } + : undefined, + }; + } + + private updateGroupedIds(items: FocusItem[]) { + const groupedIds = new Map(); + for (const item of items) { + const group = focusCategoryToGroupMap.get(item.actionableCategory); + if (group == null) continue; + + if (!groupedIds.has(item.uniqueId)) { + groupedIds.set(item.uniqueId, group); + } + } + + this._groupedIds = groupedIds; + } +} + +export function groupAndSortFocusItems(items?: FocusItem[]) { + if (items == null || items.length === 0) return new Map(); + const grouped = new Map(focusGroups.map(g => [g, []])); + + sortFocusItems(items); + + for (const item of items) { + if (item.pinned) { + grouped.get('pinned')?.push(item); + } else if (item.snoozed) { + grouped.get('snoozed')?.push(item); + continue; + } + + const group = focusCategoryToGroupMap.get(item.actionableCategory); + if (group == null) continue; + + grouped.get(group)?.push(item); + } + + return grouped; +} + +export function sortFocusItems(items: FocusItem[]) { + return items.sort( + (a, b) => + (a.pinned ? -1 : 1) - (b.pinned ? -1 : 1) || + focusActionCategories.indexOf(b.actionableCategory) - focusActionCategories.indexOf(a.actionableCategory) || + b.sortTime - a.sortTime, + ); +} + +function ensureRemoteUrl(url: string) { + if (url.startsWith('https')) { + return url.endsWith('.git') ? url : `${url}.git`; + } + + return url; +} diff --git a/src/plus/integrations/integration.ts b/src/plus/integrations/integration.ts index f79925166d222..4a3ffd36bcc1c 100644 --- a/src/plus/integrations/integration.ts +++ b/src/plus/integrations/integration.ts @@ -8,7 +8,12 @@ import type { PagedResult } from '../../git/gitProvider'; import type { Account } from '../../git/models/author'; import type { DefaultBranch } from '../../git/models/defaultBranch'; import type { IssueOrPullRequest, SearchedIssue } from '../../git/models/issue'; -import type { PullRequest, PullRequestState, SearchedPullRequest } from '../../git/models/pullRequest'; +import type { + PullRequest, + PullRequestMergeMethod, + PullRequestState, + SearchedPullRequest, +} from '../../git/models/pullRequest'; import type { RepositoryMetadata } from '../../git/models/repositoryMetadata'; import { showIntegrationDisconnectedTooManyFailedRequestsWarningMessage } from '../../messages'; import { configuration } from '../../system/configuration'; @@ -571,6 +576,34 @@ export abstract class HostingIntegration< id: string, ): Promise; + async mergePullRequest( + pr: PullRequest | { id: string; headRefSha: string }, + options?: { + mergeMethod?: PullRequestMergeMethod; + }, + ): Promise { + const scope = getLogScope(); + + const connected = this.maybeConnected ?? (await this.isConnected()); + if (!connected) return false; + + try { + const result = await this.mergeProviderPullRequest(this._session!, pr, options); + this.resetRequestExceptionCount(); + return result; + } catch (ex) { + return this.handleProviderException(ex, scope, false); + } + } + + protected abstract mergeProviderPullRequest( + session: ProviderAuthenticationSession, + pr: PullRequest | { id: string; headRefSha: string }, + options?: { + mergeMethod?: PullRequestMergeMethod; + }, + ): Promise; + @debug() async getPullRequestForBranch( repo: T, diff --git a/src/plus/integrations/providers/azureDevOps.ts b/src/plus/integrations/providers/azureDevOps.ts index 5c52ec717fa01..066ad412dcb0c 100644 --- a/src/plus/integrations/providers/azureDevOps.ts +++ b/src/plus/integrations/providers/azureDevOps.ts @@ -3,7 +3,12 @@ import type { PagedResult } from '../../../git/gitProvider'; import type { Account } from '../../../git/models/author'; import type { DefaultBranch } from '../../../git/models/defaultBranch'; import type { IssueOrPullRequest, SearchedIssue } from '../../../git/models/issue'; -import type { PullRequest, PullRequestState, SearchedPullRequest } from '../../../git/models/pullRequest'; +import type { + PullRequest, + PullRequestMergeMethod, + PullRequestState, + SearchedPullRequest, +} from '../../../git/models/pullRequest'; import type { RepositoryMetadata } from '../../../git/models/repositoryMetadata'; import { Logger } from '../../../system/logger'; import type { IntegrationAuthenticationProviderDescriptor } from '../authentication/integrationAuthentication'; @@ -55,6 +60,16 @@ export class AzureDevOpsIntegration extends HostingIntegration< } // TODO: implement + protected override async mergeProviderPullRequest( + _session: AuthenticationSession, + _pr: PullRequest | { id: string; headRefSha: string }, + _options?: { + mergeMethod?: PullRequestMergeMethod; + }, + ): Promise { + return Promise.resolve(false); + } + protected override async getProviderAccountForCommit( _session: AuthenticationSession, _repo: AzureRepositoryDescriptor, diff --git a/src/plus/integrations/providers/bitbucket.ts b/src/plus/integrations/providers/bitbucket.ts index 67efac5a0cc9f..ee804fcf333d2 100644 --- a/src/plus/integrations/providers/bitbucket.ts +++ b/src/plus/integrations/providers/bitbucket.ts @@ -2,7 +2,12 @@ import type { AuthenticationSession } from 'vscode'; import type { Account } from '../../../git/models/author'; import type { DefaultBranch } from '../../../git/models/defaultBranch'; import type { IssueOrPullRequest, SearchedIssue } from '../../../git/models/issue'; -import type { PullRequest, PullRequestState, SearchedPullRequest } from '../../../git/models/pullRequest'; +import type { + PullRequest, + PullRequestMergeMethod, + PullRequestState, + SearchedPullRequest, +} from '../../../git/models/pullRequest'; import type { RepositoryMetadata } from '../../../git/models/repositoryMetadata'; import type { IntegrationAuthenticationProviderDescriptor } from '../authentication/integrationAuthentication'; import type { ResourceDescriptor } from '../integration'; @@ -34,6 +39,16 @@ export class BitbucketIntegration extends HostingIntegration< } // TODO: implement + protected override async mergeProviderPullRequest( + _session: AuthenticationSession, + _pr: PullRequest | { id: string; headRefSha: string }, + _options?: { + mergeMethod?: PullRequestMergeMethod; + }, + ): Promise { + return Promise.resolve(false); + } + protected override async getProviderAccountForCommit( _session: AuthenticationSession, _repo: BitbucketRepositoryDescriptor, diff --git a/src/plus/integrations/providers/github.ts b/src/plus/integrations/providers/github.ts index bef33a8cd83da..54cfa78ad3600 100644 --- a/src/plus/integrations/providers/github.ts +++ b/src/plus/integrations/providers/github.ts @@ -3,7 +3,8 @@ import type { Container } from '../../../container'; import type { Account } from '../../../git/models/author'; import type { DefaultBranch } from '../../../git/models/defaultBranch'; import type { IssueOrPullRequest, SearchedIssue } from '../../../git/models/issue'; -import type { PullRequest, PullRequestState, SearchedPullRequest } from '../../../git/models/pullRequest'; +import type { PullRequestMergeMethod, PullRequestState, SearchedPullRequest } from '../../../git/models/pullRequest'; +import { PullRequest } from '../../../git/models/pullRequest'; import type { RepositoryMetadata } from '../../../git/models/repositoryMetadata'; import { log } from '../../../system/decorators/log'; import type { IntegrationAuthenticationProviderDescriptor } from '../authentication/integrationAuthentication'; @@ -167,6 +168,23 @@ abstract class GitHubIntegrationBase extends cancellation, ); } + + protected override async mergeProviderPullRequest( + { accessToken }: AuthenticationSession, + pr: PullRequest | { id: string; headRefSha: string }, + options?: { + mergeMethod?: PullRequestMergeMethod; + }, + ): Promise { + const id = pr instanceof PullRequest ? pr.nodeId : pr.id; + const headRefSha = pr instanceof PullRequest ? pr.refs?.head?.sha : pr.headRefSha; + if (id == null || headRefSha == null) return false; + return ( + (await this.container.github)?.mergePullRequest(this, accessToken, id, headRefSha, { + mergeMethod: options?.mergeMethod, + }) ?? false + ); + } } export class GitHubIntegration extends GitHubIntegrationBase { diff --git a/src/plus/integrations/providers/github/github.ts b/src/plus/integrations/providers/github/github.ts index a9a74d4d332c2..4eaae823adae6 100644 --- a/src/plus/integrations/providers/github/github.ts +++ b/src/plus/integrations/providers/github/github.ts @@ -21,6 +21,7 @@ import type { Account } from '../../../../git/models/author'; import type { DefaultBranch } from '../../../../git/models/defaultBranch'; import type { IssueOrPullRequest, SearchedIssue } from '../../../../git/models/issue'; import type { PullRequest, SearchedPullRequest } from '../../../../git/models/pullRequest'; +import { PullRequestMergeMethod } from '../../../../git/models/pullRequest'; import { isSha } from '../../../../git/models/reference'; import type { Provider } from '../../../../git/models/remoteProvider'; import type { RepositoryMetadata } from '../../../../git/models/repositoryMetadata'; @@ -112,6 +113,7 @@ deletions updatedAt closedAt mergeable +viewerCanUpdate mergedAt mergedBy { login @@ -121,9 +123,11 @@ reactions(content: THUMBS_UP) { } repository { isFork + name owner { login } + viewerPermission } reviewDecision reviewRequests(first: 10) { @@ -140,6 +144,16 @@ reviewRequests(first: 10) { } } totalCommentsCount +commits(last: 1) { + nodes { + commit { + oid + statusCheckRollup { + state + } + } + } +} `; const issueNodeProperties = ` @@ -181,6 +195,7 @@ const issueNodeProperties = ` owner { login } + viewerPermission } } `; @@ -636,9 +651,11 @@ export class GitHubApi implements Disposable { } repository { isFork + name owner { login } + viewerPermission } isCrossRepository } @@ -757,10 +774,12 @@ export class GitHubApi implements Disposable { url } repository { + name isFork owner { login } + viewerPermission } isCrossRepository } @@ -2872,6 +2891,71 @@ export class GitHubApi implements Disposable { throw this.handleException(ex, provider, scope); } } + + @debug({ args: { 0: p => p.name, 1: '' } }) + async mergePullRequest( + provider: Provider, + token: string, + nodeId: string, + expectedSourceSha: string, + options?: { mergeMethod?: PullRequestMergeMethod; baseUrl?: string }, + cancellation?: CancellationToken, + ): Promise { + const scope = getLogScope(); + interface QueryResult { + pullRequest: GitHubPullRequest | null | undefined; + } + + let githubMergeStrategy; + switch (options?.mergeMethod) { + case PullRequestMergeMethod.Merge: { + githubMergeStrategy = 'MERGE'; + break; + } + + case PullRequestMergeMethod.Rebase: { + githubMergeStrategy = 'REBASE'; + break; + } + + case PullRequestMergeMethod.Squash: { + githubMergeStrategy = 'SQUASH'; + break; + } + } + + try { + const query = `mutation mergePullRequest( + $id: ID! + $expectedSourceSha: GitObjectID! + $mergeMethod: PullRequestMergeMethod +) { + mergePullRequest(input: { pullRequestId: $id, expectedHeadOid: $expectedSourceSha, mergeMethod: $mergeMethod }) { + pullRequest { + id + } + } +}`; + + const resp = await this.graphql( + provider, + token, + query, + { + id: nodeId, + expectedSourceSha: expectedSourceSha, + mergeMethod: githubMergeStrategy, + baseUrl: options?.baseUrl, + }, + scope, + cancellation, + ); + + return resp?.pullRequest?.id === nodeId; + } catch (ex) { + throw this.handleException(ex, provider, scope); + } + } } function isGitHubDotCom(options?: { baseUrl?: string }) { diff --git a/src/plus/integrations/providers/github/models.ts b/src/plus/integrations/providers/github/models.ts index 6098648cf4a80..1541fb690d82c 100644 --- a/src/plus/integrations/providers/github/models.ts +++ b/src/plus/integrations/providers/github/models.ts @@ -1,9 +1,14 @@ import type { Endpoints } from '@octokit/types'; import { GitFileIndexStatus } from '../../../../git/models/file'; import type { IssueLabel, IssueOrPullRequestType } from '../../../../git/models/issue'; -import { Issue } from '../../../../git/models/issue'; +import { Issue, RepositoryAccessLevel } from '../../../../git/models/issue'; import type { PullRequestState } from '../../../../git/models/pullRequest'; -import { PullRequest, PullRequestMergeableState, PullRequestReviewDecision } from '../../../../git/models/pullRequest'; +import { + PullRequest, + PullRequestMergeableState, + PullRequestReviewDecision, + PullRequestStatusCheckRollupState, +} from '../../../../git/models/pullRequest'; import type { Provider } from '../../../../git/models/remoteProvider'; export interface GitHubBlame { @@ -115,9 +120,11 @@ export interface GitHubPullRequest { repository: { isFork: boolean; + name: string; owner: { login: string; }; + viewerPermission: GitHubViewerPermission; }; isCrossRepository: boolean; @@ -131,6 +138,7 @@ export interface GitHubIssueDetailed extends GitHubIssueOrPullRequest { owner: { login: string; }; + viewerPermission: GitHubViewerPermission; }; labels?: { nodes: IssueLabel[] }; reactions?: { @@ -143,6 +151,7 @@ export interface GitHubIssueDetailed extends GitHubIssueOrPullRequest { export type GitHubPullRequestReviewDecision = 'CHANGES_REQUESTED' | 'APPROVED' | 'REVIEW_REQUIRED'; export type GitHubPullRequestMergeableState = 'MERGEABLE' | 'CONFLICTING' | 'UNKNOWN'; +export type GitHubPullRequestStatusCheckRollupState = 'SUCCESS' | 'FAILURE' | 'PENDING' | 'EXPECTED' | 'ERROR'; export interface GitHubDetailedPullRequest extends GitHubPullRequest { reviewDecision: GitHubPullRequestReviewDecision; @@ -151,12 +160,13 @@ export interface GitHubDetailedPullRequest extends GitHubPullRequest { checksUrl: string; totalCommentsCount: number; mergeable: GitHubPullRequestMergeableState; + viewerCanUpdate: boolean; additions: number; deletions: number; reviewRequests: { nodes: { asCodeOwner: boolean; - requestedReviewer: GitHubMember; + requestedReviewer: GitHubMember | null; }[]; }; assignees: { @@ -165,6 +175,16 @@ export interface GitHubDetailedPullRequest extends GitHubPullRequest { reactions: { totalCount: number; }; + commits: { + nodes: { + commit: { + oid: string; + statusCheckRollup: { + state: 'SUCCESS' | 'FAILURE' | 'PENDING' | 'EXPECTED' | 'ERROR'; + } | null; + }; + }[]; + }; } export function fromGitHubPullRequest(pr: GitHubPullRequest, provider: Provider): PullRequest { @@ -179,12 +199,18 @@ export function fromGitHubPullRequest(pr: GitHubPullRequest, provider: Provider) pr.id, pr.title, pr.permalink, + { + owner: pr.repository.owner.login, + repo: pr.repository.name, + accessLevel: fromGitHubViewerPermissionToAccessLevel(pr.repository.viewerPermission), + }, fromGitHubPullRequestState(pr.state), new Date(pr.createdAt), new Date(pr.updatedAt), pr.closedAt == null ? undefined : new Date(pr.closedAt), pr.mergedAt == null ? undefined : new Date(pr.mergedAt), undefined, + undefined, { head: { exists: pr.headRepository != null, @@ -267,6 +293,23 @@ export function toGitHubPullRequestMergeableState( } } +export function fromGitHubPullRequestStatusCheckRollupState( + state: GitHubPullRequestStatusCheckRollupState | null | undefined, +): PullRequestStatusCheckRollupState | undefined { + switch (state) { + case 'SUCCESS': + case 'EXPECTED': + return PullRequestStatusCheckRollupState.Success; + case 'FAILURE': + case 'ERROR': + return PullRequestStatusCheckRollupState.Failed; + case 'PENDING': + return PullRequestStatusCheckRollupState.Pending; + default: + return undefined; + } +} + export function fromGitHubPullRequestDetailed(pr: GitHubDetailedPullRequest, provider: Provider): PullRequest { return new PullRequest( provider, @@ -279,12 +322,18 @@ export function fromGitHubPullRequestDetailed(pr: GitHubDetailedPullRequest, pro pr.id, pr.title, pr.permalink, + { + owner: pr.repository.owner.login, + repo: pr.repository.name, + accessLevel: fromGitHubViewerPermissionToAccessLevel(pr.repository.viewerPermission), + }, fromGitHubPullRequestState(pr.state), new Date(pr.createdAt), new Date(pr.updatedAt), pr.closedAt == null ? undefined : new Date(pr.closedAt), pr.mergedAt == null ? undefined : new Date(pr.mergedAt), fromGitHubPullRequestMergeableState(pr.mergeable), + pr.viewerCanUpdate, { head: { exists: pr.headRepository != null, @@ -310,19 +359,26 @@ export function fromGitHubPullRequestDetailed(pr: GitHubDetailedPullRequest, pro pr.totalCommentsCount, pr.reactions.totalCount, fromGitHubPullRequestReviewDecision(pr.reviewDecision), - pr.reviewRequests.nodes.map(r => ({ - isCodeOwner: r.asCodeOwner, - reviewer: { - name: r.requestedReviewer.login, - avatarUrl: r.requestedReviewer.avatarUrl, - url: r.requestedReviewer.url, - }, - })), + pr.reviewRequests.nodes + .map(r => + r.requestedReviewer != null + ? { + isCodeOwner: r.asCodeOwner, + reviewer: { + name: r.requestedReviewer.login, + avatarUrl: r.requestedReviewer.avatarUrl, + url: r.requestedReviewer.url, + }, + } + : undefined, + ) + .filter((r?: T): r is T => Boolean(r)), pr.assignees.nodes.map(r => ({ name: r.login, avatarUrl: r.avatarUrl, url: r.url, })), + fromGitHubPullRequestStatusCheckRollupState(pr.commits.nodes[0].commit.statusCheckRollup?.state), ); } @@ -350,6 +406,7 @@ export function fromGitHubIssueDetailed(value: GitHubIssueDetailed, provider: Pr { owner: value.repository.owner.login, repo: value.repository.name, + accessLevel: fromGitHubViewerPermissionToAccessLevel(value.repository.viewerPermission), }, value.assignees.nodes.map(assignee => ({ name: assignee.login, @@ -368,6 +425,33 @@ export function fromGitHubIssueDetailed(value: GitHubIssueDetailed, provider: Pr ); } +type GitHubViewerPermission = + | 'ADMIN' // Can read, clone, and push to this repository. Can also manage issues, pull requests, and repository settings, including adding collaborators + | 'MAINTAIN' // Can read, clone, and push to this repository. They can also manage issues, pull requests, and some repository settings + | 'WRITE' // Can read, clone, and push to this repository. Can also manage issues and pull requests + | 'TRIAGE' // Can read and clone this repository. Can also manage issues and pull requests + | 'READ' // Can read and clone this repository. Can also open and comment on issues and pull requests + | 'NONE'; + +function fromGitHubViewerPermissionToAccessLevel( + permission: GitHubViewerPermission | null | undefined, +): RepositoryAccessLevel { + switch (permission) { + case 'ADMIN': + return RepositoryAccessLevel.Admin; + case 'MAINTAIN': + return RepositoryAccessLevel.Maintain; + case 'WRITE': + return RepositoryAccessLevel.Write; + case 'TRIAGE': + return RepositoryAccessLevel.Triage; + case 'READ': + return RepositoryAccessLevel.Read; + default: + return RepositoryAccessLevel.None; + } +} + export interface GitHubTag { name: string; target: { diff --git a/src/plus/integrations/providers/gitlab.ts b/src/plus/integrations/providers/gitlab.ts index bbc0fd3d76fdd..d5dd2482ea07c 100644 --- a/src/plus/integrations/providers/gitlab.ts +++ b/src/plus/integrations/providers/gitlab.ts @@ -3,7 +3,12 @@ import type { Container } from '../../../container'; import type { Account } from '../../../git/models/author'; import type { DefaultBranch } from '../../../git/models/defaultBranch'; import type { IssueOrPullRequest, SearchedIssue } from '../../../git/models/issue'; -import type { PullRequest, PullRequestState, SearchedPullRequest } from '../../../git/models/pullRequest'; +import type { + PullRequest, + PullRequestMergeMethod, + PullRequestState, + SearchedPullRequest, +} from '../../../git/models/pullRequest'; import type { RepositoryMetadata } from '../../../git/models/repositoryMetadata'; import { log } from '../../../system/decorators/log'; import type { IntegrationAuthenticationProviderDescriptor } from '../authentication/integrationAuthentication'; @@ -149,6 +154,16 @@ abstract class GitLabIntegrationBase extends ): Promise { return Promise.resolve(undefined); } + + protected override async mergeProviderPullRequest( + _session: AuthenticationSession, + _pr: PullRequest | { id: string; headRefSha: string }, + _options?: { + mergeMethod?: PullRequestMergeMethod; + }, + ): Promise { + return Promise.resolve(false); + } } export class GitLabIntegration extends GitLabIntegrationBase { diff --git a/src/plus/integrations/providers/gitlab/gitlab.ts b/src/plus/integrations/providers/gitlab/gitlab.ts index 6359f13ac3012..0712bd9c40587 100644 --- a/src/plus/integrations/providers/gitlab/gitlab.ts +++ b/src/plus/integrations/providers/gitlab/gitlab.ts @@ -495,6 +495,7 @@ export class GitLabApi implements Disposable { undefined, pr.title, pr.webUrl, + { owner: owner, repo: repo }, fromGitLabMergeRequestState(pr.state), new Date(pr.createdAt), new Date(pr.updatedAt), @@ -550,7 +551,7 @@ export class GitLabApi implements Disposable { ); } - return fromGitLabMergeRequestREST(mrs[0], provider); + return fromGitLabMergeRequestREST(mrs[0], provider, { owner: owner, repo: repo }); } catch (ex) { if (ex instanceof ProviderRequestNotFoundError) return undefined; diff --git a/src/plus/integrations/providers/gitlab/models.ts b/src/plus/integrations/providers/gitlab/models.ts index 6d3efc625ac77..fc64da10f2306 100644 --- a/src/plus/integrations/providers/gitlab/models.ts +++ b/src/plus/integrations/providers/gitlab/models.ts @@ -89,7 +89,11 @@ export interface GitLabMergeRequestREST { web_url: string; } -export function fromGitLabMergeRequestREST(pr: GitLabMergeRequestREST, provider: Provider): PullRequest { +export function fromGitLabMergeRequestREST( + pr: GitLabMergeRequestREST, + provider: Provider, + repo: { owner: string; repo: string }, +): PullRequest { return new PullRequest( provider, { @@ -101,6 +105,7 @@ export function fromGitLabMergeRequestREST(pr: GitLabMergeRequestREST, provider: undefined, pr.title, pr.web_url, + repo, fromGitLabMergeRequestState(pr.state), new Date(pr.created_at), new Date(pr.updated_at), diff --git a/src/plus/repos/repositoryIdentityService.ts b/src/plus/repos/repositoryIdentityService.ts index 8ecbf72553002..11a5e30f957ee 100644 --- a/src/plus/repos/repositoryIdentityService.ts +++ b/src/plus/repos/repositoryIdentityService.ts @@ -9,6 +9,7 @@ import { getRemoteProviderMatcher } from '../../git/remotes/remoteProviders'; import type { GkRepositoryId, RepositoryIdentity, + RepositoryIdentityDescriptor, RepositoryIdentityResponse, } from '../../gk/models/repositoryIdentities'; import { missingRepositoryId } from '../../gk/models/repositoryIdentities'; @@ -25,17 +26,17 @@ export class RepositoryIdentityService implements Disposable { getRepository( id: GkRepositoryId, - options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean }, + options?: { openIfNeeded?: boolean; keepOpen?: boolean; prompt?: boolean; skipRefValidation?: boolean }, ): Promise; getRepository( - identity: RepositoryIdentity, - options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean }, + identity: RepositoryIdentityDescriptor, + options?: { openIfNeeded?: boolean; keepOpen?: boolean; prompt?: boolean; skipRefValidation?: boolean }, ): Promise; @log() getRepository( - idOrIdentity: GkRepositoryId | RepositoryIdentity, - options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean }, + idOrIdentity: GkRepositoryId | RepositoryIdentityDescriptor, + options?: { openIfNeeded?: boolean; keepOpen?: boolean; prompt?: boolean; skipRefValidation?: boolean }, ): Promise { return this.locateRepository(idOrIdentity, options); } @@ -43,7 +44,7 @@ export class RepositoryIdentityService implements Disposable { @log() async getRepositoryOrIdentity( id: GkRepositoryId, - options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean }, + options?: { openIfNeeded?: boolean; keepOpen?: boolean; prompt?: boolean; skipRefValidation?: boolean }, ): Promise { const identity = await this.getRepositoryIdentity(id); return (await this.locateRepository(identity, options)) ?? identity; @@ -51,35 +52,50 @@ export class RepositoryIdentityService implements Disposable { private async locateRepository( id: GkRepositoryId, - options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean }, + options?: { openIfNeeded?: boolean; keepOpen?: boolean; prompt?: boolean; skipRefValidation?: boolean }, ): Promise; private async locateRepository( - identity: RepositoryIdentity, - options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean }, + identity: RepositoryIdentityDescriptor, + options?: { openIfNeeded?: boolean; keepOpen?: boolean; prompt?: boolean; skipRefValidation?: boolean }, ): Promise; private async locateRepository( - idOrIdentity: GkRepositoryId | RepositoryIdentity, - options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean }, + idOrIdentity: GkRepositoryId | RepositoryIdentityDescriptor, + options?: { openIfNeeded?: boolean; keepOpen?: boolean; prompt?: boolean; skipRefValidation?: boolean }, ): Promise; @log() private async locateRepository( - idOrIdentity: GkRepositoryId | RepositoryIdentity, - options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean }, + idOrIdentity: GkRepositoryId | RepositoryIdentityDescriptor, + options?: { openIfNeeded?: boolean; keepOpen?: boolean; prompt?: boolean; skipRefValidation?: boolean }, ): Promise { const identity = typeof idOrIdentity === 'string' ? await this.getRepositoryIdentity(idOrIdentity) : idOrIdentity; - const matches = await this.container.repositoryPathMapping.getLocalRepoPaths({ - remoteUrl: identity.remote?.url, - repoInfo: - identity.provider != null - ? { - provider: identity.provider.id, - owner: identity.provider.repoDomain, - repoName: identity.provider.repoName, - } - : undefined, - }); + const hasInitialCommitSha = + identity?.initialCommitSha != null && identity.initialCommitSha !== missingRepositoryId; + const hasRemoteUrl = identity?.remote?.url != null; + const hasProviderInfo = + identity?.provider?.id != null && + identity.provider.repoDomain != null && + identity.provider.repoName != null; + + if (!hasInitialCommitSha && !hasRemoteUrl && !hasProviderInfo) { + return undefined; + } + + const matches = + hasRemoteUrl || hasProviderInfo + ? await this.container.repositoryPathMapping.getLocalRepoPaths({ + remoteUrl: identity.remote?.url, + repoInfo: + identity.provider != null + ? { + provider: identity.provider.id, + owner: identity.provider.repoDomain, + repoName: identity.provider.repoName, + } + : undefined, + }) + : []; let foundRepo: Repository | undefined; if (matches.length) { @@ -92,7 +108,9 @@ export class RepositoryIdentityService implements Disposable { } if (foundRepo == null && options?.openIfNeeded) { - foundRepo = await this.container.git.getOrOpenRepository(Uri.file(matches[0]), { closeOnOpen: true }); + foundRepo = await this.container.git.getOrOpenRepository(Uri.file(matches[0]), { + closeOnOpen: !options?.keepOpen, + }); } } else { const [, remoteDomain, remotePath] = @@ -111,11 +129,7 @@ export class RepositoryIdentityService implements Disposable { } } - if ( - !options?.skipRefValidation && - identity.initialCommitSha != null && - identity.initialCommitSha !== missingRepositoryId - ) { + if (!options?.skipRefValidation && hasInitialCommitSha) { // Repo ID can be any valid SHA in the repo, though standard practice is to use the // first commit SHA. if (await this.container.git.validateReference(repo.uri, identity.initialCommitSha)) { @@ -150,7 +164,7 @@ export class RepositoryIdentityService implements Disposable { if (repoLocatedUri == null) return undefined; const locatedRepo = await this.container.git.getOrOpenRepository(repoLocatedUri, { - closeOnOpen: true, + closeOnOpen: !options?.keepOpen, detectNested: false, }); @@ -200,7 +214,7 @@ export class RepositoryIdentityService implements Disposable { }; } - private async addFoundRepositoryToMap(repo: Repository, identity?: RepositoryIdentity) { + private async addFoundRepositoryToMap(repo: Repository, identity?: RepositoryIdentityDescriptor) { const repoPath = repo.uri.fsPath; const remotes = await repo.getRemotes(); diff --git a/src/quickpicks/items/directive.ts b/src/quickpicks/items/directive.ts index 4ce7a718a384d..98afbf335613f 100644 --- a/src/quickpicks/items/directive.ts +++ b/src/quickpicks/items/directive.ts @@ -6,6 +6,7 @@ export enum Directive { Cancel, LoadMore, Noop, + Reload, RequiresVerification, ExtendTrial, @@ -19,6 +20,7 @@ export function isDirective(value: Directive | T): value is Directive { export interface DirectiveQuickPickItem extends QuickPickItem { directive: Directive; + onDidSelect?: () => void | Promise; } export function createDirectiveQuickPickItem( @@ -30,6 +32,7 @@ export function createDirectiveQuickPickItem( detail?: string; iconPath?: Uri | { light: Uri; dark: Uri } | ThemeIcon; subscription?: Subscription; + onDidSelect?: () => void | Promise; }, ) { let label = options?.label; @@ -48,6 +51,9 @@ export function createDirectiveQuickPickItem( case Directive.Noop: label = 'Try again'; break; + case Directive.Reload: + label = 'Refresh'; + break; case Directive.StartPreviewTrial: label = 'Preview Pro'; detail = 'Preview Pro for 3-days to use this on privately hosted repos'; @@ -75,6 +81,7 @@ export function createDirectiveQuickPickItem( alwaysShow: true, picked: picked, directive: directive, + onDidSelect: options?.onDidSelect, }; return item; diff --git a/src/uris/deepLinks/deepLink.ts b/src/uris/deepLinks/deepLink.ts index 89abf7e863431..b6db9fa5e0181 100644 --- a/src/uris/deepLinks/deepLink.ts +++ b/src/uris/deepLinks/deepLink.ts @@ -65,6 +65,7 @@ export interface DeepLink { targetId?: string; secondaryTargetId?: string; secondaryRemoteUrl?: string; + action?: string; } export function parseDeepLinkUri(uri: Uri): DeepLink | undefined { @@ -87,6 +88,8 @@ export function parseDeepLinkUri(uri: Uri): DeepLink | undefined { } if (!remoteUrl && !repoPath) return undefined; + const action = urlParams.get('action') ?? undefined; + if (target == null) { return { type: DeepLinkType.Repository, @@ -138,6 +141,7 @@ export function parseDeepLinkUri(uri: Uri): DeepLink | undefined { targetId: targetId, secondaryTargetId: secondaryTargetId, secondaryRemoteUrl: secondaryRemoteUrl, + action: action, }; } case DeepLinkType.Draft: { @@ -185,6 +189,7 @@ export const enum DeepLinkServiceState { OpenDraft, OpenWorkspace, OpenFile, + SwitchToRef, } export const enum DeepLinkServiceAction { @@ -210,6 +215,7 @@ export const enum DeepLinkServiceAction { RemoteAdded, TargetMatchedForGraph, TargetMatchedForFile, + TargetMatchedForSwitch, TargetsMatchedForComparison, TargetMatchFailed, TargetFetched, @@ -233,6 +239,7 @@ export interface DeepLinkServiceContext { targetType?: DeepLinkType | undefined; targetSha?: string | undefined; secondaryTargetSha?: string | undefined; + action?: string | undefined; } export const deepLinkStateTransitionTable: Record> = { @@ -295,6 +302,7 @@ export const deepLinkStateTransitionTable: Record = { [DeepLinkServiceState.OpenDraft]: { message: 'Opening cloud patch...', increment: 95 }, [DeepLinkServiceState.OpenWorkspace]: { message: 'Opening workspace...', increment: 95 }, [DeepLinkServiceState.OpenFile]: { message: 'Opening file...', increment: 95 }, + [DeepLinkServiceState.SwitchToRef]: { message: 'Switching to ref...', increment: 95 }, }; diff --git a/src/uris/deepLinks/deepLinkService.ts b/src/uris/deepLinks/deepLinkService.ts index 7fb0e31f7f7ce..d72f4afe35815 100644 --- a/src/uris/deepLinks/deepLinkService.ts +++ b/src/uris/deepLinks/deepLinkService.ts @@ -2,10 +2,14 @@ import { Disposable, env, EventEmitter, ProgressLocation, Range, Uri, window, wo import type { StoredDeepLinkContext, StoredNamedRef } from '../../constants'; import { Commands } from '../../constants'; import type { Container } from '../../container'; +import { executeGitCommand } from '../../git/actions'; import { openFileAtRevision } from '../../git/actions/commit'; +import type { GitBranch } from '../../git/models/branch'; import { getBranchNameWithoutRemote } from '../../git/models/branch'; +import type { GitCommit } from '../../git/models/commit'; import type { GitReference } from '../../git/models/reference'; import { createReference, isSha } from '../../git/models/reference'; +import type { GitTag } from '../../git/models/tag'; import { parseGitRemoteUrl } from '../../git/parsers/remoteParser'; import type { RepositoryIdentity } from '../../gk/models/repositoryIdentities'; import { missingRepositoryId } from '../../gk/models/repositoryIdentities'; @@ -109,6 +113,7 @@ export class DeepLinkService implements Disposable { secondaryRemoteUrl: undefined, targetType: undefined, targetSha: undefined, + action: undefined, }; } @@ -124,6 +129,7 @@ export class DeepLinkService implements Disposable { targetId: link.targetId, secondaryTargetId: link.secondaryTargetId, secondaryRemoteUrl: link.secondaryRemoteUrl, + action: link.action, }; } @@ -158,7 +164,7 @@ export class DeepLinkService implements Disposable { }); } - private async getShaForBranch(targetId: string): Promise { + private async getBranch(targetId: string): Promise { const { repo, remote, secondaryRemote } = this._context; if (!repo) return undefined; @@ -172,8 +178,8 @@ export class DeepLinkService implements Disposable { } let branch = await repo.getBranch(branchName); - if (branch?.sha != null) { - return branch.sha; + if (branch != null) { + return branch; } // If that fails, try matching to any existing remote using its path. @@ -187,8 +193,8 @@ export class DeepLinkService implements Disposable { if (remote.provider?.owner === owner) { branchName = `${remote.name}/${branchBaseName}`; branch = await repo.getBranch(branchName); - if (branch?.sha != null) { - return branch.sha; + if (branch != null) { + return branch; } } } @@ -197,25 +203,32 @@ export class DeepLinkService implements Disposable { } // If the above don't work, it may still exist locally. - branch = await repo.getBranch(targetId); - if (branch?.sha != null) { - return branch.sha; - } - - return undefined; + return repo.getBranch(targetId); } - private async getShaForTag(targetId: string): Promise { + private async getCommit(targetId: string): Promise { const { repo } = this._context; if (!repo) return undefined; - const tag = await repo.getTag(targetId); - if (tag?.sha != null) { - return tag.sha; + if (await this.container.git.validateReference(repo.path, targetId)) { + return repo.getCommit(targetId); } return undefined; } + private async getTag(targetId: string): Promise { + const { repo } = this._context; + return repo?.getTag(targetId); + } + + private async getShaForBranch(targetId: string): Promise { + return (await this.getBranch(targetId))?.sha; + } + + private async getShaForTag(targetId: string): Promise { + return (await this.getTag(targetId))?.sha; + } + private async getShaForCommit(targetId: string): Promise { const { repo } = this._context; if (!repo) return undefined; @@ -257,6 +270,22 @@ export class DeepLinkService implements Disposable { return this.getShaForCommit(ref); } + private async getTargetRef(ref: string): Promise { + if (ref === '') return undefined; + if (isSha(ref)) return this.getCommit(ref); + + const normalized = ref.toLocaleLowerCase(); + if (!normalized.startsWith('refs/tags/') && !normalized.startsWith('tags/')) { + const branch = await this.getBranch(ref); + if (branch != null) return branch; + } + + const tag = await this.getTag(ref); + if (tag != null) return tag; + + return this.getCommit(ref); + } + private async getShasForTargets(): Promise { const { repo, targetType, targetId, secondaryTargetId } = this._context; if (repo == null || targetType === DeepLinkType.Repository || targetId == null) return undefined; @@ -850,7 +879,11 @@ export class DeepLinkService implements Disposable { } if (targetType === DeepLinkType.Repository) { - action = DeepLinkServiceAction.TargetMatchedForGraph; + if (this._context.action === 'switch') { + action = DeepLinkServiceAction.TargetMatchedForSwitch; + } else { + action = DeepLinkServiceAction.TargetMatchedForGraph; + } break; } @@ -885,7 +918,11 @@ export class DeepLinkService implements Disposable { action = DeepLinkServiceAction.TargetsMatchedForComparison; break; default: - action = DeepLinkServiceAction.TargetMatchedForGraph; + if (this._context.action === 'switch') { + action = DeepLinkServiceAction.TargetMatchedForSwitch; + } else { + action = DeepLinkServiceAction.TargetMatchedForGraph; + } break; } @@ -1077,6 +1114,28 @@ export class DeepLinkService implements Disposable { break; } } + case DeepLinkServiceState.SwitchToRef: { + if (!repo || !targetType || !targetId) { + action = DeepLinkServiceAction.DeepLinkErrored; + message = 'Missing repository or target type.'; + break; + } + + const ref = await this.getTargetRef(targetId); + if (ref == null) { + action = DeepLinkServiceAction.DeepLinkErrored; + message = 'Unable to find link target in the repository.'; + break; + } + + await executeGitCommand({ + command: 'switch', + state: { repos: repo, reference: ref }, + }); + + action = DeepLinkServiceAction.DeepLinkResolved; + break; + } default: { action = DeepLinkServiceAction.DeepLinkErrored; message = 'Unknown state.'; diff --git a/src/webviews/settings/settingsWebview.ts b/src/webviews/settings/settingsWebview.ts index f45c497f8dd3b..7073d54586695 100644 --- a/src/webviews/settings/settingsWebview.ts +++ b/src/webviews/settings/settingsWebview.ts @@ -202,6 +202,7 @@ export class SettingsWebviewProvider implements WebviewProvider Date: Mon, 25 Mar 2024 16:54:28 -0700 Subject: [PATCH 0621/1012] Bumps providers library --- package.json | 2 +- yarn.lock | 39 +++++++-------------------------------- 2 files changed, 8 insertions(+), 33 deletions(-) diff --git a/package.json b/package.json index 9d8299d4eece7..d82599783c9c4 100644 --- a/package.json +++ b/package.json @@ -16872,7 +16872,7 @@ }, "dependencies": { "@gitkraken/gitkraken-components": "10.2.5", - "@gitkraken/provider-apis": "0.17.3", + "@gitkraken/provider-apis": "0.18.1", "@gitkraken/shared-web-components": "0.1.1-rc.15", "@lit/react": "1.0.3", "@microsoft/fast-element": "1.12.0", diff --git a/yarn.lock b/yarn.lock index 647609ba23ed0..41b3a19f2efb9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -258,10 +258,10 @@ react-dragula "1.1.17" react-onclickoutside "^6.13.0" -"@gitkraken/provider-apis@0.17.3": - version "0.17.3" - resolved "https://registry.yarnpkg.com/@gitkraken/provider-apis/-/provider-apis-0.17.3.tgz#8e331e94f27071e4c3019ef0a4231e3c01f71cf9" - integrity sha512-1AiraQTKXnYpbRglDDOD3JWcmaV8oFzoSJfuii/YlVSRxaJIaOmwFxtlUCLpFQ19rShAhQURX6BlQBC7CKYIGQ== +"@gitkraken/provider-apis@0.18.1": + version "0.18.1" + resolved "https://registry.yarnpkg.com/@gitkraken/provider-apis/-/provider-apis-0.18.1.tgz#a1be75457e18367c8571c7d89367506459e39c61" + integrity sha512-QVjd12L4Kx0sDkWb5VVpxOI8RlQP8pauS39CaOA61goE6Le9ogYOeJf51082COlkXil3XQ8+bsxCRkfoOHxSHQ== dependencies: node-fetch "2.7.0" @@ -6790,16 +6790,7 @@ streamx@^2.13.0, streamx@^2.15.0: optionalDependencies: bare-events "^2.2.0" -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -6859,14 +6850,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -7622,16 +7606,7 @@ workerpool@6.2.1: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== From a4857b324b19c14f50afa7a117f87cae596a665d Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Tue, 26 Mar 2024 14:07:55 -0400 Subject: [PATCH 0622/1012] Fixes menu item content --- .../apps/shared/components/menu/menu-item.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/webviews/apps/shared/components/menu/menu-item.ts b/src/webviews/apps/shared/components/menu/menu-item.ts index 04e8fea5a9b0c..d15b6bc017ade 100644 --- a/src/webviews/apps/shared/components/menu/menu-item.ts +++ b/src/webviews/apps/shared/components/menu/menu-item.ts @@ -1,5 +1,5 @@ import type { PropertyValueMap } from 'lit'; -import { css, LitElement } from 'lit'; +import { css, html, LitElement } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { elementBase } from '../styles/lit/base.css'; @@ -43,21 +43,22 @@ export class MenuItem extends LitElement { @property({ type: Boolean, reflect: true }) disabled = false; + @property({ reflect: true }) + override role = 'option'; + updateInteractiveState() { this.tabIndex = this.disabled ? -1 : this.role === 'option' ? 0 : -1; } - protected override firstUpdated(_changedProperties: PropertyValueMap | Map): void { - if (!this.hasAttribute('role')) { - this.role = 'option'; - } - } - protected override updated(changedProperties: PropertyValueMap | Map): void { if (changedProperties.has('disabled') || changedProperties.has('role')) { this.updateInteractiveState(); } } + + override render() { + return html``; + } } declare global { From d4369fb81ec201d9da7f732124bdd91bacc0718e Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 25 Mar 2024 19:18:54 -0400 Subject: [PATCH 0623/1012] Adds copy remote url to branches & upstream status --- package.json | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index d82599783c9c4..ceddb20d26803 100644 --- a/package.json +++ b/package.json @@ -14173,8 +14173,7 @@ { "command": "gitlens.views.openBranchOnRemote", "when": "gitlens:hasRemotes && !listMultiSelection && viewItem =~ /gitlens:status:upstream:(?!(missing|none))/", - "group": "2_gitlens_quickopen_remote@1", - "alt": "gitlens.copyRemoteBranchUrl" + "group": "2_gitlens_quickopen_remote@1" }, { "command": "gitlens.views.openInTerminal", @@ -14186,6 +14185,11 @@ "when": "!gitlens:hasVirtualFolders && !listMultiSelection && viewItem =~ /gitlens:status:upstream\\b/", "group": "2_gitlens_quickopen_terminal@2" }, + { + "command": "gitlens.copyRemoteBranchUrl", + "when": "gitlens:hasRemotes && !listMultiSelection && viewItem =~ /gitlens:status:upstream:(?!(missing|none))/", + "group": "7_gitlens_cutcopypaste@1" + }, { "command": "gitlens.views.dismissNode", "when": "viewItem =~ /gitlens:(compare:picker|(compare|search):results(?!:)\\b)\\b(?!:(commits|files))/", @@ -14684,8 +14688,7 @@ { "command": "gitlens.graph.openBranchOnRemote", "when": "gitlens:hasRemotes && webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+(tracking|remote)\\b)/", - "group": "2_gitlens_quickopen@1", - "alt": "gitlens.copyRemoteBranchUrl" + "group": "2_gitlens_quickopen@1" }, { "command": "gitlens.graph.cherryPick", @@ -15032,6 +15035,11 @@ "command": "gitlens.copyMessageToClipboard", "when": "viewItem =~ /gitlens:(?!(commit|file|remote|repo-folder|repository|stash)\\b)/", "group": "1_gitlens@3" + }, + { + "command": "gitlens.copyRemoteBranchUrl", + "when": "viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+(tracking|remote)\\b)/", + "group": "1_gitlens@4" } ], "gitlens/share": [ From af9489944537c23cbbdce433c8971e284d47b3df Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Wed, 27 Mar 2024 10:09:18 -0700 Subject: [PATCH 0624/1012] Fixes #3198 cloud workspace repo location without url Closes #3198 --- src/plus/workspaces/workspacesService.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/plus/workspaces/workspacesService.ts b/src/plus/workspaces/workspacesService.ts index 4e8f653dacfbe..7fd5f986bd4df 100644 --- a/src/plus/workspaces/workspacesService.ts +++ b/src/plus/workspaces/workspacesService.ts @@ -497,10 +497,14 @@ export class WorkspacesService implements Disposable { provider = workspace.provider; } - if (descriptor.id != null && descriptor.url != null && provider != null) { + if ( + descriptor.id != null && + (descriptor.url != null || + (descriptor.provider_organization_id != null && descriptor.name != null && provider != null)) + ) { await this.container.repositoryPathMapping.writeLocalRepoPath( { - remoteUrl: descriptor.url, + remoteUrl: descriptor.url ?? undefined, repoInfo: { provider: provider, owner: descriptor.provider_organization_id, @@ -509,6 +513,9 @@ export class WorkspacesService implements Disposable { }, repoPath, ); + } + + if (descriptor.id != null) { await this.updateCloudWorkspaceRepoLocalPath(workspaceId, descriptor.id, repoPath); } } From 33e7d48a7731c36d2749e772f9c05b94c10afac9 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 29 Mar 2024 14:41:41 -0400 Subject: [PATCH 0625/1012] Fixes #3179 quick pick multiselect issue Refs: https://github.com/microsoft/vscode/issues/209132 --- src/commands/gitCommands.ts | 42 ++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/src/commands/gitCommands.ts b/src/commands/gitCommands.ts index e320f122f9554..44907ccb8dfb6 100644 --- a/src/commands/gitCommands.ts +++ b/src/commands/gitCommands.ts @@ -924,27 +924,33 @@ export class GitCommandsCommand extends Command { quickpick.matchOnDescription = Boolean(step.matchOnDescription); quickpick.matchOnDetail = Boolean(step.matchOnDetail); + const selectValueWhenShown = step.selectValueWhenShown ?? true; + + let items; + let shown = false; if (isPromise(step.items)) { quickpick.placeholder = 'Loading...'; quickpick.busy = true; + + // If we set the value before showing the quickpick, VS Code will select the entire value + if (step.value != null && selectValueWhenShown) { + quickpick.value = step.value; + } + quickpick.show(); - quickpick.items = await step.items; - quickpick.placeholder = - typeof step.placeholder === 'function' - ? step.placeholder(quickpick.items.length) - : step.placeholder; - quickpick.busy = false; + shown = true; + items = await step.items; } else { - quickpick.placeholder = - typeof step.placeholder === 'function' - ? step.placeholder(quickpick.items.length) - : step.placeholder; - quickpick.items = step.items; + items = step.items; } - quickpick.canSelectMany = Boolean(step.multiselect) && quickpick.items.length > 1; + quickpick.canSelectMany = Boolean(step.multiselect) && items.length > 1; + quickpick.placeholder = + typeof step.placeholder === 'function' ? step.placeholder(items.length) : step.placeholder; + quickpick.items = items; + quickpick.busy = false; if (quickpick.canSelectMany) { quickpick.selectedItems = step.selectedItems ?? quickpick.items.filter(i => i.picked); @@ -960,12 +966,14 @@ export class GitCommandsCommand extends Command { // Needs to be after we reset the command quickpick.buttons = this.getButtons(step, commandsStep.command); - const selectValueWhenShown = step.selectValueWhenShown ?? true; - if (step.value != null && selectValueWhenShown) { - quickpick.value = step.value; - } + if (!shown) { + // If we set the value before showing the quickpick, VS Code will select the entire value + if (step.value != null && selectValueWhenShown) { + quickpick.value = step.value; + } - quickpick.show(); + quickpick.show(); + } if (step.value != null && !selectValueWhenShown) { quickpick.value = step.value; From 9ba73bb8676207ce182806099c2d1fb95fd80119 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 29 Mar 2024 14:42:02 -0400 Subject: [PATCH 0626/1012] Updates CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5af02fec7068..c9241fc6ecbd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Fixed - Fixes [#3180](https://github.com/gitkraken/vscode-gitlens/issues/3180) - Focus View feedback button is not working +- Fixes [#3179](https://github.com/gitkraken/vscode-gitlens/issues/3179) - The checkmarks in cherry pick are not displayed ## [14.9.0] - 2024-03-06 From 75d00c4529aff2097f9dbb1e9ec5bd6b61fd3873 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sat, 30 Mar 2024 23:03:42 -0400 Subject: [PATCH 0627/1012] Fixes #3143 changes annotation icons font icons --- CONTRIBUTING.md | 3 +- images/dark/icon-git-orange.svg | 3 - images/dark/icon-git-progress.svg | 5 -- images/dark/icon-git.svg | 8 --- images/dark/icon-gitlens-filled-orange.svg | 3 + images/dark/icon-gitlens-filled-progress.svg | 5 ++ images/icons/gitlens-filled.svg | 1 + images/icons/gitlens.svg | 2 +- images/icons/template/mapping.json | 3 +- images/light/icon-git-orange.svg | 8 --- images/light/icon-git-progress.svg | 10 --- images/light/icon-git.svg | 8 --- images/light/icon-gitlens-filled-orange.svg | 5 ++ images/light/icon-gitlens-filled-progress.svg | 7 +++ package.json | 62 ++++++------------- .../apps/commitDetails/commitDetails.html | 2 +- src/webviews/apps/home/home.html | 2 +- src/webviews/apps/plus/focus/focus.html | 2 +- src/webviews/apps/plus/graph/graph.html | 2 +- .../apps/plus/patchDetails/patchDetails.html | 2 +- src/webviews/apps/plus/timeline/timeline.html | 2 +- src/webviews/apps/shared/glicons.scss | 5 +- src/webviews/apps/welcome/welcome.html | 2 +- 23 files changed, 55 insertions(+), 97 deletions(-) delete mode 100644 images/dark/icon-git-orange.svg delete mode 100644 images/dark/icon-git-progress.svg delete mode 100644 images/dark/icon-git.svg create mode 100644 images/dark/icon-gitlens-filled-orange.svg create mode 100644 images/dark/icon-gitlens-filled-progress.svg create mode 100644 images/icons/gitlens-filled.svg delete mode 100644 images/light/icon-git-orange.svg delete mode 100644 images/light/icon-git-progress.svg delete mode 100644 images/light/icon-git.svg create mode 100644 images/light/icon-gitlens-filled-orange.svg create mode 100644 images/light/icon-gitlens-filled-progress.svg diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8c9be7489cc2d..a0b91fb500dec 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -225,7 +225,8 @@ The Publish Insiders workflow is no longer available and was replaced with the p To add new icons to the GL Icons font follow the steps below: - Add new SVG icons to the `images/icons` folder -- Update the `images/icons/template/mapping.json` file with entries for the new icons (append to the end of the file) +- Append entries for the new icons to the end of the `images/icons/template/mapping.json` file + - Entries should be in the format of `: ` - Optimize and build the icons by running the following from a terminal: ``` diff --git a/images/dark/icon-git-orange.svg b/images/dark/icon-git-orange.svg deleted file mode 100644 index 0c9af12a52e1c..0000000000000 --- a/images/dark/icon-git-orange.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-git-progress.svg b/images/dark/icon-git-progress.svg deleted file mode 100644 index 90c3d1aa4630e..0000000000000 --- a/images/dark/icon-git-progress.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/images/dark/icon-git.svg b/images/dark/icon-git.svg deleted file mode 100644 index ded805271fd90..0000000000000 --- a/images/dark/icon-git.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/images/dark/icon-gitlens-filled-orange.svg b/images/dark/icon-gitlens-filled-orange.svg new file mode 100644 index 0000000000000..4471b752be14c --- /dev/null +++ b/images/dark/icon-gitlens-filled-orange.svg @@ -0,0 +1,3 @@ + + + diff --git a/images/dark/icon-gitlens-filled-progress.svg b/images/dark/icon-gitlens-filled-progress.svg new file mode 100644 index 0000000000000..599a20db73515 --- /dev/null +++ b/images/dark/icon-gitlens-filled-progress.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/images/icons/gitlens-filled.svg b/images/icons/gitlens-filled.svg new file mode 100644 index 0000000000000..53da0f1b862cc --- /dev/null +++ b/images/icons/gitlens-filled.svg @@ -0,0 +1 @@ + diff --git a/images/icons/gitlens.svg b/images/icons/gitlens.svg index 73d6eca98f6e0..edb9b2b45c427 100644 --- a/images/icons/gitlens.svg +++ b/images/icons/gitlens.svg @@ -1 +1 @@ - + diff --git a/images/icons/template/mapping.json b/images/icons/template/mapping.json index eefe6b3c61cd8..0feec4095e7c8 100644 --- a/images/icons/template/mapping.json +++ b/images/icons/template/mapping.json @@ -43,5 +43,6 @@ "cloud-patch": 61736, "cloud-patch-share": 61737, "inspect": 61738, - "repository-filled": 61739 + "repository-filled": 61739, + "gitlens-filled": 61740 } \ No newline at end of file diff --git a/images/light/icon-git-orange.svg b/images/light/icon-git-orange.svg deleted file mode 100644 index d11d99d1e2d79..0000000000000 --- a/images/light/icon-git-orange.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/images/light/icon-git-progress.svg b/images/light/icon-git-progress.svg deleted file mode 100644 index 0f55ae7b85a07..0000000000000 --- a/images/light/icon-git-progress.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/images/light/icon-git.svg b/images/light/icon-git.svg deleted file mode 100644 index 2a49cbe32f6be..0000000000000 --- a/images/light/icon-git.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/images/light/icon-gitlens-filled-orange.svg b/images/light/icon-gitlens-filled-orange.svg new file mode 100644 index 0000000000000..c43e1f2b460be --- /dev/null +++ b/images/light/icon-gitlens-filled-orange.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/images/light/icon-gitlens-filled-progress.svg b/images/light/icon-gitlens-filled-progress.svg new file mode 100644 index 0000000000000..ea67e6f3fcb6a --- /dev/null +++ b/images/light/icon-gitlens-filled-progress.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/package.json b/package.json index ceddb20d26803..c0e52bfda9ca2 100644 --- a/package.json +++ b/package.json @@ -5665,28 +5665,19 @@ "command": "gitlens.toggleFileBlame", "title": "Toggle File Blame", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-git.svg", - "light": "images/light/icon-git.svg" - } + "icon": "$(gitlens-gitlens)" }, { "command": "gitlens.toggleFileBlameInDiffLeft", "title": "Toggle File Blame", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-git.svg", - "light": "images/light/icon-git.svg" - } + "icon": "$(gitlens-gitlens)" }, { "command": "gitlens.toggleFileBlameInDiffRight", "title": "Toggle File Blame", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-git.svg", - "light": "images/light/icon-git.svg" - } + "icon": "$(gitlens-gitlens)" }, { "command": "gitlens.annotations.nextChange", @@ -5702,64 +5693,43 @@ "command": "gitlens.clearFileAnnotations", "title": "Clear File Annotations", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-git-orange.svg", - "light": "images/light/icon-git-orange.svg" - } + "icon": "$(gitlens-gitlens-filled)" }, { "command": "gitlens.computingFileAnnotations", "title": "Computing File Annotations...", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-git-progress.svg", - "light": "images/light/icon-git-progress.svg" - } + "icon": "$(gitlens-gitlens-filled)" }, { "command": "gitlens.toggleFileHeatmap", "title": "Toggle File Heatmap", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-git.svg", - "light": "images/light/icon-git.svg" - } + "icon": "$(gitlens-gitlens)" }, { "command": "gitlens.toggleFileHeatmapInDiffLeft", "title": "Toggle File Heatmap", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-git.svg", - "light": "images/light/icon-git.svg" - } + "icon": "$(gitlens-gitlens)" }, { "command": "gitlens.toggleFileHeatmapInDiffRight", "title": "Toggle File Heatmap", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-git.svg", - "light": "images/light/icon-git.svg" - } + "icon": "$(gitlens-gitlens)" }, { "command": "gitlens.toggleFileChanges", "title": "Toggle File Changes", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-git.svg", - "light": "images/light/icon-git.svg" - } + "icon": "$(gitlens-gitlens)" }, { "command": "gitlens.toggleFileChangesOnly", "title": "Toggle File Changes", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-git.svg", - "light": "images/light/icon-git.svg" - } + "icon": "$(gitlens-gitlens)" }, { "command": "gitlens.toggleLineBlame", @@ -9080,6 +9050,13 @@ "fontPath": "dist/glicons.woff2", "fontCharacter": "\\f12b" } + }, + "gitlens-gitlens-filled": { + "description": "gitlens-filled icon", + "default": { + "fontPath": "dist/glicons.woff2", + "fontCharacter": "\\f12c" + } } }, "menus": { @@ -15974,10 +15951,7 @@ { "id": "gitlens/editor/annotations", "label": "File Annotations", - "icon": { - "dark": "images/dark/icon-git.svg", - "light": "images/light/icon-git.svg" - } + "icon": "$(gitlens-gitlens)" }, { "id": "gitlens/editor/context/changes", diff --git a/src/webviews/apps/commitDetails/commitDetails.html b/src/webviews/apps/commitDetails/commitDetails.html index 77719b70b85ef..f443c1810ed4a 100644 --- a/src/webviews/apps/commitDetails/commitDetails.html +++ b/src/webviews/apps/commitDetails/commitDetails.html @@ -11,7 +11,7 @@ @font-face { font-family: 'glicons'; font-display: block; - src: url('#{root}/dist/glicons.woff2?30855d21cb614f41edfd373458624529') format('woff2'); + src: url('#{root}/dist/glicons.woff2?099c6daa13ce4d70b44d9839eb7c8234') format('woff2'); } diff --git a/src/webviews/apps/home/home.html b/src/webviews/apps/home/home.html index 5d9a316e2860a..29fd29479fdb8 100644 --- a/src/webviews/apps/home/home.html +++ b/src/webviews/apps/home/home.html @@ -11,7 +11,7 @@ @font-face { font-family: 'glicons'; font-display: block; - src: url('#{root}/dist/glicons.woff2?30855d21cb614f41edfd373458624529') format('woff2'); + src: url('#{root}/dist/glicons.woff2?099c6daa13ce4d70b44d9839eb7c8234') format('woff2'); } diff --git a/src/webviews/apps/plus/focus/focus.html b/src/webviews/apps/plus/focus/focus.html index 57254d60e67ca..4a9ed82ad1e5f 100644 --- a/src/webviews/apps/plus/focus/focus.html +++ b/src/webviews/apps/plus/focus/focus.html @@ -11,7 +11,7 @@ @font-face { font-family: 'glicons'; font-display: block; - src: url('#{root}/dist/glicons.woff2?30855d21cb614f41edfd373458624529') format('woff2'); + src: url('#{root}/dist/glicons.woff2?099c6daa13ce4d70b44d9839eb7c8234') format('woff2'); } :root { diff --git a/src/webviews/apps/plus/graph/graph.html b/src/webviews/apps/plus/graph/graph.html index 66da000e72b30..f0fa825e73f4b 100644 --- a/src/webviews/apps/plus/graph/graph.html +++ b/src/webviews/apps/plus/graph/graph.html @@ -11,7 +11,7 @@ @font-face { font-family: 'glicons'; font-display: block; - src: url('#{root}/dist/glicons.woff2?30855d21cb614f41edfd373458624529') format('woff2'); + src: url('#{root}/dist/glicons.woff2?099c6daa13ce4d70b44d9839eb7c8234') format('woff2'); }