Merge remote-tracking branch 'origin/fix/no-cc-dig-for-macros' into f…

…ix/no-cc-dig-for-macros
SAP · Jan 10, 2024 · cf37306 · cf37306
2 parents 2b92010 + a6b3d69
commit cf37306
Show file tree

Hide file tree

Showing 73 changed files with 1,418 additions and 605 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -49,6 +49,7 @@
       "args": [
         "${fileBasenameNoExtension}",
         "--coverage=false",
+        "--maxWorkers=1",
         "--config",
         "jest.config.js"
       ],
@@ -68,6 +69,7 @@
       "args": [
         "${fileBasenameNoExtension}",
         "--coverage=false",
+        "--maxWorkers=1",
         "--config",
         "jest.config.js"
       ],
@@ -87,6 +89,7 @@
       "args": [
         "${fileBasenameNoExtension}",
         "--coverage=false",
+        "--maxWorkers=1",
         "--config",
         "jest.config.js"
       ],
@@ -106,6 +109,7 @@
       "args": [
         "${fileBasenameNoExtension}",
         "--coverage=false",
+        "--maxWorkers=1",
         "--config",
         "jest.config.js"
       ],
@@ -117,6 +121,26 @@
       },
       "cwd": "${workspaceFolder}/packages/xml-views-validation"
     },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "XML completion: Run Current Jest File",
+      "program": "${workspaceFolder}/node_modules/.bin/jest",
+      "args": [
+        "${fileBasenameNoExtension}",
+        "--coverage=false",
+        "--maxWorkers=1",
+        "--config",
+        "jest.config.js"
+      ],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "disableOptimisticBPs": true,
+      "windows": {
+        "program": "${workspaceFolder}/node_modules/jest/bin/jest"
+      },
+      "cwd": "${workspaceFolder}/packages/xml-views-completion"
+    },
     {
       "type": "node",
       "request": "launch",
@@ -125,6 +149,7 @@
       "args": [
         "${fileBasenameNoExtension}",
         "--coverage=false",
+        "--maxWorkers=1",
         "--config",
         "jest.config.js"
       ],
@@ -144,6 +169,7 @@
       "args": [
         "${fileBasenameNoExtension}",
         "--coverage=false",
+        "--maxWorkers=1",
         "--config",
         "jest.config.js"
       ],
@@ -163,6 +189,7 @@
       "args": [
         "${fileBasenameNoExtension}",
         "--coverage=false",
+        "--maxWorkers=1",
         "--config",
         "jest.config.js"
       ],

diff --git a/packages/binding/CHANGELOG.md b/packages/binding/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @ui5-language-assistant/binding
 
+## 1.0.25
+
+### Patch Changes
+
+- Updated dependencies [0186685]
+  - @ui5-language-assistant/xml-views-completion@4.0.23
+  - @ui5-language-assistant/xml-views-validation@4.0.18
+  - @ui5-language-assistant/logic-utils@4.0.17
+  - @ui5-language-assistant/context@4.0.23
+
 ## 1.0.24
 
 ### Patch Changes

diff --git a/packages/binding/package.json b/packages/binding/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ui5-language-assistant/binding",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "private": true,
   "description": "UI5 LSP server extension for binding",
   "keywords": [],
@@ -17,10 +17,10 @@
   "dependencies": {
     "@ui5-language-assistant/binding-parser": "1.0.7",
     "@ui5-language-assistant/logger": "0.0.1",
-    "@ui5-language-assistant/context": "4.0.22",
-    "@ui5-language-assistant/logic-utils": "4.0.16",
-    "@ui5-language-assistant/xml-views-completion": "4.0.22",
-    "@ui5-language-assistant/xml-views-validation": "4.0.17",
+    "@ui5-language-assistant/context": "4.0.23",
+    "@ui5-language-assistant/logic-utils": "4.0.17",
+    "@ui5-language-assistant/xml-views-completion": "4.0.23",
+    "@ui5-language-assistant/xml-views-validation": "4.0.18",
     "@ui5-language-assistant/settings": "4.0.9",
     "deep-freeze-strict": "1.1.1",
     "lodash": "4.17.21"
@@ -30,7 +30,7 @@
     "@types/lodash": "4.14.168",
     "@ui5-language-assistant/semantic-model-types": "4.0.9",
     "@ui5-language-assistant/test-framework": "4.0.12",
-    "@ui5-language-assistant/test-utils": "4.0.11",
+    "@ui5-language-assistant/test-utils": "4.0.12",
     "@xml-tools/ast": "5.0.0",
     "@xml-tools/parser": "1.0.7",
     "vscode-languageserver-protocol": "3.17.2",

diff --git a/packages/context/CHANGELOG.md b/packages/context/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## 4.0.23
+
+### Patch Changes
+
+- 0186685: Fallback to the latest supported patch version
+- Updated dependencies [0186685]
+  - @ui5-language-assistant/logic-utils@4.0.17
+
 ## 4.0.22
 
 ### Patch Changes

diff --git a/packages/context/package.json b/packages/context/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ui5-language-assistant/context",
-  "version": "4.0.22",
+  "version": "4.0.23",
   "private": true,
   "description": "A context for an xml file",
   "keywords": [],
@@ -20,7 +20,7 @@
     "@sap-ux/edmx-parser": "0.5.13",
     "@sap-ux/project-access": "1.9.1",
     "@ui5-language-assistant/logger": "0.0.1",
-    "@ui5-language-assistant/logic-utils": "4.0.16",
+    "@ui5-language-assistant/logic-utils": "4.0.17",
     "@ui5-language-assistant/settings": "4.0.9",
     "fs-extra": "10.1.0",
     "globby": "11.1.0",
@@ -38,7 +38,7 @@
     "@types/semver": "7.3.12",
     "@ui5-language-assistant/semantic-model-types": "4.0.9",
     "@ui5-language-assistant/test-framework": "4.0.12",
-    "@ui5-language-assistant/test-utils": "4.0.11",
+    "@ui5-language-assistant/test-utils": "4.0.12",
     "rimraf": "3.0.2",
     "tmp-promise": "3.0.2",
     "proxyquire": "2.1.3"

diff --git a/packages/context/src/types.ts b/packages/context/src/types.ts
@@ -8,6 +8,7 @@ import { FetchResponse } from "@ui5-language-assistant/logic-utils";
 
 export const DEFAULT_UI5_FRAMEWORK = "SAPUI5";
 export const DEFAULT_UI5_VERSION = "1.71.61";
+export const DEFAULT_UI5_VERSION_BASE = "1.71";
 export const UI5_VERSION_S4_PLACEHOLDER = "${sap.ui5.dist.version}";
 export const UI5_FRAMEWORK_CDN_BASE_URL = {
   OpenUI5: "https://sdk.openui5.org/",
@@ -113,4 +114,4 @@ export type CAPProjectKind = "Java" | "NodeJS";
 export type ProjectKind = CAPProjectKind | "UI5";
 export type Project = UI5Project | CAPProject;
 export type ProjectType = typeof UI5_PROJECT_TYPE | typeof CAP_PROJECT_TYPE;
-export type Fetcher = (url: string) => Promise<FetchResponse>;
+export type Fetcher<T = unknown> = (url: string) => Promise<FetchResponse<T>>;