Merge branch 'master' into fix/readmefile

SAP · Apr 10, 2024 · 1cd7832 · 1cd7832
2 parents 3b807b7 + a6a6b07
commit 1cd7832
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 48 deletions.
diff --git a/packages/language-server/CHANGELOG.md b/packages/language-server/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## 4.0.46
+
+### Patch Changes
+
+- Updated dependencies [5b190da]
+  - @ui5-language-assistant/xml-views-definition@0.0.3
+
 ## 4.0.45
 
 ### Patch Changes

diff --git a/packages/language-server/package.json b/packages/language-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ui5-language-assistant/language-server",
-  "version": "4.0.45",
+  "version": "4.0.46",
   "private": true,
   "description": "UI5 Language Server",
   "keywords": [
@@ -25,7 +25,7 @@
     "node": ">=10.0.0"
   },
   "dependencies": {
-    "@ui5-language-assistant/xml-views-definition": "0.0.2",
+    "@ui5-language-assistant/xml-views-definition": "0.0.3",
     "@ui5-language-assistant/binding": "1.0.28",
     "@sap/swa-for-sapbas-vsx": "1.1.9",
     "@ui5-language-assistant/logger": "0.0.1",

diff --git a/packages/vscode-ui5-language-assistant-bas-ext/CHANGELOG.md b/packages/vscode-ui5-language-assistant-bas-ext/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 4.0.58
+
+### Patch Changes
+
+- 5b190da: Fix: Use file uri for definition
+
 ## 4.0.57
 
 ### Patch Changes

diff --git a/packages/vscode-ui5-language-assistant-bas-ext/package.json b/packages/vscode-ui5-language-assistant-bas-ext/package.json
@@ -2,7 +2,7 @@
   "name": "@ui5-language-assistant/vscode-ui5-language-assistant-bas-ext",
   "description": "A wrapper module for BAS simple extension around Language Support For SAPUI5",
   "license": "Apache-2.0",
-  "version": "4.0.57",
+  "version": "4.0.58",
   "private": false,
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "fs-extra": "10.1.0",
-    "vscode-ui5-language-assistant": "4.0.57"
+    "vscode-ui5-language-assistant": "4.0.58"
   },
   "files": [
     "*.vsix",

diff --git a/packages/vscode-ui5-language-assistant/CHANGELOG.md b/packages/vscode-ui5-language-assistant/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## 4.0.58
+
+### Patch Changes
+
+- 5b190da: Fix: Use file uri for definition
+  - @ui5-language-assistant/language-server@4.0.46
+
 ## 4.0.57
 
 ### Patch Changes

diff --git a/packages/vscode-ui5-language-assistant/package.json b/packages/vscode-ui5-language-assistant/package.json
@@ -3,7 +3,7 @@
   "displayName": "UI5 Language Assistant",
   "private": true,
   "description": "Language Support For SAPUI5",
-  "version": "4.0.57",
+  "version": "4.0.58",
   "publisher": "SAPOSS",
   "icon": "resources/ui5-language-assistant.png",
   "keywords": [
@@ -155,7 +155,7 @@
     "update:schema": "ts-node  --project tsconfig.cli.json scripts/manifest/run-update.ts"
   },
   "dependencies": {
-    "@ui5-language-assistant/language-server": "4.0.45",
+    "@ui5-language-assistant/language-server": "4.0.46",
     "vscode-languageclient": "8.0.2",
     "@prettier/plugin-xml": "2.2.0",
     "prettier": "2.8.7"

diff --git a/packages/xml-views-definition/CHANGELOG.md b/packages/xml-views-definition/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @ui5-language-assistant/xml-views-definition
 
+## 0.0.3
+
+### Patch Changes
+
+- 5b190da: Fix: Use file uri for definition
+
 ## 0.0.2
 
 ### Patch Changes

diff --git a/packages/xml-views-definition/package.json b/packages/xml-views-definition/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ui5-language-assistant/xml-views-definition",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "private": true,
   "description": "Definition logic for UI5 XML-Views",
   "keywords": [],

diff --git a/packages/xml-views-definition/src/controller/index.ts b/packages/xml-views-definition/src/controller/index.ts
@@ -77,23 +77,15 @@ export async function getControllerLocation(
     if (!fileUri) {
       return [];
     }
-    return [
-      {
-        uri: fileUri,
-        range: { start: position, end: position },
-      },
-    ];
+    const loc = Location.create(fileUri, { start: position, end: position });
+    return [loc];
   }
 
   // handle dot notation
   const fileUri = await buildFileUri(id, value, manifestPath, exts);
   if (!fileUri) {
     return [];
   }
-  return [
-    {
-      uri: fileUri,
-      range: { start: position, end: position },
-    },
-  ];
+  const loc = Location.create(fileUri, { start: position, end: position });
+  return [loc];
 }
diff --git a/packages/xml-views-definition/src/utils/file.ts b/packages/xml-views-definition/src/utils/file.ts
@@ -1,5 +1,6 @@
 import { access, constants } from "fs";
 import { join, dirname } from "path";
+import { URI } from "vscode-uri";
 
 /**
  * Check if path exists on file system.
@@ -44,7 +45,7 @@ export async function buildFileUri(
   for (const ext of exts) {
     const filePath = `${absolutePath}${ext}`;
     if (await pathExists(filePath)) {
-      return filePath;
+      return URI.file(filePath).toString();
     }
   }
 }
diff --git a/packages/xml-views-definition/test/unit/controller/index.test.ts b/packages/xml-views-definition/test/unit/controller/index.test.ts
@@ -10,6 +10,7 @@ import * as fs from "fs";
 import * as context from "@ui5-language-assistant/context";
 import { getControllerLocation } from "../../../src/controller";
 import { join } from "path";
+import { URI } from "vscode-uri";
 
 describe("index", () => {
   let testFramework: TestFramework;
@@ -173,12 +174,14 @@ describe("index", () => {
         // assert
         expect(result).toEqual([
           {
-            uri: join(
-              testFramework.getProjectRoot(),
-              "src",
-              "controller",
-              "App.controller.ts"
-            ),
+            uri: URI.file(
+              join(
+                testFramework.getProjectRoot(),
+                "src",
+                "controller",
+                "App.controller.ts"
+              )
+            ).toString(),
             range: { start: position, end: position },
           },
         ]);
@@ -281,12 +284,14 @@ describe("index", () => {
         // assert
         expect(result).toEqual([
           {
-            uri: join(
-              testFramework.getProjectRoot(),
-              "src",
-              "controller",
-              "App.controller.ts"
-            ),
+            uri: URI.file(
+              join(
+                testFramework.getProjectRoot(),
+                "src",
+                "controller",
+                "App.controller.ts"
+              )
+            ).toString(),
             range: { start: position, end: position },
           },
         ]);

diff --git a/packages/xml-views-definition/test/unit/utils/file.test.ts b/packages/xml-views-definition/test/unit/utils/file.test.ts
@@ -1,5 +1,8 @@
 import { pathExists, buildFileUri } from "../../../src/utils";
 import { join } from "path";
+import { URI } from "vscode-uri";
+const getExpectedFileUri = (parts: string[]) =>
+  URI.file(join(__dirname, ...parts)).toString();
 
 describe("file", () => {
   describe("pathExists", () => {
@@ -27,13 +30,12 @@ describe("file", () => {
       // arrange
       const namespace = "sap.ui.demo.walkthrough";
       const value = "sap.ui.demo.walkthrough.controller.App";
-      const expectedFileUri = join(
-        __dirname,
+      const expectedFileUri = getExpectedFileUri([
         "..",
         "data",
         "controller",
-        "App.controller.js"
-      );
+        "App.controller.js",
+      ]);
       // act
       const result = await buildFileUri(
         namespace,
@@ -48,13 +50,12 @@ describe("file", () => {
       // arrange
       const namespace = "sap.ui.demo.walkthrough";
       const value = "sap.ui.demo.walkthrough.controller.AppHelper";
-      const expectedFileUri = join(
-        __dirname,
+      const expectedFileUri = getExpectedFileUri([
         "..",
         "data",
         "controller",
-        "AppHelper.js"
-      );
+        "AppHelper.js",
+      ]);
       // act
       const result = await buildFileUri(
         namespace,
@@ -70,13 +71,12 @@ describe("file", () => {
       // arrange
       const namespace = "sap.ui.demo.walkthrough";
       const value = "sap.ui.demo.walkthrough.controller.Helper";
-      const expectedFileUri = join(
-        __dirname,
+      const expectedFileUri = getExpectedFileUri([
         "..",
         "data",
         "controller",
-        "Helper.controller.ts"
-      );
+        "Helper.controller.ts",
+      ]);
       // act
       const result = await buildFileUri(
         namespace,
@@ -91,13 +91,13 @@ describe("file", () => {
       // arrange
       const namespace = "sap.ui.demo.walkthrough";
       const value = "sap.ui.demo.walkthrough.controller.Handler";
-      const expectedFileUri = join(
-        __dirname,
+      const expectedFileUri = getExpectedFileUri([
         "..",
         "data",
         "controller",
-        "Handler.ts"
-      );
+        "Handler.ts",
+      ]);
+
       // act
       const result = await buildFileUri(
         namespace,