@abaplint/core 2.102.46 → 2.102.48

package/build/abaplint.d.ts

@@ -475,6 +475,10 @@ declare class BehaviorDefinition extends AbstractObject {
     getDescription(): string | undefined;
 }
 
+declare class BehaviorDefinitionName extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class BlockName extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -2016,6 +2020,7 @@ declare namespace Expressions {
         AssociationName,
         AttributeChain,
         AttributeName,
+        BehaviorDefinitionName,
         BlockName,
         CallTransformationOptions,
         CallTransformationParameters,

package/build/src/abap/2_statements/expressions/behavior_definition_name.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BehaviorDefinitionName = void 0;
+const combi_1 = require("../combi");
+class BehaviorDefinitionName extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.regex)(/^((\w*\/\w+\/)|(\w*\/\w+\/)?[\w\*$%]+)$/);
+    }
+}
+exports.BehaviorDefinitionName = BehaviorDefinitionName;
+//# sourceMappingURL=behavior_definition_name.js.map

package/build/src/abap/2_statements/expressions/index.js

@@ -24,6 +24,7 @@ __exportStar(require("./assign_source"), exports);
 __exportStar(require("./association_name"), exports);
 __exportStar(require("./attribute_chain"), exports);
 __exportStar(require("./attribute_name"), exports);
+__exportStar(require("./behavior_definition_name"), exports);
 __exportStar(require("./block_name"), exports);
 __exportStar(require("./call_transformation_options"), exports);
 __exportStar(require("./call_transformation_parameters"), exports);

package/build/src/abap/2_statements/statements/class_definition.js

@@ -11,7 +11,7 @@ class ClassDefinition {
         const risk = (0, combi_1.seq)("RISK LEVEL", level);
         const time = (0, combi_1.altPrio)("LONG", "MEDIUM", "SHORT");
         const duration = (0, combi_1.seq)("DURATION", time);
-        const blah = (0, combi_1.per)(expressions_1.ClassGlobal, expressions_1.ClassFinal, "ABSTRACT", (0, combi_1.seq)("INHERITING FROM", expressions_1.SuperClassName), create, "FOR TESTING", risk, "SHARED MEMORY ENABLED", duration, (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("FOR BEHAVIOR OF", expressions_1.NamespaceSimpleName)), expressions_1.ClassFriends);
+        const blah = (0, combi_1.per)(expressions_1.ClassGlobal, expressions_1.ClassFinal, "ABSTRACT", (0, combi_1.seq)("INHERITING FROM", expressions_1.SuperClassName), create, "FOR TESTING", risk, "SHARED MEMORY ENABLED", duration, (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("FOR BEHAVIOR OF", expressions_1.BehaviorDefinitionName)), expressions_1.ClassFriends);
         const def = (0, combi_1.seq)("DEFINITION", (0, combi_1.optPrio)(blah));
         return (0, combi_1.seq)("CLASS", expressions_1.ClassName, def);
     }

package/build/src/abap/5_syntax/_type_utils.js

@@ -320,6 +320,11 @@ class TypeUtils {
                 return false;
             }
         }
