@microsoft/inshellisense 0.0.1-rc.15 → 0.0.1-rc.18

package/LICENSE

@@ -1,21 +1,21 @@
-    MIT License
-
-    Copyright (c) Microsoft Corporation.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE
+    MIT License
+
+    Copyright (c) Microsoft Corporation.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE

package/README.md

@@ -18,7 +18,7 @@ npm install -g @microsoft/inshellisense
 
 ### Quickstart
 
-After completing the installation, you can run `is` to start the autocomplete session for your desired shell. Additionally, inshellisense is also aliased under `inshellisense` after installation.
+After completing the installation, run `is doctor` to verify your installation was successful. You can run `is` to start the autocomplete session for your desired shell. Additionally, inshellisense is also aliased under `inshellisense` after installation.
 
 ### Shell Plugin
 
@@ -35,18 +35,21 @@ is init zsh >> ~/.zshrc
 is init fish >> ~/.config/fish/config.fish
 
 # pwsh
-is init pwsh >> $profile
+is init pwsh | Add-Content $profile
 
 # powershell
-is init powershell >> $profile
+is init powershell | Add-Content $profile
 
 # xonsh
 is init xonsh >> ~/.xonshrc
 
 # nushell
-is init nu >> $nu.env-path
+is init nu | save $nu.env-path --append
 ```
 
+> [!NOTE]  
+> When updating your shell configuration in the future, make sure the inshellisense plugin is the last command in the file. Including commands after it may break the configuration (ex. initializing your shell plugin manager after the inshellisense plugin)
+
 ### Usage
 
 | Action                                | Command | Description                                      |

package/SECURITY.md

@@ -1,41 +1,41 @@
-<!-- BEGIN MICROSOFT SECURITY.MD V0.0.9 BLOCK -->
-
-## Security
-
-Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet) and [Xamarin](https://github.com/xamarin).
-
-If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/security.md/definition), please report it to us as described below.
-
-## Reporting Security Issues
-
-**Please do not report security vulnerabilities through public GitHub issues.**
-
-Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/security.md/msrc/create-report).
-
-If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/security.md/msrc/pgp).
-
-You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). 
-
-Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
-
-  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
-  * Full paths of source file(s) related to the manifestation of the issue
-  * The location of the affected source code (tag/branch/commit or direct URL)
-  * Any special configuration required to reproduce the issue
-  * Step-by-step instructions to reproduce the issue
-  * Proof-of-concept or exploit code (if possible)
-  * Impact of the issue, including how an attacker might exploit the issue
-
-This information will help us triage your report more quickly.
-
-If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/security.md/msrc/bounty) page for more details about our active programs.
-
-## Preferred Languages
-
-We prefer all communications to be in English.
-
-## Policy
-
-Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/security.md/cvd).
-
-<!-- END MICROSOFT SECURITY.MD BLOCK -->
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.9 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet) and [Xamarin](https://github.com/xamarin).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/security.md/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/security.md/msrc/create-report).
+
+If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/security.md/msrc/pgp).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/security.md/msrc/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/security.md/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

package/build/commands/complete-action.js

@@ -0,0 +1,10 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+import os from "node:os";
+import { getSuggestions } from "../runtime/runtime.js";
+import { Shell } from "../utils/shell.js";
+export const action = async (input) => {
+    const suggestions = await getSuggestions(input, process.cwd(), os.platform() === "win32" ? Shell.Cmd : Shell.Bash);
+    process.stdout.write(JSON.stringify(suggestions));
+    process.exit(0);
+};

package/build/commands/doctor.js

@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+import { Command } from "commander";
+import { render } from "../ui/ui-doctor.js";
+const action = async () => {
+    await render();
+};
+const cmd = new Command("doctor");
+cmd.description(`checks the health of this inshellisense installation`);
+cmd.action(action);
+export default cmd;

package/build/commands/init.js

@@ -1,18 +1,24 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 import { Command } from "commander";
-import { initSupportedShells as shells, getShellConfig } from "../utils/shell.js";
+import { createShellConfigs, initSupportedShells as shells, getShellSourceCommand } from "../utils/shell.js";
 const supportedShells = shells.join(", ");
-const action = (program) => async (shell) => {
+const action = (program) => async (shell, options) => {
+    if (options.generateFullConfigs) {
+        await createShellConfigs();
+        return;
+    }
+    if (shell == null)
+        program.error(`Shell is required, supported shells: ${supportedShells}`, { exitCode: 1 });
     if (!shells.map((s) => s.valueOf()).includes(shell)) {
         program.error(`Unsupported shell: '${shell}', supported shells: ${supportedShells}`, { exitCode: 1 });
     }
-    const config = getShellConfig(shell);
-    process.stdout.write(`\n\n# ---------------- inshellisense shell plugin ----------------\n${config}`);
-    process.exit(0);
+    const config = getShellSourceCommand(shell);
+    process.stdout.write(`\n\n${config}`);
 };
 const cmd = new Command("init");
