add tests

Author: Ilja Postnovs

.vscode/launch.json

@@ -25,9 +25,9 @@
 			"request": "launch",
 			"runtimeExecutable": "${execPath}",
 			"args": [
-			  "--extensionDevelopmentPath=${workspaceFolder}/testproject",
+			  "--extensionDevelopmentPath=${workspaceFolder}/../VSCodeUI5PluginUsageExampleApp",
 			  "--extensionTestsPath=${workspaceFolder}/dist/test/suite/index",
-			  "--testWorkspace=${workspaceFolder}/testproject"
+			  "--testWorkspace=${workspaceFolder}/../VSCodeUI5PluginUsageExampleApp"
 			],
 			"outFiles": ["${workspaceFolder}/dist/test/**/*.js"],
 			"sourceMaps": true,

src/classes/UI5Classes/JSParser/AcornSyntaxAnalyzer.ts

@@ -70,6 +70,9 @@ export class AcornSyntaxAnalyzer {
 			innerNode = node.right;
 		} else if (node.type === "BinaryExpression") {
 			innerNode = node.right && this.findAcornNode([node.right], position);
+			if (!innerNode && node.left) {
+				innerNode = node.left && this.findAcornNode([node.left], position);
+			}
 		} else if (node.type === "LogicalExpression") {
 			innerNode = node.right && this.findAcornNode([node.right], position);
 
@@ -303,7 +306,7 @@ export class AcornSyntaxAnalyzer {
 				const content = this.expandAllContent(acornMethod.value);
 				const node = this._getCallExpressionNodeWhichIsArrayMethod(content, identifierNode.end);
 				if (node) {
-					const isFirstParamOfArrayMethod = node.arguments[0]?.params[0]?.name === identifierNode.name;
+					const isFirstParamOfArrayMethod = node.arguments[0]?.params && node.arguments[0]?.params[0]?.name === identifierNode.name;
 					if (isFirstParamOfArrayMethod) {
 						const strategy = new FieldsAndMethodForPositionBeforeCurrentStrategy();
 						className = strategy.acornGetClassName(currentClassName, node.callee.object.end + 1) || "";
@@ -505,6 +508,16 @@ export class AcornSyntaxAnalyzer {
 				}
 			} else if (node.type === "MemberExpression") {
 				innerNodes.push(node.object);
+				if (node.property) {
+					innerNodes.push(node.property);
+				}
+			} else if (node.type === "BinaryExpression") {
+				if (node.right) {
+					innerNodes.push(node.right);
+				}
+				if (node.left) {
+					innerNodes.push(node.left);
+				}
 			} else if (node.type === "ExpressionStatement") {
 				innerNodes.push(node.expression);
 			} else if (node.type === "ThisExpression") {

src/test/suite/data/TestData.json

@@ -146,5 +146,16 @@
 			}
 		},
 		"type": "sap.ui.model.Model"
+	},{
+		"className": "com.test.controller.Master",
+		"methodName": "_findDialog",
+		"positionAddition": 1,
+		"node": {
+			"type": "MemberExpression",
+			"property": {
+				"name": "getTitle"
+			}
+		},
+		"type": "sap.m.Dialog"
 	}]
 }

src/test/suite/extension.test.ts

@@ -1,9 +1,5 @@
 import assert = require("assert");
-import { after, describe, it, test } from "mocha";
-import * as path from "path";
-import * as fs from "fs";
-// You can import and use all API from the "vscode" module
-// as well as import your extension to test it
+import { after, test } from "mocha";
 import * as vscode from "vscode";
 import { AcornSyntaxAnalyzer } from "../../classes/UI5Classes/JSParser/AcornSyntaxAnalyzer";
 import { UIClassFactory } from "../../classes/UI5Classes/UIClassFactory";
@@ -55,27 +51,30 @@ suite("Extension Test Suite", () => {
 				return compareProperties(data.node, node);
 			});
 
-			const position = searchedNode.property.start + data.positionAddition;
+			if (!searchedNode) {
+				throw new Error(`Node '${JSON.stringify(data.node)}' in '${data.methodName}' not found`);
+			}
+
+			const position = searchedNode.property?.start || searchedNode.start + data.positionAddition;
 			const positionBeforeCurrentStrategy = new FieldsAndMethodForPositionBeforeCurrentStrategy();
 			const classNameAtPosition = positionBeforeCurrentStrategy.acornGetClassName(data.className, position);
 			assert.strictEqual(data.type, classNameAtPosition, `${data.className} position ${position} type is ${classNameAtPosition} but expected ${data.type}`);
 		});
 	});
 });
 
-function compareProperties(node1: any, node2: any) : boolean {
+function compareProperties(dataNode: any, node2: any) : boolean {
 	let allInnerNodesExists = true;
-	for (const i in node1) {
+	for (const i in dataNode) {
 		if (node2[i]) {
 			if (typeof node2[i] === "object") {
-				allInnerNodesExists = compareProperties(node1[i], node2[i]);
+				allInnerNodesExists = compareProperties(dataNode[i], node2[i]);
 			} else {
-				allInnerNodesExists = allInnerNodesExists && node1[i] === node2[i];
+				allInnerNodesExists = allInnerNodesExists && dataNode[i] === node2[i];
 			}
 		} else {
 			allInnerNodesExists = false;
 		}
-
 	}
 
 	return allInnerNodesExists;