diff --git a/hooks/immersive-fullscreen.js b/hooks/immersive-fullscreen.js index 0d776d7d83..068bb84e21 100644 --- a/hooks/immersive-fullscreen.js +++ b/hooks/immersive-fullscreen.js @@ -22,9 +22,9 @@ module.exports = function prepareImmersiveFullscreen(context) { // Markers delimit our generated blocks so each prepare can replace them safely, // including when only the controller changes. let source = original - .replace(/\r\n/g, "\n") + .replaceAll("\r\n", "\n") .replace( - /^[ \t]*\/\/ ACODE_FULLSCREEN_BEGIN ([a-z]+)\n[\s\S]*?^[ \t]*\/\/ ACODE_FULLSCREEN_END \1\n/gm, + /^[ \t]*\/\/ ACODE_FULLSCREEN_BEGIN ([a-z]+)\n[^]*?^[ \t]*\/\/ ACODE_FULLSCREEN_END \1\n/gm, "", ); if (/ACODE_FULLSCREEN_(BEGIN|END)/.test(source)) { diff --git a/hooks/post-process.js b/hooks/post-process.js index 449669cf4c..582408c011 100644 --- a/hooks/post-process.js +++ b/hooks/post-process.js @@ -94,7 +94,7 @@ function stripLauncherFilterFromMainActivity() { let content = fs.readFileSync(manifestPath, 'utf-8'); const updated = content.replace( - /(]*\bname="MainActivity"[^>]*>)\s*]*>\s*]*\/>\s*]*\/>\s*<\/intent-filter>/, + /(]*?\bname="MainActivity"[^>]*>)\s*]*>\s*]*\/>\s*]*\/>\s*<\/intent-filter>/, '$1' ); @@ -200,7 +200,7 @@ function enableStaticContext() { const mainActivityPath = path.join( prefix, 'platforms/android/app/src/main/java', - packageName.replace(/\./g, '/'), + packageName.replaceAll('.', '/'), 'MainActivity.java' ); @@ -262,7 +262,7 @@ function disableSplashFadeOnRealmeAndroid13() { const mainActivityPath = path.join( prefix, 'platforms/android/app/src/main/java', - packageName.replace(/\./g, '/'), + packageName.replaceAll('.', '/'), 'MainActivity.java' ); @@ -335,7 +335,7 @@ function removeLegacyKeyboardWorkaround() { const mainActivityPath = path.join( prefix, 'platforms/android/app/src/main/java', - packageName.replace(/\./g, '/'), + packageName.replaceAll('.', '/'), 'MainActivity.java' ); diff --git a/src/cm/canvasOptions.ts b/src/cm/canvasOptions.ts index 1f363ae4e4..d7a9c35574 100644 --- a/src/cm/canvasOptions.ts +++ b/src/cm/canvasOptions.ts @@ -302,7 +302,7 @@ export function getCanvasTheme( ): CanvasThemeSpec { // Resolve ids like getThemeExtensions does ("one-dark" -> "one_dark"). const theme = - getThemeById(themeId) || getThemeById(String(themeId).replace(/-/g, "_")); + getThemeById(themeId) || getThemeById(String(themeId).replaceAll("-", "_")); const config = (theme?.config || getThemeConfig(themeId) || {}) as ThemeConfig; @@ -541,7 +541,7 @@ let nextThemeEntryId = 1; */ function themeEntryKey(themeId: string): string { const entry = - getThemeById(themeId) || getThemeById(String(themeId).replace(/-/g, "_")); + getThemeById(themeId) || getThemeById(String(themeId).replaceAll("-", "_")); if (!entry) return "0"; let n = themeEntryIds.get(entry); if (!n) themeEntryIds.set(entry, (n = nextThemeEntryId++)); diff --git a/src/cm/commandRegistry.js b/src/cm/commandRegistry.js index 16068769fe..bdf544e867 100644 --- a/src/cm/commandRegistry.js +++ b/src/cm/commandRegistry.js @@ -1343,8 +1343,8 @@ function runLspCommand(commandFn, options = {}) { function humanizeCommandName(name) { return name - .replace(/([a-z0-9])([A-Z])/g, "$1 $2") - .replace(/_/g, " ") + .replace(/[a-z0-9](?=[A-Z])/g, "$& ") + .replaceAll("_", " ") .replace(/^./, (char) => char.toUpperCase()); } diff --git a/src/cm/lsp/clientManager.ts b/src/cm/lsp/clientManager.ts index 6d08882604..135f70912f 100644 --- a/src/cm/lsp/clientManager.ts +++ b/src/cm/lsp/clientManager.ts @@ -1458,7 +1458,7 @@ function applyTextEdits( if (fromResult == null || toResult == null) continue; const insert = typeof edit.newText === "string" - ? edit.newText.replace(/\r\n/g, "\n") + ? edit.newText.replaceAll("\r\n", "\n") : ""; changes.push({ from: fromResult, to: toResult, insert }); } @@ -1639,6 +1639,6 @@ function contentUriToFileUri(uri: string): string | null { function buildFileUri(pathname: string): string | null { if (!pathname) return null; const normalized = pathname.startsWith("/") ? pathname : `/${pathname}`; - const encoded = encodeURI(normalized).replace(/#/g, "%23"); + const encoded = encodeURI(normalized).replaceAll("#", "%23"); return `file://${encoded}`; } diff --git a/src/cm/lsp/documentColors.ts b/src/cm/lsp/documentColors.ts index efacbb851e..ce55175960 100644 --- a/src/cm/lsp/documentColors.ts +++ b/src/cm/lsp/documentColors.ts @@ -213,7 +213,7 @@ function applyTextEdits( if (!mapped) continue; const insert = typeof edit.newText === "string" - ? edit.newText.replace(/\r\n/g, "\n") + ? edit.newText.replaceAll("\r\n", "\n") : ""; changes.push({ from: mapped.from, to: mapped.to, insert }); } diff --git a/src/cm/supportedModes.ts b/src/cm/supportedModes.ts index f16746a746..432618f081 100644 --- a/src/cm/supportedModes.ts +++ b/src/cm/supportedModes.ts @@ -25,9 +25,9 @@ function isSafeModeId(value: string): boolean { function slugifyModeId(value: string): string { return normalizeModeKey(value) - .replace(/\+\+/g, "pp") - .replace(/#/g, "sharp") - .replace(/&/g, "and") + .replaceAll("++", "pp") + .replaceAll("#", "sharp") + .replaceAll("&", "and") .replace(/[^a-z0-9._-]+/g, "-") .replace(/^-+|-+$/g, ""); } diff --git a/src/cm/themes/index.js b/src/cm/themes/index.js index 71c95dc1eb..739f35b6bf 100644 --- a/src/cm/themes/index.js +++ b/src/cm/themes/index.js @@ -180,7 +180,7 @@ export function getThemeConfig(id) { export function getThemeExtensions(id, fallback = [oneDark]) { const fallbackExtensions = normalizeExtensions(fallback); const theme = - getThemeById(id) || getThemeById(String(id || "").replace(/-/g, "_")); + getThemeById(id) || getThemeById(String(id || "").replaceAll("-", "_")); return resolveThemeEntryExtensions(theme, fallbackExtensions); } diff --git a/src/lib/console.js b/src/lib/console.js index 35a32cb2b9..d6ab251a90 100644 --- a/src/lib/console.js +++ b/src/lib/console.js @@ -625,9 +625,9 @@ import ConsoleExecutor, { } catch (error) { return data .toString() - .replace(/({).*(})/, "$1...$2") + .replace(/\{.*\}/, "{...}") .replace(/^function\s+[\w_$\d]+\s*/, "") - .replace(/\s*/g, ""); + .replace(/\s+/g, ""); } } diff --git a/src/lib/editorFile.js b/src/lib/editorFile.js index 78fcb06881..22486097b9 100644 --- a/src/lib/editorFile.js +++ b/src/lib/editorFile.js @@ -967,7 +967,7 @@ export default class EditorFile { if (value === "windows") { text = text.replace(/\n(? char.toUpperCase()); } diff --git a/src/lib/prettierFormatter.js b/src/lib/prettierFormatter.js index e95014c0cf..31dcaf3d8e 100644 --- a/src/lib/prettierFormatter.js +++ b/src/lib/prettierFormatter.js @@ -466,7 +466,7 @@ function evaluateUnaryExpression(node, scope) { } function normalizePath(path) { - let result = String(path || "").replace(/\\/g, "/"); + let result = String(path || "").replaceAll("\\", "/"); while (result.length > 1 && result.endsWith("/")) { const prefix = result.slice(0, -1); if (/^[a-z]+:\/{0,2}$/i.test(prefix)) break; diff --git a/src/lib/showFileInfo.js b/src/lib/showFileInfo.js index 1520f7c3cb..842e7ea9a5 100644 --- a/src/lib/showFileInfo.js +++ b/src/lib/showFileInfo.js @@ -42,8 +42,8 @@ export default async function showFileInfo(url) { if (options.isEditor) { const value = await fs.readFile(settings.value.defaultFileEncoding); - options.lineCount = value.split(/\n+/).length; - options.wordCount = value.split(/\s+|\n+/).length; + options.lineCount = value.split("\n").length; + options.wordCount = value.split(/\S+/).length; if (/s?ftp:/.test(protocol)) { options.shareUri = Url.join(CACHE_STORAGE, name); diff --git a/src/pages/customTheme/customTheme.js b/src/pages/customTheme/customTheme.js index 8131a7c329..f8e024a29c 100644 --- a/src/pages/customTheme/customTheme.js +++ b/src/pages/customTheme/customTheme.js @@ -81,8 +81,7 @@ export default function CustomThemeInclude() { } function render() { - const pascalToNormal = (str) => - str.replace(/([A-Z])/g, " $1").toLowerCase(); + const pascalToNormal = (str) => str.replace(/[A-Z]/g, " $&").toLowerCase(); const customTheme = themes.get("custom"); $page.body = ( diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js index 6ca4591abd..88b077a672 100644 --- a/src/pages/fileBrowser/fileBrowser.js +++ b/src/pages/fileBrowser/fileBrowser.js @@ -355,7 +355,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { let parts; if (typeof dir === "string") { if (dir.endsWith("/")) wantDirEnd = true; - dir = dir.replace(/\\/g, "/"); + dir = dir.replaceAll("\\", "/"); parts = dir.split("/"); } else { parts = dir; @@ -390,7 +390,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { const sanitizeZipPath = (p, isDir) => { if (!p) return ""; let path = String(p); - path = path.replace(/\\/g, "/"); + path = path.replaceAll("\\", "/"); path = path.replace(/^[a-zA-Z]+:\/\//, ""); path = path.replace(/^\/+/, ""); path = path.replace(/^[A-Za-z]:\//, ""); @@ -431,7 +431,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { `Extracting ${filePath} (${Math.round((current / total) * 100)}%)`, ); - let correctFile = filePath.replace(/\\/g, "/"); + let correctFile = filePath.replaceAll("\\", "/"); const isDirEntry = entry.dir || correctFile.endsWith("/"); if (isUnsafeAbsolutePath(filePath)) { @@ -1661,7 +1661,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { const fs = fsOperation(lclUrl); if (paths.length === 0) { - const data = project[fileUrl].replace(/<%name%>/g, projectName); + const data = project[fileUrl].replaceAll("<%name%>", projectName); await fs.createFile(filename, data); return; } diff --git a/src/pages/fontManager/fontManager.js b/src/pages/fontManager/fontManager.js index d615aa1217..7a80f39b04 100644 --- a/src/pages/fontManager/fontManager.js +++ b/src/pages/fontManager/fontManager.js @@ -126,7 +126,7 @@ export default function fontManager() { const fontName = await prompt( "Font Name", - name.replace(/\.(ttf|otf|woff|woff2)$/i, ""), + name.replace(/\.(?:ttf|otf|woff|woff2)$/i, ""), ); if (!fontName) return; diff --git a/src/pages/markdownPreview/renderer.js b/src/pages/markdownPreview/renderer.js index 1de6a1caaf..6ab36196ee 100644 --- a/src/pages/markdownPreview/renderer.js +++ b/src/pages/markdownPreview/renderer.js @@ -23,7 +23,7 @@ function slugify(text) { .trim() .toLowerCase() .normalize("NFD") - .replace(/[\u0300-\u036f]/g, "") + .replace(/[\u0300-\u036f]+/g, "") .replace(/[^\p{L}\p{N}]+/gu, "-") .replace(/^-+|-+$/g, ""); } diff --git a/src/pages/welcome/welcome.js b/src/pages/welcome/welcome.js index 9822da8f99..db7e8413af 100644 --- a/src/pages/welcome/welcome.js +++ b/src/pages/welcome/welcome.js @@ -37,7 +37,7 @@ function createWelcomeContent() { const bindings = getResolvedKeyBindings(); const kb = (name) => { const binding = bindings[name]; - return binding?.key ? binding.key.split("|")[0].replace(/-/g, "+") : ""; + return binding?.key ? binding.key.split("|")[0].replaceAll("-", "+") : ""; }; return ( diff --git a/src/sidebarApps/searchInFiles/worker.js b/src/sidebarApps/searchInFiles/worker.js index e4c3931403..41f4104e00 100644 --- a/src/sidebarApps/searchInFiles/worker.js +++ b/src/sidebarApps/searchInFiles/worker.js @@ -203,7 +203,10 @@ function getSurrounding(content, word, start, end) { if (left > 0 && !/[\r\n]/.test(content[left - 1])) line = `...${line}`; if (right < content.length && !/[\r\n]/.test(content[right])) line += "..."; return [line, word.slice(0, max)].map((text) => - text.replace(/[\r\n]+/g, " ⏎ "), + text + .replaceAll("\r\n", " ⏎ ") + .replaceAll("\n", " ⏎ ") + .replaceAll("\r", " ⏎ "), ); } diff --git a/src/utils/Path.js b/src/utils/Path.js index dd5d9f1264..dd6b2cd373 100644 --- a/src/utils/Path.js +++ b/src/utils/Path.js @@ -92,8 +92,7 @@ export default { * @param {string} path */ normalize(path) { - path = path.replace(/\.\/+/g, "./"); - path = path.replace(/\/+/g, "/"); + path = path.replace(/\/\/+/g, "/"); const resolved = []; const pathAr = path.split("/"); diff --git a/src/utils/Uri.js b/src/utils/Uri.js index 36a9a124e3..9d6807b254 100644 --- a/src/utils/Uri.js +++ b/src/utils/Uri.js @@ -194,7 +194,7 @@ export default { const { name } = storage; const [base, paths] = url.split("::"); url = base + "/" + paths.split("/").slice(1).join("/"); - return url.replace(regex, name).replace(/\/+/g, "/"); + return url.replace(regex, name).replace(/\/\/+/g, "/"); } return url; diff --git a/src/utils/Url.js b/src/utils/Url.js index f79e69be00..2f27d041fb 100644 --- a/src/utils/Url.js +++ b/src/utils/Url.js @@ -302,7 +302,7 @@ export default { const uuid = "uuid" + Math.floor(Math.random() + Date.now() * 1000000); if (/#/.test(url)) { - url = url.replace(/#/g, uuid); + url = url.replaceAll("#", uuid); } let { username, password, hostname, pathname, port, query } = URLParse( diff --git a/src/utils/fileOperationExclusions.js b/src/utils/fileOperationExclusions.js index d59eed13ff..81e240082f 100644 --- a/src/utils/fileOperationExclusions.js +++ b/src/utils/fileOperationExclusions.js @@ -15,7 +15,7 @@ export function isExcludedFileOperationPath(url, patterns = []) { const parsedUrl = Url.parse(url).url; const pathname = Url.pathname(parsedUrl) || parsedUrl; - const normalizedPath = pathname.replace(/\\/g, "/").replace(/\/+$/, ""); + const normalizedPath = pathname.replaceAll("\\", "/").replace(/\/+$/, ""); const relativePath = normalizedPath.replace(/^\/+/, ""); const candidates = [ normalizedPath,