feat: Allow select files to commit when choose "changes" (close #472)

src/changelistItems.ts

@@ -5,6 +5,7 @@ import IgnoredChangeListItem from "./quickPickItems/ignoredChangeListItem";
 import NewChangeListItem from "./quickPickItems/newChangeListItem";
 import RemoveChangeListItem from "./quickPickItems/removeChangeListItem";
 import { Repository } from "./repository";
+import { FileItem } from "./quickPickItems/fileItem";
 
 export function getChangelistPickOptions(
   repository: Repository,
@@ -116,6 +117,29 @@ export async function inputCommitChangelist(repository: Repository) {
   return choice;
 }
 
+export async function inputCommitFiles(repository: Repository) {
+  const choice = await inputCommitChangelist(repository);
+  if (!choice) {
+    return;
+  }
+
+  if (choice.id === "changes") {
+    const picks = choice.resourceGroup.resourceStates.map(r => new FileItem(repository, r));
+    const selected = await window.showQuickPick(picks, {
+      placeHolder: "Select files to commit",
+      canPickMany: true
+    });
+
+    if (selected) {
+      return selected.map(s => s.state);
+    }
+
+    return;
+  }
+
+  return choice.resourceGroup.resourceStates;
+}
+
 export function patchChangelistOptions(repository: Repository) {
   const picks: QuickPickItem[] = [];
 

src/commands/commitWithMessage.ts

@@ -1,6 +1,6 @@
 import * as path from "path";
 import { window } from "vscode";
-import { inputCommitChangelist } from "../changelistItems";
+import { inputCommitFiles } from "../changelistItems";
 import { Status } from "../common/types";
 import { inputCommitMessage } from "../messages";
 import { Repository } from "../repository";
@@ -13,12 +13,12 @@ export class CommitWithMessage extends Command {
   }
 
   public async execute(repository: Repository) {
-    const choice = await inputCommitChangelist(repository);
-    if (!choice) {
+    const resourceStates = await inputCommitFiles(repository);
+    if (!resourceStates || resourceStates.length === 0) {
       return;
     }
 
-    const filePaths = choice.resourceGroup.resourceStates.map(state => {
+    const filePaths = resourceStates.map(state => {
       return state.resourceUri.fsPath;
     });
 
@@ -32,7 +32,7 @@ export class CommitWithMessage extends Command {
     }
 
     // If files is renamed, the commit need previous file
-    choice.resourceGroup.resourceStates.forEach(state => {
+    resourceStates.forEach(state => {
       if (state instanceof Resource) {
         if (state.type === Status.ADDED && state.renameResourceUri) {
           filePaths.push(state.renameResourceUri.fsPath);

src/quickPickItems/changeListItem.ts

@@ -1,16 +1,21 @@
-import { QuickPickItem, SourceControlResourceGroup } from "vscode";
+import { QuickPickItem } from "vscode";
+import { ISvnResourceGroup } from "../common/types";
 
 export default class ChangeListItem implements QuickPickItem {
-  constructor(protected group: SourceControlResourceGroup) {}
+  constructor(protected group: ISvnResourceGroup) {}
 
   get label(): string {
     return this.group.id.replace(/^changelist-/, "");
   }
 
+  get id(): string {
+    return this.group.id;
+  }
+
   get description(): string {
     return this.group.label;
   }
-  get resourceGroup(): SourceControlResourceGroup {
+  get resourceGroup(): ISvnResourceGroup {
     return this.group;
   }
 }

src/quickPickItems/fileItem.ts

@@ -0,0 +1,22 @@
+import { QuickPickItem } from "vscode";
+import { Repository } from "../repository";
+import { Resource } from "../resource";
+
+export class FileItem implements QuickPickItem {
+  constructor(
+    protected _repository: Repository,
+    protected _state: Resource,
+    public picked = false
+  ) { }
+
+  get label(): string {
+    return this._repository.repository.removeAbsolutePath(this._state.resourceUri.fsPath);
+  }
+
+  get description(): string {
+    return this._state.resourceUri.fsPath;
+  }
+  get state(): Resource {
+    return this._state;
+  }
+}