Merge pull request #388 from iljapostnovs/development

update packages

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.16.5 (23-11-2023)
+
+- [UI5 Parser](https://github.com/iljapostnovs/ui5plugin-parser) updated to v1.7.4
+- [UI5 Linter](https://github.com/iljapostnovs/ui5plugin-linter) updated to v1.14.3
+
 ## 1.16.4 (09-11-2023)
 
 - [UI5 Parser](https://github.com/iljapostnovs/ui5plugin-parser) updated to v1.7.0

package.json

@@ -2,7 +2,7 @@
  "name": "ui5plugin",
  "displayName": "SAPUI5 Extension",
  "description": "Extension for working with UI5 projects",
- "version": "1.16.4",
+ "version": "1.16.5",
  "publisher": "iljapostnovs",
  "license": "Apache-2.0",
  "author": "Ilja Postnovs <ilja.postnovs@gmail.com>",
@@ -540,8 +540,8 @@
  "webpack-cli": "^5.1.4"
  },
  "dependencies": {
- "ui5plugin-linter": "^1.13.0",
- "ui5plugin-parser": "^1.7.0"
+ "ui5plugin-linter": "^1.14.3",
+ "ui5plugin-parser": "^1.7.4"
  },
  "__metadata": {
  "id": "7a9177b5-9a33-478d-bff3-879dc393cb43",

src/classes/registrators/DiagnosticsRegistrator.ts

@@ -117,7 +117,7 @@ export class DiagnosticsRegistrator {
  parser.classFactory.setNewCodeForClass(className, document.getText(), bForce);
  }
  this._updateTSDiagnostics(document, tsDiagnosticCollection);
- } else if (fileName.endsWith(".properties")) {
+ } else if (fileName.endsWith("i18n.properties")) {
  this._updatePropertiesDiagnostics(document, propertiesDiagnosticCollection);
  }
  }

src/classes/utils/FileWatcherMediator.ts

@@ -88,7 +88,7 @@ export class FileWatcherMediator {
  parser.fileReader.setNewViewContentToCache(viewContent, toNative(document.uri.fsPath), true);
  } else if (document.fileName.endsWith(".fragment.xml")) {
  parser.fileReader.setNewFragmentContentToCache(document.getText(), toNative(document.fileName), true);
- } else if (document.fileName.endsWith(".properties")) {
+ } else if (document.fileName.endsWith("18n.properties")) {
  parser.resourceModelData.updateCache(new TextDocumentAdapter(document));
  } else if (document.fileName.endsWith("manifest.json")) {
  parser.fileReader.rereadAllManifests();
@@ -221,7 +221,7 @@ export class FileWatcherMediator {
  if (uri.fsPath.endsWith(".xml")) {
  DiagnosticsRegistrator.removeDiagnosticForUri(uri, "xml");
  }
- if (uri.fsPath.endsWith(".properties")) {
+ if (uri.fsPath.endsWith("i18n.properties")) {
  DiagnosticsRegistrator.removeDiagnosticForUri(uri, "properties");
  }
 

src/test/js/TestRunner.ts

@@ -14,7 +14,7 @@ async function main() {
  const testWorkspace = path.resolve(__dirname, "../../../src/test/js/project");
 
  // Download VS Code, unzip it and run the integration test
- await runTests({ extensionDevelopmentPath, extensionTestsPath, launchArgs: [testWorkspace, "--disable-extensions"] });
+ await runTests({ version: "1.84.2", extensionDevelopmentPath, extensionTestsPath, launchArgs: [testWorkspace, "--disable-extensions"] });
  } catch (err) {
  console.error("Failed to run tests");
  process.exit(1);

src/test/js/project/src/util/AllBodyTest.js

@@ -0,0 +1,20 @@
+sap.ui.define([
+ "sap/ui/base/ManagedObject"
+], function(
+ ManagedObject
+) {
+ "use strict";
+
+ const AllBodyTest = ManagedObject.extend("com.test.util.AllBodyTest", {
+ _test() {
+ this._test();
+ AllBodyTest.staticTest();
+ }
+ });
+
+ AllBodyTest.staticTest = function() {
+ AllBodyTest.staticTest();
+ };
+
+ return AllBodyTest;
+});

src/test/js/project/src/util/AnotherModel.js

@@ -1,13 +1,15 @@
 sap.ui.define([
- "sap/ui/model/json/JSONModel"
+ "sap/ui/model/json/JSONModel",
+ "com/test/util/AllBodyTest"
 ], function(
- JSONModel
+ JSONModel,
+ AllBodyTest
 ) {
  "use strict";
 
  return JSONModel.extend("com.test.util.AnotherModel", {
  anotherMethod: function() {
-
+ AllBodyTest.staticTest();
  }
  });
 });

src/test/js/project/src/view/LinterTest.view.xml

@@ -5,16 +5,20 @@
  xmlns:f="sap.f"
  xmlns:c="sap.ui.core"
  xmlns:l="sap.ui.layout"
+ xmlns:html="http://www.w3.org/1999/xhtml"
  displayBlock="true"
  height="100%"
  busyIndicatorDelay="0"
 >
- <Input value="Numéro d'article"/>
+ <Input value="Numéro d'article" />
  <Page>
  <!DOCTYPE variables [
  <!ENTITY checkBoxGridDataSpan "test test >stest">
  <!ENTITY checkBoxGridDataSpan "test test test">
  ]>
+ <html:div style="max-width: 40rem;">
+ <Input />
+ </html:div>
  <nonExistantAggregation>
  <!-- Don't shrink below minimum size. Fills space if available. -->
  </nonExistantAggregation>
@@ -35,8 +39,8 @@
  validateFieldGroup="cmd:Save"
  busy="false"
  />
- <s:WrongNamespace/>
- <NonExistantClass/>
+ <s:WrongNamespace />
+ <NonExistantClass />
  <c:Fragment
  fragmentName="com.test.view.fragments.LinterTest"
  type="XML"

src/test/js/suite/data/CodeLensData.json

@@ -1,9 +1,15 @@
 {
  "jsCodeLenses": [
+ {
+ "className": "com.test.util.AllBodyTest",
+ "result": [
+ "1 reference",
+ "3 references"
+ ]
+ },
  {
  "className": "com.test.xmlrequiretest.XMLRequireUtil",
  "result": [
- "Event handler of \"sap.f.FlexibleColumnLayout~stateChange\"",
  "1 reference",
  "1 reference"
  ]

src/test/js/suite/data/completionitems/JSCompletionItems.json

@@ -2654,7 +2654,8 @@
  "\"com/test/util/ui5ignoretest/UI5IgnoreTestClass\"",
  "\"com/test/xmllintertest/UI5IgnoreTest\"",
  "\"com/test/xmlrequiretest/XMLRequire/controller\"",
- "\"com/test/xmlrequiretest/XMLRequireUtil\""
+ "\"com/test/xmlrequiretest/XMLRequireUtil\"",
+ "\"com/test/util/AllBodyTest\""
  ]
  }
  ],