-cmd.description(`generates shell configurations for the provided shell`);
-cmd.argument("<shell>", `shell to generate configuration for, supported shells: ${supportedShells}`);
+cmd.description(`generates shell configurations and prints the source command for the specified shell`);
+cmd.argument("[shell]", `shell to generate for, supported shells: ${supportedShells}`);
+cmd.option("--generate-full-configs");
 cmd.action(action(cmd));
 export default cmd;

package/build/commands/root-action.js

@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+import { render, renderConfirmation } from "../ui/ui-root.js";
+import { Shell, supportedShells as shells, setupZshDotfiles, setupBashPreExec } from "../utils/shell.js";
+import { inferShell } from "../utils/shell.js";
+import { loadConfig } from "../utils/config.js";
+import log from "../utils/log.js";
+import { loadAliases } from "../runtime/alias.js";
+import { loadLocalSpecsSet } from "../runtime/runtime.js";
+import { program } from "./root.js";
+export const supportedShells = shells.join(", ");
+export const action = async (options) => {
+    const inISTerm = process.env.ISTERM === "1";
+    if (options.check || inISTerm) {
+        process.stdout.write(renderConfirmation(inISTerm));
+        process.exit(0);
+    }
+    if (options.verbose)
+        await log.enable();
+    await loadConfig(program);
+    await loadLocalSpecsSet();
+    const shell = options.shell ?? (await inferShell());
+    if (shell == null) {
+        program.error(`Unable to identify shell, use the -s/--shell option to provide your shell`, { exitCode: 1 });
+        return;
+    }
+    if (!shells.map((s) => s.valueOf()).includes(shell)) {
+        program.error(`Unsupported shell: '${shell}', supported shells: ${supportedShells}`, { exitCode: 1 });
+    }
+    if (shell == Shell.Zsh) {
+        await setupZshDotfiles();
+    }
+    else if (shell == Shell.Bash) {
+        await setupBashPreExec();
+    }
+    await loadAliases(shell);
+    await render(shell, options.test ?? false, options.login ?? false);
+};

package/build/commands/root.js

