diff --git a/.changeset/thick-trains-doubt.md b/.changeset/thick-trains-doubt.md new file mode 100644 index 000000000..ff4001901 --- /dev/null +++ b/.changeset/thick-trains-doubt.md @@ -0,0 +1,8 @@ +--- +"@ui5-language-assistant/xml-views-validation": patch +"@ui5-language-assistant/language-server": patch +"vscode-ui5-language-assistant": patch +"@ui5-language-assistant/vscode-ui5-language-assistant-bas-ext": patch +--- + +fix: file uri for windows diff --git a/packages/language-server/test/unit/snapshots/xml-view-diagnostics/non-unique-id/options.js b/packages/language-server/test/unit/snapshots/xml-view-diagnostics/non-unique-id/options.js index 68184ff7f..252c38107 100644 --- a/packages/language-server/test/unit/snapshots/xml-view-diagnostics/non-unique-id/options.js +++ b/packages/language-server/test/unit/snapshots/xml-view-diagnostics/non-unique-id/options.js @@ -1,10 +1,10 @@ -const url = require("url"); +const vscodeUri = require("vscode-uri"); const controlIds = new Map(); controlIds.set("OOPS", [ { - uri: url.pathToFileURL("").toString(), + uri: vscodeUri.URI.file("").toString(), range: { start: { line: 3, character: 11 }, end: { line: 3, character: 17 }, @@ -12,7 +12,7 @@ controlIds.set("OOPS", [ offsetRange: { start: 79, end: 84 }, }, { - uri: url.pathToFileURL("").toString(), + uri: vscodeUri.URI.file("").toString(), range: { start: { line: 5, character: 13 }, end: { line: 5, character: 19 }, diff --git a/packages/xml-views-validation/package.json b/packages/xml-views-validation/package.json index b340551e8..977edf5f3 100644 --- a/packages/xml-views-validation/package.json +++ b/packages/xml-views-validation/package.json @@ -30,7 +30,8 @@ "@xml-tools/ast": "5.0.0", "@xml-tools/common": "0.1.2", "deep-freeze-strict": "1.1.1", - "lodash": "4.17.21" + "lodash": "4.17.21", + "vscode-uri": "2.1.2" }, "devDependencies": { "@ui5-language-assistant/semantic-model": "4.0.18", diff --git a/packages/xml-views-validation/src/validators/non-unique-id.ts b/packages/xml-views-validation/src/validators/non-unique-id.ts index 41a11e488..05e3a7622 100644 --- a/packages/xml-views-validation/src/validators/non-unique-id.ts +++ b/packages/xml-views-validation/src/validators/non-unique-id.ts @@ -5,13 +5,13 @@ import { } from "@ui5-language-assistant/user-facing-text"; import { NonUniqueIDIssue } from "../../api"; import { Context } from "@ui5-language-assistant/context"; -import { pathToFileURL } from "url"; +import { URI } from "vscode-uri"; const { NON_UNIQUE_ID } = validations; export function validateNonUniqueID(context: Context): NonUniqueIDIssue[] { const allIDsIssues: NonUniqueIDIssue[] = []; - const uri = pathToFileURL(context.documentPath).toString(); + const uri = URI.file(context.documentPath).toString(); for (const [key, value] of context.controlIds) { if (value.length > 1) { const currentDocIssues = value.filter((i) => i.uri === uri); diff --git a/packages/xml-views-validation/test/unit/validators/non-unique-id.test.ts b/packages/xml-views-validation/test/unit/validators/non-unique-id.test.ts index b6b831c28..d28e68827 100644 --- a/packages/xml-views-validation/test/unit/validators/non-unique-id.test.ts +++ b/packages/xml-views-validation/test/unit/validators/non-unique-id.test.ts @@ -17,7 +17,7 @@ import { OffsetRange, } from "@ui5-language-assistant/logic-utils"; import { Range } from "vscode-languageserver-types"; -import { pathToFileURL } from "url"; +import { URI } from "vscode-uri"; const { NON_UNIQUE_ID } = validations; let testFramework: TestFramework; @@ -293,7 +293,7 @@ describe("the use of non unique id validation", () => { const ranges = getIdRanges( context.viewFiles[customSectionPath].rootElement?.subElements ?? [] ); - const customSectionUri = pathToFileURL(customSectionPath).toString(); + const customSectionUri = URI.file(customSectionPath).toString(); const identicalIDsRanges = ranges.map((range) => ({ uri: customSectionUri, range,