✨ feat(vscode): 只有从「未提交的更改」点开的预览才对比上一次提交

vscode/src/codeReader/index.ts

@@ -1,5 +1,6 @@
 import type { ExtensionContext, Uri } from 'vscode'
 import type { CodeReaderApi, RuleLocation, RuleReference } from './contract'
+import type { OpenedFrom } from './diff/diffBase'
 import type { TargetSpot } from './editor/openTarget'
 import type { FileNode } from './explorer/fileTree'
 import type { FeatureRow } from './features/featureViews'
@@ -9,7 +10,7 @@ import { logger } from '../logging/logger'
 import { packageCommandRules } from './commands/packageCommands'
 import { shellCommandRules } from './commands/shellCommands'
 import { systemCommandRules } from './commands/systemCommands'
-import { locatedDiffBases } from './diff/diffBase'
+import { previewDiffBases } from './diff/diffBase'
 import { BlockFilter } from './editor/blockFilter'
 import { NEXT_OCCURRENCE, PREVIOUS_OCCURRENCE } from './editor/occurrenceNavigation'
 import { languageOf, openingFor } from './editor/openTarget'
@@ -71,26 +72,21 @@ const FILES_VIEW = 'superpowers.codeReader.files'
 const OPEN_COMMAND = 'superpowers.codeReader.open'
 
 /**
- * 侧栏点文件、点「了解一块代码」栏里的一条：语言受支持就用预览打开，否则用 VS Code 默认的打开方式（见 openingFor）。
- * 给了 spot（条目的符号在哪）就跳过去：预览滚到那一块、闪一下，普通编辑器选中那个名字。
+ * 侧栏点文件、点「了解一块代码」栏里的一条：语言受支持就用预览打开、告诉它是从哪一栏点开的（`from`），否则用 VS Code 默认的打开方式（见 [openingFor]）。
+ * 给了 `spot`（条目的符号在哪）就跳过去：预览滚到那一块、闪一下，普通编辑器选中那个名字。
  */
-async function openFile(uri: Uri, registry: CodeReaderRegistry, previews: PreviewEditorProvider, spot?: TargetSpot): Promise<void> {
+async function openFile(uri: Uri, from: OpenedFrom, registry: CodeReaderRegistry, previews: PreviewEditorProvider, spot?: TargetSpot): Promise<void> {
   const opening = openingFor(await languageOf(uri), languageId => registry.languageFor(languageId) !== undefined, spot)
   if (opening.kind === 'default') {
     await commands.executeCommand('vscode.open', uri, opening.selection && { selection: opening.selection })
     return
   }
-  // 和 vscode.open 一样按「预览标签」打开（用户关了 workbench.editor.enablePreview 时 VS Code 自会固定）
-  const open = (): Thenable<unknown> => commands.executeCommand('vscode.openWith', uri, PREVIEW_VIEW_TYPE, { preview: true })
-  if (opening.reveal)
-    await previews.openAt(uri, opening.reveal, open)
-  else
-    await open()
+  await previews.open(uri, { from, ...(opening.reveal && { reveal: opening.reveal }) })
 }
 
 /**
  * 接入代码阅读：注册表、侧栏的几栏（主栏的文件树可以按审查工单只看 PR 改过的文件，常驻的「未提交的更改」，每个收藏目录、每个「了解一块代码」找的功能各一栏；
- * 行上有问路径、复制、在系统文件管理器里显示、文件注释、收藏目录）、预览编辑器（含问 AI，按文件所在位置标差异）、编辑器右上角的「预览 / 编辑」切换。
+ * 行上有问路径、复制、在系统文件管理器里显示、文件注释、收藏目录）、预览编辑器（含问 AI，审查工作副本里的和从「未提交的更改」点开的标差异）、编辑器右上角的「预览 / 编辑」切换。
  * 内置的语言插件、翻译插件、库规则和命令规则与其他扩展一样通过返回的 API 注册。
  */
 export function registerCodeReader(context: ExtensionContext): CodeReaderApi {
@@ -113,7 +109,7 @@ export function registerCodeReader(context: ExtensionContext): CodeReaderApi {
   const notes = new FileNotes()
   const entries = new WorkspaceEntries()
   const decorator = new RowDecorator(notes, entries)
-  const files = new FileTreeProvider(OPEN_COMMAND, decorator)
+  const files = new FileTreeProvider({ command: OPEN_COMMAND, from: 'other' }, decorator)
   const view = window.createTreeView(FILES_VIEW, { treeDataProvider: files, showCollapseAll: true })
   const locator = new TreeLocator(files, view)
   const review = new ReviewMode(context, FILES_VIEW, view, files)
@@ -123,8 +119,8 @@ export function registerCodeReader(context: ExtensionContext): CodeReaderApi {
   const favorites = new FavoriteViews(context.workspaceState, slots, OPEN_COMMAND, decorator)
   const features = new FeatureViews(context.workspaceState, slots, qa, item => locateItem(item, { adapterFor: languageId => registry.languageFor(languageId), runtime }))
   const heads = new HeadBases()
-  // 预览对比什么按文件所在的位置定：审查工作副本里的对比 PR 的目标分支，工作区仓库里有改动的对比上一次提交
-  const diffBases = locatedDiffBases([review, heads])
+  // 预览对比什么：审查工作副本里的对比 PR 的目标分支，从「未提交的更改」一栏点开的有改动的文件对比上一次提交，别处打开的不比
+  const diffBases = previewDiffBases(review, heads)
   const previews = new PreviewEditorProvider(
     context.extensionUri,
     registry,
@@ -141,7 +137,7 @@ export function registerCodeReader(context: ExtensionContext): CodeReaderApi {
   )
   const openChat = async (page: Uri | undefined): Promise<void> => {
     if (page)
-      await previews.openAsking(page)
+      await previews.open(page, { from: 'other', focusPath: true })
   }
 
   context.subscriptions.push(
@@ -157,7 +153,7 @@ export function registerCodeReader(context: ExtensionContext): CodeReaderApi {
         const languageId = await languageOf(uri)
         return languageId !== undefined && registry.languageFor(languageId) !== undefined
       },
-      uri => previews.openAsking(uri),
+      uri => previews.open(uri, { from: 'other', focusPath: true }),
     ),
     workspace.registerTextDocumentContentProvider(PATH_PREVIEW_SCHEME, {
       provideTextDocumentContent: () => '',
@@ -196,12 +192,13 @@ export function registerCodeReader(context: ExtensionContext): CodeReaderApi {
       commands.registerCommand(featureCommand('rename', slot), () => features.rename(slot)),
       commands.registerCommand(featureCommand('remove', slot), () => features.remove(slot)),
     ]),
-    commands.registerCommand(OPEN_COMMAND, (uri: Uri) => openFile(uri, registry, previews)),
+    // 侧栏各栏的文件行传来的是 (文件 Uri, 从哪一栏点开的)
+    commands.registerCommand(OPEN_COMMAND, (uri: Uri, from: OpenedFrom) => openFile(uri, from, registry, previews)),
     // 「了解一块代码」栏里的条目行传来的是这一行：按眼下的代码找到它再打开
     commands.registerCommand(OPEN_FEATURE_ITEM, async (row?: FeatureRow) => {
       const found = await features.target(row)
       if (found)
-        await openFile(found.uri, registry, previews, found.spot)
+        await openFile(found.uri, 'other', registry, previews, found.spot)
     }),
     // 标题栏按钮传来的是 (文件 Uri, { groupId })，原样转给 VS Code 定位是哪一组的哪个标签
     commands.registerCommand('superpowers.codeReader.showPreview', (...args: unknown[]) => showPreview(previews, args)),