refactor: delete unused code
This commit is contained in:
parent
7a8d487729
commit
cec0658e86
@ -1,12 +1,3 @@
|
|||||||
/**
|
|
||||||
* Split a string up to the delimiter. If the delimiter doesn't exist the first
|
|
||||||
* item will have all the text and the second item will be an empty string.
|
|
||||||
*/
|
|
||||||
export const split = (str: string, delimiter: string): [string, string] => {
|
|
||||||
const index = str.indexOf(delimiter)
|
|
||||||
return index !== -1 ? [str.substring(0, index).trim(), str.substring(index + 1)] : [str, ""]
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Appends an 's' to the provided string if count is greater than one;
|
* Appends an 's' to the provided string if count is greater than one;
|
||||||
* otherwise the string is returned
|
* otherwise the string is returned
|
||||||
@ -34,27 +25,6 @@ export const normalize = (url: string, keepTrailing = false): string => {
|
|||||||
return url.replace(/\/\/+/g, "/").replace(/\/+$/, keepTrailing ? "/" : "")
|
return url.replace(/\/\/+/g, "/").replace(/\/+$/, keepTrailing ? "/" : "")
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Remove leading and trailing slashes.
|
|
||||||
*/
|
|
||||||
export const trimSlashes = (url: string): string => {
|
|
||||||
return url.replace(/^\/+|\/+$/g, "")
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Wrap the value in an array if it's not already an array. If the value is
|
|
||||||
* undefined return an empty array.
|
|
||||||
*/
|
|
||||||
export const arrayify = <T>(value?: T | T[]): T[] => {
|
|
||||||
if (Array.isArray(value)) {
|
|
||||||
return value
|
|
||||||
}
|
|
||||||
if (typeof value === "undefined") {
|
|
||||||
return []
|
|
||||||
}
|
|
||||||
return [value]
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: Might make sense to add Error handling to the logger itself.
|
// TODO: Might make sense to add Error handling to the logger itself.
|
||||||
export function logError(logger: { error: (msg: string) => void }, prefix: string, err: unknown): void {
|
export function logError(logger: { error: (msg: string) => void }, prefix: string, err: unknown): void {
|
||||||
if (err instanceof Error) {
|
if (err instanceof Error) {
|
||||||
|
@ -102,29 +102,6 @@ export const ensureAddress = (server: http.Server, protocol: string): URL | stri
|
|||||||
return addr
|
return addr
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Handles error events from the server.
|
|
||||||
*
|
|
||||||
* If the outlying Promise didn't resolve
|
|
||||||
* then we reject with the error.
|
|
||||||
*
|
|
||||||
* Otherwise, we log the error.
|
|
||||||
*
|
|
||||||
* We extracted into a function so that we could
|
|
||||||
* test this logic more easily.
|
|
||||||
*/
|
|
||||||
export const handleServerError = (resolved: boolean, err: Error, reject: (err: Error) => void) => {
|
|
||||||
// Promise didn't resolve earlier so this means it's an error
|
|
||||||
// that occurs before the server can successfully listen.
|
|
||||||
// Possibly triggered by listening on an invalid port or socket.
|
|
||||||
if (!resolved) {
|
|
||||||
reject(err)
|
|
||||||
} else {
|
|
||||||
// Promise resolved earlier so this is an unrelated error.
|
|
||||||
util.logError(logger, "http server error", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handles the error that occurs in the catch block
|
* Handles the error that occurs in the catch block
|
||||||
* after we try fs.unlink(args.socket).
|
* after we try fs.unlink(args.socket).
|
||||||
|
@ -3,8 +3,6 @@ import type { JSONSchemaForNPMPackageJsonFiles } from "@schemastore/package"
|
|||||||
import * as os from "os"
|
import * as os from "os"
|
||||||
import * as path from "path"
|
import * as path from "path"
|
||||||
|
|
||||||
export const WORKBENCH_WEB_CONFIG_ID = "vscode-workbench-web-configuration"
|
|
||||||
|
|
||||||
export function getPackageJson(relativePath: string): JSONSchemaForNPMPackageJsonFiles {
|
export function getPackageJson(relativePath: string): JSONSchemaForNPMPackageJsonFiles {
|
||||||
let pkg = {}
|
let pkg = {}
|
||||||
try {
|
try {
|
||||||
@ -21,7 +19,6 @@ export const vsRootPath = path.join(rootPath, "lib/vscode")
|
|||||||
const PACKAGE_JSON = "package.json"
|
const PACKAGE_JSON = "package.json"
|
||||||
const pkg = getPackageJson(`${rootPath}/${PACKAGE_JSON}`)
|
const pkg = getPackageJson(`${rootPath}/${PACKAGE_JSON}`)
|
||||||
const codePkg = getPackageJson(`${vsRootPath}/${PACKAGE_JSON}`) || { version: "0.0.0" }
|
const codePkg = getPackageJson(`${vsRootPath}/${PACKAGE_JSON}`) || { version: "0.0.0" }
|
||||||
export const pkgName = pkg.name || "code-server"
|
|
||||||
export const version = pkg.version || "development"
|
export const version = pkg.version || "development"
|
||||||
export const commit = pkg.commit || "development"
|
export const commit = pkg.commit || "development"
|
||||||
export const codeVersion = codePkg.version || "development"
|
export const codeVersion = codePkg.version || "development"
|
||||||
|
@ -426,15 +426,6 @@ export const enumToArray = (t: any): string[] => {
|
|||||||
return values
|
return values
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* For displaying all allowed options in an enum.
|
|
||||||
*/
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
export const buildAllowedMessage = (t: any): string => {
|
|
||||||
const values = enumToArray(t)
|
|
||||||
return `Allowed value${values.length === 1 ? " is" : "s are"} ${values.map((t) => `'${t}'`).join(", ")}`
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a promise that resolves with whether the socket path is active.
|
* Return a promise that resolves with whether the socket path is active.
|
||||||
*/
|
*/
|
||||||
|
@ -34,10 +34,6 @@ describe("constants", () => {
|
|||||||
jest.resetModules()
|
jest.resetModules()
|
||||||
})
|
})
|
||||||
|
|
||||||
it("should provide the package name", () => {
|
|
||||||
expect(constants.pkgName).toBe(mockPackageJson.name)
|
|
||||||
})
|
|
||||||
|
|
||||||
it("should provide the commit", () => {
|
it("should provide the commit", () => {
|
||||||
expect(constants.commit).toBe(mockPackageJson.commit)
|
expect(constants.commit).toBe(mockPackageJson.commit)
|
||||||
})
|
})
|
||||||
|
Reference in New Issue
Block a user