WIP: Untitledなファイルに対応 (#5)

Author: neet

package.json

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

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

@@ -8,24 +8,15 @@ import { titleInputBoxCreator } from '../quickpicks/titleInputBoxCreator';
 import { privateLabel, visibilityQuickPickCreator } from '../quickpicks/visibilityQuickPickCreator';
 import { createMultiStepInput } from '../utils/createMultiStepInput';
 import { handleErrorMessage } from '../utils/errorHandler';
+import { getFilenameFromPath } from '../utils/getFilenameFromPath';
 
 const localize = nls.loadMessageBundle();
 
-/**
- * パスからファイル名を取得
- * @param path 相対/絶対パス
- * @return ファイル名
- */
-export const getFilenameFromPath = (path: string) => {
-  const splitPath = path.split('/');
-  return splitPath[splitPath.length - 1].split('.')[0];
-};
-
 /**
  * 投稿を公開するためのQuickPickとInputBoxを表示
  * @param arg コマンドから渡される引数
  */
-export function compose (arg: object & { path: string }): void {
+export function composeFromExplorer (arg: object & { path: string }): void {
   const fileName = getFilenameFromPath(arg.path);
 
   const titleInputBox       = titleInputBoxCreator(fileName);

src/commands/composeFromTextEditor.ts

@@ -0,0 +1,86 @@
+import { CreateItemOptions } from 'qiita-js-2';
+import { commands, Uri, window } from 'vscode';
+import * as nls from 'vscode-nls';
+import { client } from '../client';
+import { configuration } from '../configuration';
+import { tagQuickPickCreator } from '../quickpicks/tagQuickPickCreator';
+import { titleInputBoxCreator } from '../quickpicks/titleInputBoxCreator';
+import { privateLabel, visibilityQuickPickCreator } from '../quickpicks/visibilityQuickPickCreator';
+import { createMultiStepInput } from '../utils/createMultiStepInput';
+import { handleErrorMessage } from '../utils/errorHandler';
+import { getFilenameFromPath } from '../utils/getFilenameFromPath';
+
+const localize = nls.loadMessageBundle();
+
+/**
+ * アクティブなテキストエディタから投稿を公開するコマンドパレット向け関数
+ */
+export async function composeFromTextEditor () {
+  if (!window.activeTextEditor) {
+    return;
+  }
+
+  const titleInputBox       = titleInputBoxCreator(getFilenameFromPath(window.activeTextEditor.document.fileName));
+  const tagsQuickPick       = tagQuickPickCreator();
+  const visibilityQuickPick = visibilityQuickPickCreator();
+
+  // Qiita.createItemのオプション
+  const options: CreateItemOptions = {
+    title: '',
+    body: window.activeTextEditor.document.getText(),
+    tags: [],
+    private: false,
+    tweet: configuration.tweetOnCreateItem,
+    gist: configuration.gistOnCreateItem,
+  };
+
+  // titleInputBoxからタイトルを代入
+  titleInputBox.onDidAccept(() => {
+    options.title = titleInputBox.value;
+  });
+
+  // tagQuickPickからタグを代入
+  tagsQuickPick.onDidAccept(() => {
+    options.tags = tagsQuickPick.selectedItems.map((item) => ({
+      name: item.label,
+      versions: [],
+    }));
+  });
+
+  // visibilityQuickPick終了時に公開状態を代入してQiita.createItemを呼び出し
+  visibilityQuickPick.onDidAccept(async () => {
+    options.private = visibilityQuickPick.selectedItems[0].label === privateLabel;
+
+    try {
+      visibilityQuickPick.hide();
+      const item = await client.createItem(options);
+
+      const openInBrowser = localize(
+        'commands.compose.openInBrowser',
+        'ブラウザで確認',
+      );
+
+      const result = await window.showInformationMessage(
+        localize(
+          'commands.compose.success',
+          '投稿を公開しました',
+        ),
+        openInBrowser,
+      );
+
+      if (result === openInBrowser) {
+        commands.executeCommand('vscode.open', Uri.parse(item.url));
+      }
+
+      return;
+    } catch (error) {
+      return handleErrorMessage(error);
+    }
+  });
+
+  createMultiStepInput([
+    titleInputBox,
+    tagsQuickPick,
+    visibilityQuickPick,
+  ])();
+}

src/extension.ts

@@ -1,6 +1,7 @@
 import { commands, ExtensionContext, window } from 'vscode';
 import * as nls from 'vscode-nls';
-import { compose } from './commands/compose';
+import { composeFromExplorer } from './commands/composeFromExplorer';
+import { composeFromTextEditor } from './commands/composeFromTextEditor';
 import { deleteItem } from './commands/deleteItem';
 import { editTags } from './commands/editTags';
 import { makePublic } from './commands/makePublic';
@@ -18,7 +19,8 @@ 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.compose', compose),
+    commands.registerCommand('qiita.composeFromExplorer', composeFromExplorer),
+    commands.registerCommand('qiita.composeFromTextEditor', composeFromTextEditor),
     commands.registerCommand('qiita.openItemExternal', openItemExternal),
     commands.registerCommand('qiita.deleteItem', deleteItem),
   );

src/test/commands.ts/compose.test.ts src/test/utils/compose.test.tssrc/test/commands.ts/compose.test.ts renamed to src/test/utils/compose.test.ts

@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { getFilenameFromPath } from '../../commands/compose';
+import { getFilenameFromPath } from '../../utils/getFilenameFromPath';
 
 describe('compose', () => {
   it('パスから拡張子を除いたファイル名を取得', () => {

src/utils/getFilenameFromPath.ts

@@ -0,0 +1,9 @@
+/**
+ * パスからファイル名を取得
+ * @param path 相対/絶対パス
+ * @return ファイル名
+ */
+export const getFilenameFromPath = (path: string) => {
+  const splitPath = path.split('/');
+  return splitPath[splitPath.length - 1].split('.')[0];
+};