@abaplint/core 2.95.39 → 2.95.41

package/build/abaplint.d.ts

@@ -1328,6 +1328,10 @@ declare class CustomizingTransaction extends AbstractObject {
     getDescription(): string | undefined;
 }
 
+export declare class CyclomaticComplexityStats {
+    static run(obj: IObject): ICyclomaticComplexityResult[];
+}
+
 declare class Dash extends Token {
     static railroad(): string;
 }
@@ -2799,6 +2803,13 @@ export declare interface IConfiguration {
     readByKey(rule: string, key: string): any;
 }
 
+declare interface ICyclomaticComplexityResult {
+    file: IFile;
+    pos: Position;
+    name: string;
+    count: number;
+}
+
 declare interface IDDICReferences {
     setUsing(obj: IObject, using: readonly IObjectAndToken[]): void;
     addUsing(obj: IObject, using: IObjectAndToken | undefined): void;
@@ -5819,7 +5830,7 @@ export { Structures }
 declare class StructureType extends AbstractType {
     private readonly indexed;
     private readonly components;
-    constructor(components: IStructureComponent[], qualifiedName?: string);
+    constructor(components: IStructureComponent[], qualifiedName?: string, ddicName?: string);
     getComponents(): IStructureComponent[];
     getComponentByName(name: string): AbstractType | undefined;
     toText(level: number): string;

package/build/src/abap/1_lexer/lexer.js

@@ -330,7 +330,10 @@ class Lexer {
             const ahead = this.stream.nextChar();
             const aahead = this.stream.nextNextChar();
             if (this.m === this.ModeNormal) {
-                if (ahead === "'") {
+                if (splits[ahead]) {
+                    this.add();
+                }
+                else if (ahead === "'") {
                     // start string
                     this.add();
                     this.m = this.ModeStr;
@@ -356,9 +359,6 @@ class Lexer {
                     this.add();
                     this.m = this.ModeComment;
                 }
-                else if (splits[ahead]) {
-                    this.add();
-                }
                 else if (ahead === "@" && buf.trim().length === 0) {
                     this.add();
                 }

package/build/src/abap/types/basic/structure_type.js

@@ -3,8 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StructureType = void 0;
 const _abstract_type_1 = require("./_abstract_type");
 class StructureType extends _abstract_type_1.AbstractType {
-    constructor(components, qualifiedName) {
-        super({ qualifiedName: qualifiedName });
+    constructor(components, qualifiedName, ddicName) {
+        super({
+            qualifiedName: qualifiedName,
+            ddicName: ddicName,
+        });
         if (components.length === 0) {
             throw new Error("Structure does not contain any components");
         }

package/build/src/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RuleTag = exports.Severity = exports.Visibility = exports.Info = exports.Rename = exports.PrettyPrinter = exports.Position = exports.CurrentScope = exports.ABAPFile = exports.RulesRunner = exports.SpaghettiScope = exports.SyntaxLogic = exports.ABAPObject = exports.Tokens = exports.ExpressionsCDS = exports.CDSParser = exports.LanguageServerTypes = exports.DDLParser = exports.applyEditList = exports.applyEditSingle = exports.SpaghettiScopeNode = exports.AbstractFile = exports.Token = exports.ScopeType = exports.BasicTypes = exports.TypedIdentifier = exports.AbstractType = exports.VirtualPosition = exports.Comment = exports.Unknown = exports.Empty = exports.Identifier = exports.Nodes = exports.Types = exports.Expressions = exports.Statements = exports.Structures = exports.Objects = exports.ArtifactsRules = exports.ArtifactsObjects = exports.ArtifactsABAP = exports.BuiltIn = exports.MethodLengthStats = exports.LanguageServer = exports.Registry = exports.ReferenceType = exports.Version = exports.Config = exports.Issue = exports.MemoryFile = void 0;
+exports.Severity = exports.Visibility = exports.Info = exports.Rename = exports.PrettyPrinter = exports.Position = exports.CurrentScope = exports.ABAPFile = exports.RulesRunner = exports.SpaghettiScope = exports.SyntaxLogic = exports.ABAPObject = exports.Tokens = exports.ExpressionsCDS = exports.CDSParser = exports.LanguageServerTypes = exports.DDLParser = exports.applyEditList = exports.applyEditSingle = exports.SpaghettiScopeNode = exports.AbstractFile = exports.Token = exports.ScopeType = exports.BasicTypes = exports.TypedIdentifier = exports.AbstractType = exports.VirtualPosition = exports.Comment = exports.Unknown = exports.Empty = exports.Identifier = exports.Nodes = exports.Types = exports.Expressions = exports.Statements = exports.Structures = exports.Objects = exports.ArtifactsRules = exports.ArtifactsObjects = exports.ArtifactsABAP = exports.BuiltIn = exports.MethodLengthStats = exports.LanguageServer = exports.Registry = exports.CyclomaticComplexityStats = exports.ReferenceType = exports.Version = exports.Config = exports.Issue = exports.MemoryFile = void 0;
+exports.RuleTag = void 0;
 const issue_1 = require("./issue");
 Object.defineProperty(exports, "Issue", { enumerable: true, get: function () { return issue_1.Issue; } });
 const config_1 = require("./config");
@@ -96,4 +97,6 @@ const rules_runner_1 = require("./rules_runner");
 Object.defineProperty(exports, "RulesRunner", { enumerable: true, get: function () { return rules_runner_1.RulesRunner; } });
 const _irule_1 = require("./rules/_irule");
 Object.defineProperty(exports, "RuleTag", { enumerable: true, get: function () { return _irule_1.RuleTag; } });
+const cyclomatic_complexity_stats_1 = require("./utils/cyclomatic_complexity_stats");
+Object.defineProperty(exports, "CyclomaticComplexityStats", { enumerable: true, get: function () { return cyclomatic_complexity_stats_1.CyclomaticComplexityStats; } });
 //# sourceMappingURL=index.js.map

package/build/src/objects/table.js

@@ -231,7 +231,7 @@ class Table extends _abstract_object_1.AbstractObject {
             return new Types.UnknownType("Table/Structure " + this.getName() + " does not contain any components");
         }
         reg.getDDICReferences().setUsing(this, references);
-        return new Types.StructureType(components, this.getName());
+        return new Types.StructureType(components, this.getName(), this.getName());
     }
     getTableCategory() {
         var _a;

package/build/src/position.js

@@ -31,7 +31,6 @@ exports.Position = Position;
 class VirtualPosition extends Position {
     constructor(virtual, row, col) {
         super(virtual.getRow(), virtual.getCol());
-        //    this.virtual = virtual;
         this.vrow = row;
         this.vcol = col;
     }
@@ -39,7 +38,8 @@ class VirtualPosition extends Position {
         if (!(p instanceof VirtualPosition)) {
             return false;
         }
-        return super.equals(this) && this.vrow === p.vrow && this.vcol === p.vcol;
+        const casted = p;
+        return super.equals(this) && this.vrow === casted.vrow && this.vcol === casted.vcol;
     }
 }
 exports.VirtualPosition = VirtualPosition;

package/build/src/registry.js

@@ -63,7 +63,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.39";
+        return "2.95.41";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/downport.js

@@ -25,6 +25,7 @@ const include_graph_1 = require("../utils/include_graph");
 const objects_1 = require("../objects");
 const _builtin_1 = require("../abap/5_syntax/_builtin");
 const _scope_type_1 = require("../abap/5_syntax/_scope_type");
+const statements_1 = require("../abap/2_statements/statements");
 // todo: refactor each sub-rule to new classes?
 // todo: add configuration
 class DownportConf extends _basic_rule_config_1.BasicRuleConfig {
@@ -430,7 +431,7 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
-        found = this.replaceLineFunctions(high, lowFile, highSyntax);
+        found = this.replaceLineFunctions(high, lowFile, highSyntax, highFile);
         if (found) {
             return found;
         }
@@ -2471,7 +2472,7 @@ ${indentation}    output = ${topTarget}.`;
         }
         return undefined;
     }
-    replaceLineFunctions(node, lowFile, highSyntax) {
+    replaceLineFunctions(node, lowFile, highSyntax, highFile) {
         var _a, _b;
         const spag = highSyntax.spaghetti.lookupPosition(node.getFirstToken().getStart(), lowFile.getFilename());
         for (const r of (spag === null || spag === void 0 ? void 0 : spag.getData().references) || []) {
@@ -2506,12 +2507,30 @@ ${indentation}    output = ${topTarget}.`;
                     indentation + `READ TABLE ${tableName} ${condition}TRANSPORTING NO FIELDS.\n` +
                     indentation + uniqueName + ` = ${sy}.\n` +
                     indentation;
-                const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), code);
+                let insertAt = node.getFirstToken().getStart();
+                if (node.get() instanceof statements_1.ElseIf) {
+                    // assumption: no side effects in IF conditions
+                    insertAt = this.findStartOfIf(node, highFile);
+                    if (insertAt === undefined) {
+                        continue;
+                    }
+                }
+                const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, insertAt, code);
                 const start = expression.getFirstToken().getStart();
                 const end = expression.getLastToken().getEnd();
                 const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, uniqueName + (func === "LINE_EXISTS" ? " = 0" : ""));
                 const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
-                return issue_1.Issue.atToken(lowFile, token, "Use BOOLC", this.getMetadata().key, this.conf.severity, fix);
+                return issue_1.Issue.atToken(lowFile, token, "Replace line function", this.getMetadata().key, this.conf.severity, fix);
+            }
+        }
+        return undefined;
+    }
+    findStartOfIf(node, highFile) {
+        var _a;
+        const structure = highFile.getStructure();
+        for (const c of (structure === null || structure === void 0 ? void 0 : structure.findAllStructuresRecursive(Structures.If)) || []) {
+            if (((_a = c.findDirectStructure(Structures.ElseIf)) === null || _a === void 0 ? void 0 : _a.getFirstStatement()) === node) {
+                return c.getFirstToken().getStart();
             }
         }
         return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.95.39",
+    "version": "2.95.41",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -52,7 +52,7 @@
         "@types/mocha": "^10.0.1",
         "@types/node": "^18.15.0",
         "chai": "^4.3.7",
-        "eslint": "^8.35.0",
+        "eslint": "^8.36.0",
         "mocha": "^10.2.0",
         "c8": "^7.13.0",
         "source-map-support": "^0.5.21",