daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SCM - 💄 remove more of the history item group terminology (#228139)

pull/228145/head^2
Ladislau Szomoru 2024-09-10 20:27:27 +02:00 committed by GitHub
parent 64dcee7906
commit 4ade36e5ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/lib/stylelint/vscode-known-variables.json
View File

@ -546,9 +546,9 @@
"--vscode-scmGraph-foreground1",
"--vscode-scmGraph-foreground2",
"--vscode-scmGraph-foreground3",
"--vscode-scmGraph-historyItemGroupBase",
"--vscode-scmGraph-historyItemGroupLocal",
"--vscode-scmGraph-historyItemGroupRemote",
"--vscode-scmGraph-historyItemBaseRefColor",
"--vscode-scmGraph-historyItemRefColor",
"--vscode-scmGraph-historyItemRemoteRefColor",
"--vscode-scmGraph-historyItemHoverAdditionsForeground",
"--vscode-scmGraph-historyItemHoverDefaultLabelBackground",
"--vscode-scmGraph-historyItemHoverDefaultLabelForeground",
@ -881,4 +881,4 @@
"--widget-color",
"--text-link-decoration"
]
}
}

6
src/vs/workbench/contrib/scm/browser/activity.ts
View File

@ -36,7 +36,7 @@ export class SCMActiveRepositoryController extends Disposable implements IWorkbe
Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository),
() => this.scmService.repositories);
private readonly _activeRepositoryCurrentHistoryItemGroupName = derived(reader => {
private readonly _activeRepositoryHistoryItemRefName = derived(reader => {
const repository = this.scmViewService.activeRepository.read(reader);
const historyProvider = repository?.provider.historyProvider.read(reader);
const historyItemRef = historyProvider?.historyItemRef.read(reader);
@ -109,9 +109,9 @@ export class SCMActiveRepositoryController extends Disposable implements IWorkbe
this._register(autorun(reader => {
const repository = this.scmViewService.activeRepository.read(reader);
const currentHistoryItemGroupName = this._activeRepositoryCurrentHistoryItemGroupName.read(reader);
const historyItemRefName = this._activeRepositoryHistoryItemRefName.read(reader);
this._updateActiveRepositoryContextKeys(repository?.provider.name, currentHistoryItemGroupName);
this._updateActiveRepositoryContextKeys(repository?.provider.name, historyItemRefName);
}));
}

4
src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
View File

@ -766,10 +766,10 @@ class SCMHistoryViewModel extends Disposable {
}
const limit = clamp(this._configurationService.getValue<number>('scm.graph.pageSize'), 1, 1000);
const historyItemGroupIds = historyItemRefs.map(ref => ref.revision ?? ref.id);
const historyItemRefIds = historyItemRefs.map(ref => ref.revision ?? ref.id);
const historyItems = await historyProvider.provideHistoryItems({
historyItemRefs: historyItemGroupIds, limit, skip: existingHistoryItems.length
historyItemRefs: historyItemRefIds, limit, skip: existingHistoryItems.length
}) ?? [];
state = {