Fix issue where workspace args are not parsed.

src/node/cli.ts

@@ -3,7 +3,15 @@ import { promises as fs } from "fs"
 import yaml from "js-yaml"
 import * as os from "os"
 import * as path from "path"
-import { canConnect, generateCertificate, generatePassword, humanPath, paths, isNodeJSErrnoException } from "./util"
+import {
+  canConnect,
+  generateCertificate,
+  generatePassword,
+  humanPath,
+  paths,
+  isNodeJSErrnoException,
+  isFile,
+} from "./util"
 
 const DEFAULT_SOCKET_PATH = path.join(os.tmpdir(), "vscode-ipc")
 
@@ -282,12 +290,12 @@ export const createDefaultArgs = (): Args => {
   }
 }
 
-export const parse = (
+export const parse = async (
   argv: string[],
   opts?: {
     configFile?: string
   },
-): Args => {
+): Promise<Args> => {
   const error = (msg: string): Error => {
     if (opts?.configFile) {
       msg = `error reading ${opts.configFile}: ${msg}`
@@ -296,7 +304,6 @@ export const parse = (
     return new Error(msg)
   }
 
-  // TODO: parse workspace and folder.
   const args: Args = createDefaultArgs()
   let ended = false
 
@@ -399,6 +406,17 @@ export const parse = (
     args._.push(arg)
   }
 
+  if (args._.length && !args.folder && !args.workspace) {
+    const firstEntry = path.resolve(process.cwd(), args._[0])
+
+    if ((await isFile(firstEntry)) && path.extname(firstEntry) === ".code-workspace") {
+      args.workspace = firstEntry
+      args._.shift()
+    } else {
+      args.folder = args._.join(" ")
+    }
+  }
+
   // If a cert was provided a key must also be provided.
   if (args.cert && args.cert.value && !args["cert-key"]) {
     throw new Error("--cert-key is missing")
@@ -591,7 +609,7 @@ export async function readConfigFile(configPath?: string): Promise<ConfigArgs> {
  * parseConfigFile parses configFile into ConfigArgs.
  * configPath is used as the filename in error messages
  */
-export function parseConfigFile(configFile: string, configPath: string): ConfigArgs {
+export async function parseConfigFile(configFile: string, configPath: string): Promise<ConfigArgs> {
   if (!configFile) {
     return { ...createDefaultArgs(), config: configPath }
   }
@@ -611,7 +629,7 @@ export function parseConfigFile(configFile: string, configPath: string): ConfigA
     }
     return `--${optName}=${opt}`
   })
-  const args = parse(configFileArgv, {
+  const args = await parse(configFileArgv, {
     configFile: configPath,
   })
   return {

src/node/entry.ts

@@ -22,14 +22,16 @@ async function entry(): Promise<void> {
     return
   }
 
-  const cliArgs = parse(process.argv.slice(2))
+  const cliArgs = await parse(process.argv.slice(2))
   const configArgs = await readConfigFile(cliArgs.config)
   const args = await setDefaults(cliArgs, configArgs)
 
   if (args.help) {
     console.log("code-server", version, commit)
     console.log("")
     console.log(`Usage: code-server [options] [path]`)
+    console.log(`    - Opening a directory: code-server ./path/to/your/project`)
+    console.log(`    - Opening a saved workspace: code-server ./path/to/your/project.code-workspace`)
     console.log("")
     console.log("Options")
     optionDescriptions().forEach((description) => {

src/node/main.ts

@@ -124,11 +124,17 @@ export const runCodeServer = async (
   }
 
   const app = await createApp(args)
-  const serverAddress = ensureAddress(app.server, args.cert ? "https" : "http")
+  const protocol = args.cert ? "https" : "http"
+  const serverAddress = ensureAddress(app.server, protocol)
   const disposeRoutes = await register(app, args)
 
   logger.info(`Using config file ${humanPath(args.config)}`)
-  logger.info(`HTTP server listening on ${serverAddress.toString()} ${args.link ? "(randomized by --link)" : ""}`)
+  logger.info(
+    `${protocol.toUpperCase()} server listening on ${serverAddress.toString()} ${
+      args.link ? "(randomized by --link)" : ""
+    }`,
+  )
+
   if (args.auth === AuthType.Password) {
     logger.info("  - Authentication is enabled")
     if (args.usingEnvPassword) {

test/e2e/models/CodeServer.ts

@@ -129,7 +129,7 @@ export class CodeServer {
         if (resolved) {
           return
         }
-        const match = line.trim().match(/HTTP server listening on (https?:\/\/[.:\d]+)\/?$/)
+        const match = line.trim().match(/HTTPS? server listening on (https?:\/\/[.:\d]+)\/?$/)
         if (match) {
           // Cookies don't seem to work on IP address so swap to localhost.
           // TODO: Investigate whether this is a bug with code-server.