From edcc4e8188606d5c84fda404dbaf1e72d875d30b Mon Sep 17 00:00:00 2001
From: Jason Dent <jason@streetsidesoftware.nl>
Date: Wed, 17 Jul 2024 21:08:14 +0200
Subject: [PATCH 1/2] refactor: remove unused node:path

---
 packages/_server/src/config/configTargetsHelper.mts   | 7 +++++--
 packages/_server/src/config/documentSettings.mts      | 8 --------
 packages/_server/src/config/documentSettings.test.mts | 5 -----
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/packages/_server/src/config/configTargetsHelper.mts b/packages/_server/src/config/configTargetsHelper.mts
index dc2cb7367..5020ce0e9 100644
--- a/packages/_server/src/config/configTargetsHelper.mts
+++ b/packages/_server/src/config/configTargetsHelper.mts
@@ -1,7 +1,6 @@
 import type { DictionaryDefinitionCustom } from '@cspell/cspell-types';
 import { toFileUri, toUri } from '@internal/common-utils/uriHelper';
 import { capitalize } from '@internal/common-utils/util';
-import * as Path from 'path';
 
 import type { WorkspaceConfigForDocument } from '../api.js';
 import type {
@@ -70,12 +69,16 @@ function* workspaceConfigToTargets(workspaceConfig: WorkspaceConfigForDocument):
     }
 }
 
+function basename(path: string): string {
+    return path.split(/[/\\]/g).slice(-1).join('');
+}
+
 function cspellToTargets(sources: CSpellSettingsWithFileSource[]): ConfigTargetCSpell[] {
     function toTarget(cfg: CSpellSettingsWithFileSource, index: number): ConfigTargetCSpell {
         return {
             kind: ConfigKinds.Cspell,
             scope: ConfigScopes.Unknown,
-            name: cfg.name || Path.basename(cfg.source.filename),
+            name: cfg.name || basename(cfg.source.filename),
             configUri: toUri(cfg.source.filename).toString(),
             has: {
                 words: cfg.words && true,
diff --git a/packages/_server/src/config/documentSettings.mts b/packages/_server/src/config/documentSettings.mts
index f43fc4715..aabacfb08 100644
--- a/packages/_server/src/config/documentSettings.mts
+++ b/packages/_server/src/config/documentSettings.mts
@@ -28,8 +28,6 @@ import {
     mergeSettings,
     searchForConfig,
 } from 'cspell-lib';
-import * as os from 'os';
-import * as path from 'path';
 import { pathToFileURL } from 'url';
 import type { DisposableClassic } from 'utils-disposables';
 import type { Connection, WorkspaceFolder } from 'vscode-languageserver/node.js';
@@ -541,11 +539,6 @@ export class DocumentSettings {
     }
 }
 
-function resolvePath(...parts: string[]): string {
-    const normalizedParts = parts.map((part) => (part[0] === '~' ? os.homedir() + part.slice(1) : part));
-    return path.resolve(...normalizedParts);
-}
-
 export function isUriAllowedBySettings(uri: string, settings: CSpellUserSettings): boolean {
     const schemes = extractEnabledSchemes(settings);
     return doesUriMatchAnyScheme(uri, schemes);
@@ -641,7 +634,6 @@ export function stringifyPatterns(settings: CSpellUserSettings | undefined): CSp
 export const debugExports = {
     fixRegEx: fixRegPattern,
     fixPattern,
-    resolvePath,
     filterConfigFilesToMatchInheritedPathOfFile,
 };
 
diff --git a/packages/_server/src/config/documentSettings.test.mts b/packages/_server/src/config/documentSettings.test.mts
index be8e71a6e..be1fee715 100644
--- a/packages/_server/src/config/documentSettings.test.mts
+++ b/packages/_server/src/config/documentSettings.test.mts
@@ -452,11 +452,6 @@ describe('Validate DocumentSettings', () => {
         expect(result.map((f) => f.toString().toLowerCase())).toEqual(expected.map((u) => filePathToUri(u).toString().toLowerCase()));
     });
 
-    test('resolvePath', () => {
-        expect(debugExports.resolvePath(__dirname)).toBe(__dirname);
-        expect(debugExports.resolvePath('~')).toBe(os.homedir());
-    });
-
     function newDocumentSettings(defaultSettings: CSpellUserSettings = {}) {
         const connection = createMockConnection();
         const mockWorkspaceGetConfiguration = vi.mocked(connection.workspace.getConfiguration);

From a40ca66bc653003f9627d96f0e312db9c46ca6a5 Mon Sep 17 00:00:00 2001
From: Jason Dent <jason@streetsidesoftware.nl>
Date: Wed, 17 Jul 2024 21:16:11 +0200
Subject: [PATCH 2/2] Update documentSettings.test.mts

---
 packages/_server/src/config/documentSettings.test.mts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/_server/src/config/documentSettings.test.mts b/packages/_server/src/config/documentSettings.test.mts
index be1fee715..6029ca6d4 100644
--- a/packages/_server/src/config/documentSettings.test.mts
+++ b/packages/_server/src/config/documentSettings.test.mts
@@ -1,7 +1,6 @@
 import type { Pattern } from 'cspell-lib';
 import * as cspell from 'cspell-lib';
 import { getDefaultSettings } from 'cspell-lib';
-import * as os from 'os';
 import * as Path from 'path';
 import { beforeEach, describe, expect, test, vi } from 'vitest';
 import type { ConfigurationItem, Connection, WorkspaceFolder } from 'vscode-languageserver/node.js';