@@ -18,6 +18,7 @@ export const action = (program) => async (options) => {
         await log.enable();
     await loadConfig(program);
     await loadLocalSpecsSet();
+    log.overrideConsole();
     const shell = options.shell ?? (await inferShell());
     if (shell == null) {
         program.error(`Unable to identify shell, use the -s/--shell option to provide your shell`, { exitCode: 1 });

package/build/commands/shellenv.js

@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+import { Command } from "commander";
+import { shellEnvSupportedShells as shells, getShellConfig } from "../utils/shell.js";
+const supportedShells = shells.join(", ");
+const action = (program) => async (shell) => {
+    if (!shells.map((s) => s.valueOf()).includes(shell)) {
+        program.error(`Unsupported shell: '${shell}', supported shells: ${supportedShells}`, { exitCode: 1 });
+    }
+    const config = getShellConfig(shell);
+    process.stdout.write(`\n\n# ---------------- inshellisense shell plugin ----------------\n${config}`);
+    process.exit(0);
+};
+const cmd = new Command("shellenv");
+cmd.description(`generates shell configurations for the provided shell`);
+cmd.argument("<shell>", `shell to generate configuration for, supported shells: ${supportedShells}`);
+cmd.action(action(cmd));
+export default cmd;

package/build/index.js

@@ -7,6 +7,7 @@ import complete from "./commands/complete.js";
 import uninstall from "./commands/uninstall.js";
 import init from "./commands/init.js";
 import specs from "./commands/specs/root.js";
+import doctor from "./commands/doctor.js";
 import { action, supportedShells } from "./commands/root.js";
 import { getVersion } from "./utils/version.js";
 const program = new Command();
@@ -31,4 +32,5 @@ program.addCommand(complete);
 program.addCommand(uninstall);
 program.addCommand(init);
 program.addCommand(specs);
+program.addCommand(doctor);
 program.parse();

package/build/isterm/commandManager.js

@@ -154,12 +154,9 @@ export class CommandManager {
         const dim = (cell?.isDim() ?? 0) > 0;
         const italic = (cell?.isItalic() ?? 0) > 0;
         const dullColor = color == 8 || color == 7 || (color ?? 0) > 235 || (color == 15 && dim);
-        const dullItalic = (color ?? 0) > 235 || (dullColor && italic);
-        if (this.#shell == Shell.Powershell) {
-            return false;
-        }
-        else if (this.#shell == Shell.Pwsh) {
-            return dullItalic;
+        const dimItalic = dim || italic;
+        if (this.#shell == Shell.Pwsh || this.#shell == Shell.Powershell) {
+            return dimItalic;
         }
         return dullColor;
     }

package/build/isterm/pty.js

@@ -7,6 +7,7 @@ import path from "node:path";
 import url from "node:url";
 import fs from "node:fs";
 import stripAnsi from "strip-ansi";
+import { Unicode11Addon } from "@xterm/addon-unicode11";
 import pty from "@homebridge/node-pty-prebuilt-multiarch";
 import { Shell, userZdotdir, zdotdir } from "../utils/shell.js";
 import { IsTermOscPs, IstermOscPt, IstermPromptStart, IstermPromptEnd } from "../utils/ansi.js";
@@ -44,7 +45,10 @@ export class ISTerm {
         this.cols = this.#pty.cols;
         this.rows = this.#pty.rows;
         this.process = this.#pty.process;
+        const unicode11Addon = new Unicode11Addon();
         this.#term = new xterm.Terminal({ allowProposedApi: true, rows, cols });
+        this.#term.loadAddon(unicode11Addon);
+        this.#term.unicode.activeVersion = "11";
         this.#term.parser.registerOscHandler(IsTermOscPs, (data) => this._handleIsSequence(data));
         this.#commandManager = new CommandManager(this.#term, shell);
         this.#shell = shell;
@@ -86,7 +90,9 @@ export class ISTerm {
         return cwd;
     }
     _sanitizedPrompt(prompt) {
-        return stripAnsi(prompt);
+        // eslint-disable-next-line no-control-regex -- strip OSC control sequences
+        const oscStrippedPrompt = prompt.replace(/\x1b\][0-9]+;.*\x07/g, "");
+        return stripAnsi(oscStrippedPrompt);
     }
     _handleIsSequence(data) {
         const argsIndex = data.indexOf(";");

package/build/runtime/alias.js

@@ -7,7 +7,7 @@ import { buildExecuteShellCommand } from "./utils.js";
 import os from "node:os";
 const loadedAliases = {};
 const platform = os.platform();
-const executeShellCommand = buildExecuteShellCommand(5000);
+const executeShellCommand = await buildExecuteShellCommand(5000);
 const loadBashAliases = async () => {
     const shellTarget = platform == "win32" ? await gitBashPath() : Shell.Bash;
     const { stdout, stderr, status } = await executeShellCommand({ command: shellTarget, args: ["-i", "-c", "alias"], cwd: process.cwd() });
@@ -20,7 +20,7 @@ const loadBashAliases = async () => {
         .split("\n")
         .forEach((line) => {
         const [alias, ...commandSegments] = line.replace("alias ", "").replaceAll("'\\''", "'").split("=");
-        loadedAliases[alias] = parseCommand(commandSegments.join("=").slice(1, -1) + " ");
+        loadedAliases[alias] = parseCommand(commandSegments.join("=").slice(1, -1) + " ", Shell.Bash);
     });
 };
 const loadZshAliases = async () => {
@@ -34,7 +34,7 @@ const loadZshAliases = async () => {
         .split("\n")
         .forEach((line) => {
         const [alias, ...commandSegments] = line.replaceAll("'\\''", "'").split("=");
-        loadedAliases[alias] = parseCommand(commandSegments.join("=").slice(1, -1) + " ");
+        loadedAliases[alias] = parseCommand(commandSegments.join("=").slice(1, -1) + " ", Shell.Zsh);
     });
 };
 export const loadAliases = async (shell) => {

package/build/runtime/generator.js

@@ -17,7 +17,7 @@ const getGeneratorContext = (cwd) => {
 export const runGenerator = async (generator, tokens, cwd) => {
     // TODO: support trigger
     const { script, postProcess, scriptTimeout, splitOn, custom, template, filterTemplateSuggestions } = generator;
-    const executeShellCommand = buildExecuteShellCommand(scriptTimeout ?? 5000);
+    const executeShellCommand = await buildExecuteShellCommand(scriptTimeout ?? 5000);
     const suggestions = [];
     try {
         if (script) {

package/build/runtime/parser.js

@@ -1,19 +1,48 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+import wcwidth from "wcwidth";
+import { getShellWhitespaceEscapeChar } from "./utils.js";
 const cmdDelim = /(\|\|)|(&&)|(;)|(\|)/;
 const spaceRegex = /\s/;
-export const parseCommand = (command) => {
+export const parseCommand = (command, shell) => {
     const lastCommand = command.split(cmdDelim).at(-1)?.trimStart();
-    return lastCommand ? lex(lastCommand) : [];
+    const tokens = lastCommand ? lex(lastCommand, shell) : [];
+    return sanitizeTokens(tokens, shell);
 };
-const lex = (command) => {
+const sanitizeTokens = (cmdTokens, shell) => unwrapQuotedTokens(unescapeSpaceTokens(cmdTokens, shell), shell);
+// remove escapes around spaces
+const unescapeSpaceTokens = (cmdTokens, shell) => {
+    const escapeChar = getShellWhitespaceEscapeChar(shell);
+    return cmdTokens.map((cmdToken) => {
+        const { token, isQuoted } = cmdToken;
+        if (!isQuoted && token.includes(`${escapeChar} `)) {
+            return { ...cmdToken, token: token.replaceAll(`${escapeChar} `, " ") };
+        }
+        return cmdToken;
+    });
+};
+// need to unwrap tokens that are quoted with content after the quotes like `"hello"world`
+const unwrapQuotedTokens = (cmdTokens, shell) => {
+    const escapeChar = getShellWhitespaceEscapeChar(shell);
+    return cmdTokens.map((cmdToken) => {
+        const { token, isQuoteContinued } = cmdToken;
+        if (isQuoteContinued) {
+            const quoteChar = token[0];
+            const unquotedToken = token.replaceAll(`${escapeChar}${quoteChar}`, "\u001B").replaceAll(quoteChar, "").replaceAll("\u001B", quoteChar);
+            return { ...cmdToken, token: unquotedToken };
+        }
+        return cmdToken;
+    });
+};
+const lex = (command, shell) => {
     const tokens = [];
-    let [readingQuotedString, readingFlag, readingCmd] = [false, false, false];
+    const escapeChar = getShellWhitespaceEscapeChar(shell);
+    let [readingQuotedString, readingQuoteContinuedString, readingFlag, readingCmd] = [false, false, false, false];
     let readingIdx = 0;
     let readingQuoteChar = "";
     [...command].forEach((char, idx) => {
-        const reading = readingQuotedString || readingFlag || readingCmd;
-        if (!reading && (char === `'` || char === `"`)) {
+        const reading = readingQuotedString || readingQuoteContinuedString || readingFlag || readingCmd;
+        if (!reading && (char === `'` || char === `"` || char == "`")) {
             [readingQuotedString, readingIdx, readingQuoteChar] = [true, idx, char];
             return;
         }
@@ -25,46 +54,76 @@ const lex = (command) => {
             [readingCmd, readingIdx] = [true, idx];
             return;
         }
-        if (readingQuotedString && char === readingQuoteChar && command.at(idx - 1) !== "\\") {
+        if (readingQuotedString && char === readingQuoteChar && command.at(idx - 1) !== escapeChar && !spaceRegex.test(command.at(idx + 1) ?? " ")) {
+            readingQuotedString = false;
+            readingQuoteContinuedString = true;
+        }
+        else if (readingQuotedString && char === readingQuoteChar && command.at(idx - 1) !== escapeChar) {
             readingQuotedString = false;
             const complete = idx + 1 < command.length && spaceRegex.test(command[idx + 1]);
             tokens.push({
                 token: command.slice(readingIdx + 1, idx),
+                tokenLength: wcwidth(command.slice(readingIdx + 1, idx)) + 2,
                 complete,
                 isOption: false,
                 isQuoted: true,
             });
         }
+        else if (readingQuoteContinuedString && spaceRegex.test(char) && command.at(idx - 1) !== escapeChar) {
+            readingQuoteContinuedString = false;
+            tokens.push({
+                token: command.slice(readingIdx, idx),
+                tokenLength: wcwidth(command.slice(readingIdx, idx)),
+                complete: true,
+                isOption: false,
+                isQuoted: true,
+                isQuoteContinued: true,
+            });
+        }
         else if ((readingFlag && spaceRegex.test(char)) || char === "=") {
             readingFlag = false;
             tokens.push({
                 token: command.slice(readingIdx, idx),
+                tokenLength: wcwidth(command.slice(readingIdx, idx)),
                 complete: true,
                 isOption: true,
             });
         }
-        else if (readingCmd && spaceRegex.test(char) && command.at(idx - 1) !== "\\") {
+        else if (readingCmd && spaceRegex.test(char) && command.at(idx - 1) !== escapeChar) {
             readingCmd = false;
             tokens.push({
                 token: command.slice(readingIdx, idx),
+                tokenLength: wcwidth(command.slice(readingIdx, idx)),
                 complete: true,
                 isOption: false,
             });
         }
     });
-    const reading = readingQuotedString || readingFlag || readingCmd;
+    const reading = readingQuotedString || readingQuoteContinuedString || readingFlag || readingCmd;
     if (reading) {
         if (readingQuotedString) {
             tokens.push({
                 token: command.slice(readingIdx + 1),
+                tokenLength: wcwidth(command.slice(readingIdx + 1)) + 1,
+                complete: false,
+                isOption: false,
+                isQuoted: true,
+            });
+        }
+        else if (readingQuoteContinuedString) {
+            tokens.push({
+                token: command.slice(readingIdx),
+                tokenLength: wcwidth(command.slice(readingIdx)),
                 complete: false,
                 isOption: false,
                 isQuoted: true,
+                isQuoteContinued: true,
             });
         }
         else {
             tokens.push({
                 token: command.slice(readingIdx),
+                tokenLength: wcwidth(command.slice(readingIdx)),
                 complete: false,
                 isOption: readingFlag,
             });