feat: add interactive tooltip and catch

Author: voiduin

app/src/lib/git/config.ts

@@ -340,24 +340,30 @@ export function getOriginFilePath(
 }
 
 /**
- * Format a human-readable scope description for a config value origin.
- * Detects whether a global-scoped value comes from a standard location
- * (~/.gitconfig or ~/.config/git/config) vs. a conditionally included file
- * (via includeIf directive).
+ * Check whether a global-scoped config value comes from a conditionally
+ * included file (via includeIf directive) rather than a standard location.
  */
-export function formatConfigScope(origin: IConfigValueOrigin): string {
+export function isConditionalInclude(origin: IConfigValueOrigin): boolean {
+  if (origin.scope !== 'global') {
+    return false
+  }
   const filePath = getOriginFilePath(origin)
+  return (
+    !/[/\\]\.gitconfig$/i.test(filePath) &&
+    !/[/\\]\.config[/\\]git[/\\]config$/i.test(filePath)
+  )
+}
+
+/** Format a human-readable scope description for a config value origin. */
+export function formatConfigScope(origin: IConfigValueOrigin): string {
   if (origin.scope === 'local') {
     return 'local'
   } else if (origin.scope === 'system') {
     return 'system'
   } else if (origin.scope === 'worktree') {
     return 'worktree'
   } else if (origin.scope === 'global') {
-    const isStandardGlobalPath =
-      /[/\\]\.gitconfig$/i.test(filePath) ||
-      /[/\\]\.config[/\\]git[/\\]config$/i.test(filePath)
-    return isStandardGlobalPath ? 'global' : 'global, via [includeIf]'
+    return isConditionalInclude(origin) ? 'global, via [includeIf]' : 'global'
   }
   return origin.scope
 }

app/src/ui/changes/commit-message.tsx

@@ -40,6 +40,8 @@ import {
 import {
   setGlobalConfigValue,
   IConfigValueOrigin,
+  getOriginFilePath,
+  isConditionalInclude,
   formatConfigScope,
   formatConfigPath,
 } from '../../lib/git/config'
@@ -73,25 +75,26 @@ import {
 } from '../../lib/feature-flag'
 import { AriaLiveContainer } from '../accessibility/aria-live-container'
 import { TooltippedContent } from '../lib/tooltipped-content'
+import { showItemInFolder } from '../main-process-proxy'
 import { HookProgress } from '../../lib/git'
 import { assertNever } from '../../lib/fatal-error'
 
 function renderScopeValue(origin: IConfigValueOrigin): JSX.Element {
-  const scope = formatConfigScope(origin)
-  if (scope.includes('includeIf')) {
+  if (isConditionalInclude(origin)) {
     return (
       <span>
         global, via <em>[includeIf]</em>
       </span>
     )
   }
-  return <span>{scope}</span>
+  return <span>{formatConfigScope(origin)}</span>
 }
 
 function formatConfigOriginTooltip(
   fieldName: string,
   origin: IConfigValueOrigin,
-  repositoryPath: string
+  repositoryPath: string,
+  onRevealFile: () => void
 ): JSX.Element {
   return (
     <div className="config-origin-tooltip">
@@ -100,7 +103,9 @@ function formatConfigOriginTooltip(
       <span className="config-origin-tooltip-label">Scope:</span>
       {renderScopeValue(origin)}
       <span className="config-origin-tooltip-label">File:</span>
-      <span>{formatConfigPath(origin, repositoryPath)}</span>
+      <LinkButton onClick={onRevealFile}>
+        {formatConfigPath(origin, repositoryPath)}
+      </LinkButton>
     </div>
   )
 }
@@ -838,10 +843,20 @@ export class CommitMessage extends React.Component<
     const { commitAuthorNameOrigin, commitAuthorEmailOrigin } = this.props
     const repoPath = this.props.repository.path
     const nameTooltip = commitAuthorNameOrigin
-      ? formatConfigOriginTooltip('Name', commitAuthorNameOrigin, repoPath)
+      ? formatConfigOriginTooltip(
+          'Name',
+          commitAuthorNameOrigin,
+          repoPath,
+          this.onRevealNameConfigFile
+        )
       : undefined
     const emailTooltip = commitAuthorEmailOrigin
-      ? formatConfigOriginTooltip('Email', commitAuthorEmailOrigin, repoPath)
+      ? formatConfigOriginTooltip(
+          'Email',
+          commitAuthorEmailOrigin,
+          repoPath,
+          this.onRevealEmailConfigFile
+        )
       : undefined
 
     return (
@@ -852,13 +867,15 @@ export class CommitMessage extends React.Component<
             className="commit-author-name"
             tooltip={nameTooltip}
             tooltipClassName="config-origin"
+            interactive={true}
           >
             {commitAuthor.name}
           </TooltippedContent>
           <TooltippedContent
             className="commit-author-email"
             tooltip={emailTooltip}
             tooltipClassName="config-origin"
+            interactive={true}
           >
             {commitAuthor.email}
           </TooltippedContent>
@@ -867,6 +884,24 @@ export class CommitMessage extends React.Component<
     )
   }
 
+  private onRevealNameConfigFile = () => {
+    const { commitAuthorNameOrigin } = this.props
+    if (commitAuthorNameOrigin) {
+      showItemInFolder(
+        getOriginFilePath(commitAuthorNameOrigin, this.props.repository.path)
+      )
+    }
+  }
+
+  private onRevealEmailConfigFile = () => {
+    const { commitAuthorEmailOrigin } = this.props
+    if (commitAuthorEmailOrigin) {
+      showItemInFolder(
+        getOriginFilePath(commitAuthorEmailOrigin, this.props.repository.path)
+      )
+    }
+  }
+
   private onUpdateUserEmail = async (email: string) => {
     await setGlobalConfigValue('user.email', email)
     this.props.onRefreshAuthor()

app/src/ui/preferences/preferences.tsx

@@ -933,9 +933,14 @@ export class Preferences extends React.Component<
         this.state.initialCommitterName ||
         this.state.initialCommitterEmail
       ) {
-        // User unchecked the box — remove identity from global config
-        await removeGlobalConfigValue('user.name')
-        await removeGlobalConfigValue('user.email')
+        // User unchecked the box — remove identity from global config.
+        // Ignore errors if values are already absent.
+        try {
+          await removeGlobalConfigValue('user.name')
+        } catch {}
+        try {
+          await removeGlobalConfigValue('user.email')
+        } catch {}
         shouldRefreshAuthor = true
       }