Compose系コマンドを統一

Author: neet

package.json

@@ -40,8 +40,7 @@
   "activationEvents": [
     "onView:qiitaItems",
     "onLanguage:markdown",
-    "onCommand:qiita.composeFromTextEditor",
-    "onCommand:qiita.composeFromExplorer",
+    "onCommand:qiita.compose",
     "onCommand:qiita.openItem",
     "onCommand:qiita.deleteItem",
     "onCommand:qiita.editTags",
@@ -51,12 +50,7 @@
   "contributes": {
     "commands": [
       {
-        "command": "qiita.composeFromTextEditor",
-        "title": "%commands.compose.title%",
-        "category": "Qiita"
-      },
-      {
-        "command": "qiita.composeFromExplorer",
+        "command": "qiita.compose",
         "title": "%commands.compose.title%",
         "category": "Qiita"
       },
@@ -110,8 +104,7 @@
     ],
     "menus": {
       "commandPalette": [
-        { "command": "qiita.composeFromTextEditor" },
-        { "command": "qiita.composeFromExplorer", "when": "false" },
+        { "command": "qiita.compose" },
         { "command": "qiita.openItem", "when": "false" },
         { "command": "qiita.deleteItem", "when": "false" },
         { "command": "qiita.editTags", "when": "false" },
@@ -120,28 +113,28 @@
       ],
       "editor/title": [
         {
-          "command": "qiita.composeFromTextEditor",
+          "command": "qiita.compose",
           "when": "resourceLangId == markdown",
           "group": "3_open"
         }
       ],
       "editor/context": [
         {
-          "command": "qiita.composeFromTextEditor",
+          "command": "qiita.compose",
           "when": "resourceLangId == markdown",
           "group": "z_commands"
         }
       ],
       "editor/title/context": [
         {
-          "command": "qiita.composeFromExplorer",
+          "command": "qiita.compose",
           "when": "resourceLangId == markdown",
           "group": "1_modification"
         }
       ],
       "explorer/context": [
         {
-          "command": "qiita.composeFromExplorer",
+          "command": "qiita.compose",
           "when": "resourceLangId == markdown",
           "group": "7_modification"
         }

src/commands/composeFromTextEditor.ts src/commands/compose.tssrc/commands/composeFromTextEditor.ts renamed to src/commands/compose.ts

@@ -1,5 +1,5 @@
 import { CreateItemOptions } from 'qiita-js-2';
-import { commands, Uri, window } from 'vscode';
+import { commands, Uri, window, workspace } from 'vscode';
 import * as nls from 'vscode-nls';
 import { client } from '../client';
 import { configuration } from '../configuration';
@@ -12,28 +12,38 @@ import { getFilenameFromPath } from '../utils/getFilenameFromPath';
 
 const localize = nls.loadMessageBundle();
 
+
+
 /**
  * アクティブなテキストエディタから投稿を公開するコマンドパレット向け関数
+ * @param resource コマンドがexplorerから発火した際に渡される引数
  */
-export async function composeFromTextEditor () {
-  if (!window.activeTextEditor) {
-    return;
-  }
-
-  const titleInputBox       = titleInputBoxCreator(getFilenameFromPath(window.activeTextEditor.document.fileName));
-  const tagsQuickPick       = tagQuickPickCreator();
-  const visibilityQuickPick = visibilityQuickPickCreator();
-
-  // Qiita.createItemのオプション
+export async function compose (resource?: { path: string }) {
   const options: CreateItemOptions = {
+    body:  '',
     title: '',
-    body: window.activeTextEditor.document.getText(),
     tags: [],
     private: false,
     tweet: configuration.tweetOnCreateItem,
     gist: configuration.gistOnCreateItem,
   };
 
+  // explorerから発火した場合
+  if (resource && resource.path) {
+    options.title = getFilenameFromPath(resource.path);
+    options.body  = await workspace.openTextDocument(resource.path).then((document) => document.getText());
+  }
+
+  // テキストエディタから発火した場合
+  if (window.activeTextEditor) {
+    options.title = getFilenameFromPath(window.activeTextEditor.document.fileName);
+    options.body  = window.activeTextEditor.document.getText();
+  }
+
+  const titleInputBox       = titleInputBoxCreator(options.title);
+  const tagsQuickPick       = tagQuickPickCreator();
+  const visibilityQuickPick = visibilityQuickPickCreator();
+
   // titleInputBoxからタイトルを代入
   titleInputBox.onDidAccept(() => {
     options.title = titleInputBox.value;
@@ -53,6 +63,7 @@ export async function composeFromTextEditor () {
 
     try {
       visibilityQuickPick.hide();
+
       const item = await client.createItem(options);
 
       const openInBrowser = localize(

src/commands/composeFromExplorer.ts

@@ -1,7 +1,6 @@
 import { commands, ExtensionContext, window } from 'vscode';
 import * as nls from 'vscode-nls';
-import { composeFromExplorer } from './commands/composeFromExplorer';
-import { composeFromTextEditor } from './commands/composeFromTextEditor';
+import { compose } from './commands/compose';
 import { deleteItem } from './commands/deleteItem';
 import { editTags } from './commands/editTags';
 import { makePublic } from './commands/makePublic';
@@ -19,8 +18,7 @@ export function activate (context: ExtensionContext) {
     commands.registerCommand('qiita.openItem', openItem(context.storagePath)),
     commands.registerCommand('qiita.editTags', editTags),
     commands.registerCommand('qiita.makePublic', makePublic),
-    commands.registerCommand('qiita.composeFromExplorer', composeFromExplorer),
-    commands.registerCommand('qiita.composeFromTextEditor', composeFromTextEditor),
+    commands.registerCommand('qiita.compose', compose),
     commands.registerCommand('qiita.openItemExternal', openItemExternal),
     commands.registerCommand('qiita.deleteItem', deleteItem),
   );