+        else if (source instanceof basic_1.GenericObjectReferenceType) {
+            if (target instanceof basic_1.ObjectReferenceType) {
+                return false;
+            }
+        }
         else if (source instanceof basic_1.ObjectReferenceType) {
             if (target instanceof basic_1.XSequenceType
                 || target instanceof basic_1.IntegerType

package/build/src/abap/5_syntax/expressions/select.js

@@ -16,9 +16,15 @@ class Select {
         const token = node.getFirstToken();
         const from = node.findDirectExpression(Expressions.SQLFrom);
         const dbSources = from ? new sql_from_1.SQLFrom().runSyntax(from, scope, filename) : [];
+        const fields = this.findFields(node);
+        if (fields.length === 0
+            && node.findDirectExpression(Expressions.SQLFieldListLoop) === undefined) {
+            throw new Error(`fields missing`);
+        }
+        this.checkFields(fields, dbSources, scope);
         for (const inline of node.findAllExpressions(Expressions.InlineData)) {
             // todo, for now these are voided
-            new inline_data_1.InlineData().runSyntax(inline, scope, filename, new basic_1.VoidType("SELECT_todo"));
+            new inline_data_1.InlineData().runSyntax(inline, scope, filename, this.buildType(fields));
         }
         const fae = node.findDirectExpression(Expressions.SQLForAllEntries);
         if (fae) {
@@ -62,6 +68,59 @@ class Select {
             scope.pop(node.getLastToken().getEnd());
         }
     }
+    checkFields(fields, dbSources, scope) {
+        if (dbSources.length > 1) {
+            return;
+        }
+        const first = dbSources[0];
+        if (first === undefined) {
+            // then its voided
+            return;
+        }
+        const type = first.parseType(scope.getRegistry());
+        if (type instanceof basic_1.VoidType || type instanceof basic_1.UnknownType) {
+            return;
+        }
+        if (!(type instanceof basic_1.StructureType)) {
+            throw new Error("checkFields, expected structure, " + type.constructor.name);
+        }
+        const isSimple = /^\w+$/;
+        for (const field of fields) {
+            if (field.code === "*") {
+                continue;
+            }
+            if (isSimple.test(field.code) && type.getComponentByName(field.code) === undefined) {
+                throw new Error(`checkFields, field ${field.code} not found`);
+            }
+        }
+    }
+    buildType(_fields) {
+        return new basic_1.VoidType("SELECT_todo");
+    }
+    findFields(node) {
+        var _a;
+        let expr = undefined;
+        const ret = [];
+        expr = node.findDirectExpression(Expressions.SQLFieldList);
+        if (expr === undefined) {
+            expr = node.findDirectExpression(Expressions.SQLFields);
+        }
+        if (expr === undefined) {
+            node.findDirectExpression(Expressions.SQLFieldName);
+        }
+        for (const field of (expr === null || expr === void 0 ? void 0 : expr.findAllExpressions(Expressions.SQLField)) || []) {
+            let code = field.concatTokens().toUpperCase();
+            const as = ((_a = field.findDirectExpression(Expressions.SQLAsName)) === null || _a === void 0 ? void 0 : _a.concatTokens()) || "";
+            if (as !== "") {
+                code = code.replace(" AS " + as, "");
+            }
+            ret.push({ code, as, expression: field });
+        }
+        if (ret.length === 0 && expr) {
+            ret.push({ code: expr.concatTokens(), as: "", expression: expr });
+        }
+        return ret;
+    }
 }
 exports.Select = Select;
 //# sourceMappingURL=select.js.map

package/build/src/lsp/symbols.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Symbols = void 0;
+/* eslint-disable max-len */
 const LServer = require("vscode-languageserver-types");
 const _lsp_utils_1 = require("./_lsp_utils");
+const statements_1 = require("../abap/2_statements/statements");
 class Symbols {
     constructor(reg) {
         this.reg = reg;
@@ -27,6 +29,16 @@ class Symbols {
         const end = identifer.getEnd();
         return LServer.Range.create(start.getRow() - 1, start.getCol() - 1, end.getRow() - 1, end.getCol() - 1);
     }
+    newSymbolRanged(identifier, kind, children, range) {
+        const symbol = {
+            name: identifier.getName(),
+            kind: kind,
+            range: range,
+            selectionRange: this.selectionRange(identifier),
+            children,
+        };
+        return symbol;
+    }
     newSymbol(identifier, kind, children) {
         const symbol = {
             name: identifier.getName(),
@@ -50,22 +62,36 @@ class Symbols {
         for (const cla of file.getInfo().listClassDefinitions()) {
             const children = [];
             children.push(...this.outputClassAttributes(cla.attributes));
-            children.push(...this.outputMethodDefinitions(cla.methods));
             const symbol = this.newSymbol(cla.identifier, LServer.SymbolKind.Class, children);
             ret.push(symbol);
         }
         for (const cla of file.getInfo().listClassImplementations()) {
             const children = [];
-            children.push(...this.outputMethodImplementations(cla.methods));
+            children.push(...this.outputMethodImplementations(cla.methods, file));
             const symbol = this.newSymbol(cla.identifier, LServer.SymbolKind.Class, children);
             ret.push(symbol);
         }
         return ret;
     }
-    outputMethodImplementations(methods) {
+    outputMethodImplementations(methods, file) {
         const ret = [];
         for (const method of methods) {
-            const symbol = this.newSymbol(method, LServer.SymbolKind.Method, []);
+            const start = method.getStart();
+            let end = undefined;
+            for (const s of file.getStatements()) {
+                if (s.getFirstToken().getStart().isBefore(start)) {
+                    continue;
+                }
+                if (s.get() instanceof statements_1.EndMethod) {
+                    end = s.getLastToken().getEnd();
+                    break;
+                }
+            }
+            if (end === undefined) {
+                continue;
+            }
+            const range = LServer.Range.create(start.getRow() - 1, start.getCol() - 1, end.getRow() - 1, end.getCol() - 1);
+            const symbol = this.newSymbolRanged(method, LServer.SymbolKind.Method, [], range);
             ret.push(symbol);
         }
         return ret;
@@ -81,13 +107,6 @@ class Symbols {
         // todo, also add constants
         return ret;
     }
-    outputMethodDefinitions(methods) {
-        if (methods === undefined) {
-            return [];
-        }
-        // todo
-        return [];
-    }
 }
 exports.Symbols = Symbols;
 //# sourceMappingURL=symbols.js.map

package/build/src/registry.js

@@ -65,7 +65,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.102.46";
+        return "2.102.48";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/check_subrc.js

@@ -118,6 +118,7 @@ FIND statement with MATCH COUNT is considered okay if subrc is not checked`,
             }
             else if (config.assign === true
                 && statement.get() instanceof Statements.Assign
+                && this.isSimpleAssign(statement) === false
                 && this.isChecked(i, statements) === false) {
                 issues.push(issue_1.Issue.atStatement(file, statement, message, this.getMetadata().key, this.conf.severity));
             }
@@ -131,6 +132,16 @@ FIND statement with MATCH COUNT is considered okay if subrc is not checked`,
         return issues;
     }
     ////////////////
+    isSimpleAssign(statement) {
+        if (statement.getChildren().length === 5) {
+            const source = statement.findDirectExpression(Expressions.AssignSource);
+            if ((source === null || source === void 0 ? void 0 : source.getChildren().length) === 1
+                && source.findDirectExpression(Expressions.Source) !== undefined) {
+                return true;
+            }
+        }
+        return false;
+    }
     isExemptedFind(s) {
         // see https://github.com/abaplint/abaplint/issues/2130
         return s.concatTokens().toUpperCase().includes(" MATCH COUNT ") === true;

package/build/src/rules/uncaught_exception.js

@@ -72,7 +72,7 @@ class UncaughtException extends _abap_rule_1.ABAPRule {
         return this.issues;
     }
     traverse(n, file) {
-        var _a;
+        var _a, _b, _c, _d;
         const get = n.get();
         if (get instanceof Structures.ClassDefinition
             || get instanceof Structures.Interface) {
@@ -83,10 +83,16 @@ class UncaughtException extends _abap_rule_1.ABAPRule {
                 // note that TRY-CATCH might be arbitrarily nested
                 const previous = this.sinked ? this.sinked.slice() : undefined;
                 this.addFromTryStructure(n);
-                for (const c of n.getChildren()) {
+                for (const c of ((_a = n.findDirectStructure(Structures.Body)) === null || _a === void 0 ? void 0 : _a.getChildren()) || []) {
                     this.traverse(c, file);
                 }
                 this.sinked = previous;
+                for (const c of ((_b = n.findDirectStructure(Structures.Catch)) === null || _b === void 0 ? void 0 : _b.getChildren()) || []) {
+                    this.traverse(c, file);
+                }
+                for (const c of ((_c = n.findDirectStructure(Structures.Cleanup)) === null || _c === void 0 ? void 0 : _c.getChildren()) || []) {
+                    this.traverse(c, file);
+                }
                 return;
             }
             else {
@@ -116,7 +122,7 @@ class UncaughtException extends _abap_rule_1.ABAPRule {
                 let name = undefined;
                 const concat = n.concatTokens().toUpperCase();
                 if (concat.startsWith("RAISE EXCEPTION TYPE ")) {
-                    name = (_a = n.findFirstExpression(Expressions.ClassName)) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr().toUpperCase();
+                    name = (_d = n.findFirstExpression(Expressions.ClassName)) === null || _d === void 0 ? void 0 : _d.getFirstToken().getStr().toUpperCase();
                 }
                 this.check(name, n, file);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.102.46",
+    "version": "2.102.48",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,10 +50,10 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.37.0",
+        "@microsoft/api-extractor": "^7.37.1",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^20.6.5",
+        "@types/node": "^20.7.0",
         "chai": "^4.3.8",
         "eslint": "^8.50.0",
         "mocha": "^10.2.0",
@@ -65,6 +65,6 @@
     "dependencies": {
         "fast-xml-parser": "^4.3.1",
         "json5": "^2.2.3",
-        "vscode-languageserver-types": "^3.17.3"
+        "vscode-languageserver-types": "^3.17.5"
     }
 }