Browse Source

Respects `renderIndentGuides` setting

Updates on configuration changes
main
Eric Amodio 2 years ago
parent
commit
5a112277de
4 changed files with 53 additions and 7 deletions
  1. +1
    -1
      src/webviews/apps/commitDetails/commitDetails.ts
  2. +8
    -2
      src/webviews/apps/shared/components/list/list-item.ts
  3. +42
    -4
      src/webviews/commitDetails/commitDetailsWebviewView.ts
  4. +2
    -0
      src/webviews/commitDetails/protocol.ts

+ 1
- 1
src/webviews/apps/commitDetails/commitDetails.ts View File

@ -360,7 +360,7 @@ export class CommitDetailsApp extends App> {
$el.innerHTML = `
<li class="change-list__item">
<list-container>
<list-container class="indentGuides-${state.indentGuides}">
${flatTree
.map(({ level, item }) => {
if (item.name === '') {

+ 8
- 2
src/webviews/apps/shared/components/list/list-item.ts View File

@ -125,12 +125,18 @@ const styles = css`
content: '';
position: absolute;
height: 2.2rem;
border-left: 1px solid var(--vscode-list-deemphasizedForeground);
border-left: 1px solid transparent;
top: 50%;
transform: translate(-50%, -50%);
left: 0.8rem;
width: 0.1rem;
opacity: 0.5;
transition: border-color 0.1s linear;
}
:host-context(.indentGuides-always) .node--connector::before,
:host-context(.indentGuides-onHover:focus-within) .node--connector::before,
:host-context(.indentGuides-onHover:hover) .node--connector::before {
border-color: var(--vscode-tree-indentGuidesStroke);
}
.text {

+ 42
- 4
src/webviews/commitDetails/commitDetailsWebviewView.ts View File

@ -1,4 +1,9 @@
import type { CancellationToken, TreeViewSelectionChangeEvent, TreeViewVisibilityChangeEvent } from 'vscode';
import type {
CancellationToken,
ConfigurationChangeEvent,
TreeViewSelectionChangeEvent,
TreeViewVisibilityChangeEvent,
} from 'vscode';
import { CancellationTokenSource, Disposable, env, Uri, window } from 'vscode';
import { executeGitCommand, GitActions } from '../../commands/gitCommands.actions';
import { configuration } from '../../configuration';
@ -16,6 +21,7 @@ import type { GitRevisionReference } from '../../git/models/reference';
import { Logger } from '../../logger';
import type { ShowCommitInGraphCommandArgs } from '../../plus/webviews/graph/graphWebview';
import { executeCommand } from '../../system/command';
import type { DateTimeFormat } from '../../system/date';
import { debug, getLogScope } from '../../system/decorators/log';
import type { Deferrable } from '../../system/function';
import { debounce } from '../../system/function';
@ -58,6 +64,9 @@ interface Context {
pullRequest: PullRequest | undefined;
// commits: GitCommit[] | undefined;
dateFormat: DateTimeFormat | string;
// indent: number;
indentGuides: 'none' | 'onHover' | 'always';
}
export class CommitDetailsWebviewView extends WebviewViewBase<State, Serialized<State>> {
@ -83,7 +92,15 @@ export class CommitDetailsWebviewView extends WebviewViewBase
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',
};
this.disposables.push(
configuration.onDidChange(this.onConfigurationChanged, this),
configuration.onDidChangeAny(this.onAnyConfigurationChanged, this),
);
}
override async show(options?: {
@ -149,6 +166,27 @@ export class CommitDetailsWebviewView extends WebviewViewBase
this.updateState(true);
}
private onAnyConfigurationChanged(e: ConfigurationChangeEvent) {
// if (e.affectsConfiguration('workbench.tree.indent')) {
// this.updatePendingContext({ indent: configuration.getAny('workbench.tree.indent') ?? 8 });
// this.updateState();
// }
if (e.affectsConfiguration('workbench.tree.renderIndentGuides')) {
this.updatePendingContext({
indentGuides: configuration.getAny('workbench.tree.renderIndentGuides') ?? 'onHover',
});
this.updateState();
}
}
private onConfigurationChanged(e?: ConfigurationChangeEvent) {
if (configuration.changed(e, 'defaultDateFormat')) {
this.updatePendingContext({ dateFormat: configuration.get('defaultDateFormat') ?? 'MMMM Do, YYYY h:mma' });
this.updateState();
}
}
private ensureTrackers(): void {
this._visibilityDisposable?.dispose();
this._visibilityDisposable = undefined;
@ -291,8 +329,6 @@ export class CommitDetailsWebviewView extends WebviewViewBase
this._cancellationTokenSource = undefined;
}
const dateFormat = configuration.get('defaultDateFormat') ?? 'MMMM Do, YYYY h:mma';
let details;
if (current.commit != null) {
if (!current.commit.hasFullDetails()) {
@ -323,7 +359,9 @@ export class CommitDetailsWebviewView extends WebviewViewBase
selected: details,
autolinkedIssues: current.autolinkedIssues?.map(serializeIssueOrPullRequest),
pullRequest: current.pullRequest != null ? serializePullRequest(current.pullRequest) : undefined,
dateFormat: dateFormat,
dateFormat: current.dateFormat,
// indent: current.indent,
indentGuides: current.indentGuides,
});
return state;
}

+ 2
- 0
src/webviews/commitDetails/protocol.ts View File

@ -39,6 +39,8 @@ export type State = {
pullRequest?: PullRequestShape;
dateFormat: string;
// indent: number;
indentGuides: 'none' | 'onHover' | 'always';
};
export type ShowCommitDetailsViewCommandArgs = string[];

Loading…
Cancel
Save