@abaplint/core 2.84.9 → 2.85.0

package/build/abaplint.d.ts

@@ -25,7 +25,7 @@ export declare abstract class ABAPObject extends AbstractObject {
     abstract getDescription(): string | undefined;
     constructor(name: string);
     static is(x: any): x is ABAPObject;
-    parse(version: Version, globalMacros?: readonly string[]): IParseResult;
+    parse(version: Version, globalMacros?: readonly string[], reg?: IRegistry): IParseResult;
     setDirty(): void;
     getABAPFiles(): readonly ABAPFile[];
     getABAPFileByName(filename: string): ABAPFile | undefined;
@@ -79,7 +79,7 @@ declare abstract class AbstractObject implements IObject {
     abstract getDescription(): string | undefined;
     constructor(name: string);
     getParsingIssues(): readonly Issue[];
-    parse(_version?: Version, _globalMacros?: readonly string[]): IParseResult;
+    parse(_version?: Version, _globalMacros?: readonly string[], _reg?: IRegistry): IParseResult;
     getName(): string;
     setDirty(): void;
     addFile(file: IFile): void;
@@ -3100,8 +3100,10 @@ export declare interface IObject extends IArtifact {
     getDescription(): string | undefined;
     setDirty(): void;
     isDirty(): boolean;
-    /** returns true if the object was parsed, false if no changes since last parse */
-    parse(version?: Version, globalMacros?: readonly string[], globalExclude?: readonly string[]): IParseResult;
+    /** returns true if the object was parsed, false if no changes since last parse
+     * registry for global cross object macros
+     */
+    parse(version?: Version, globalMacros?: readonly string[], reg?: IRegistry): IParseResult;
     getParsingIssues(): readonly Issue[];
     getFiles(): readonly IFile[];
     addFile(file: IFile): void;

package/build/src/abap/2_statements/expand_macros.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExpandMacros = void 0;
 const Statements = require("./statements");
+const Expressions = require("./expressions");
 const Tokens = require("../1_lexer/tokens");
 const _statement_1 = require("./statements/_statement");
 const statement_node_1 = require("../nodes/statement_node");
@@ -37,26 +38,44 @@ class Macros {
     }
 }
 class ExpandMacros {
-    constructor(globalMacros, version) {
+    // "reg" must be supplied if there are cross object macros via INCLUDE
+    constructor(globalMacros, version, reg) {
         this.macros = new Macros(globalMacros);
         this.version = version;
+        this.globalMacros = globalMacros;
+        this.reg = reg;
     }
     find(statements) {
+        var _a, _b;
         let name = undefined;
         let contents = [];
         for (let i = 0; i < statements.length; i++) {
             const statement = statements[i];
-            if (statement.get() instanceof Statements.Define) {
+            const type = statement.get();
+            if (type instanceof Statements.Define) {
                 // todo, will this break if first token is a pragma?
                 name = statement.getTokens()[1].getStr();
                 contents = [];
             }
+            else if (type instanceof Statements.Include) {
+                const includeName = (_a = statement.findDirectExpression(Expressions.IncludeName)) === null || _a === void 0 ? void 0 : _a.concatTokens();
+                // todo, this does not take function module includes into account
+                const prog = (_b = this.reg) === null || _b === void 0 ? void 0 : _b.getObject("PROG", includeName);
+                if (prog) {
+                    prog.parse(this.version, this.globalMacros, this.reg);
+                    const main = prog.getMainABAPFile();
+                    if (main) {
+                        // slow, this copies everything,
+                        this.find([...main.getStatements()]);
+                    }
+                }
+            }
             else if (name) {
-                if (statement.get() instanceof Statements.EndOfDefinition) {
+                if (type instanceof Statements.EndOfDefinition) {
                     this.macros.addMacro(name, contents);
                     name = undefined;
                 }
-                else if (!(statement.get() instanceof _statement_1.Comment)) {
+                else if (!(type instanceof _statement_1.Comment)) {
                     statements[i] = new statement_node_1.StatementNode(new _statement_1.MacroContent()).setChildren(this.tokensToNodes(statement.getTokens()));
                     contents.push(statements[i]);
                 }
@@ -67,7 +86,8 @@ class ExpandMacros {
         const result = [];
         let containsUnknown = false;
         for (const statement of statements) {
-            if (statement.get() instanceof _statement_1.Unknown || statement.get() instanceof _statement_1.MacroCall) {
+            const type = statement.get();
+            if (type instanceof _statement_1.Unknown || type instanceof _statement_1.MacroCall) {
                 const macroName = this.findName(statement.getTokens());
                 if (macroName && this.macros.isMacro(macroName)) {
                     result.push(new statement_node_1.StatementNode(new _statement_1.MacroCall()).setChildren(this.tokensToNodes(statement.getTokens())));
@@ -114,7 +134,7 @@ class ExpandMacros {
         }
         const file = new memory_file_1.MemoryFile("expand_macros.abap.prog", str);
         const lexerResult = lexer_1.Lexer.run(file, statement.getFirstToken().getStart());
-        const result = new statement_parser_1.StatementParser(this.version).run([lexerResult], this.macros.listMacroNames());
+        const result = new statement_parser_1.StatementParser(this.version, this.reg).run([lexerResult], this.macros.listMacroNames());
         return result[0].statements;
     }
     buildInput(statement) {

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

@@ -4,8 +4,9 @@ exports.ConcatenatedConstant = void 0;
 const combi_1 = require("../combi");
 class ConcatenatedConstant extends combi_1.Expression {
     getRunnable() {
-        // todo: replace optPrio with plusPrio when its implemented, below is a workaround
-        return (0, combi_1.seq)((0, combi_1.regex)(/^`.*`$/), "&", (0, combi_1.regex)(/^`.*`$/), (0, combi_1.optPrio)((0, combi_1.seq)("&", (0, combi_1.regex)(/^`.*`$/))), (0, combi_1.optPrio)((0, combi_1.seq)("&", (0, combi_1.regex)(/^`.*`$/))), (0, combi_1.optPrio)((0, combi_1.seq)("&", (0, combi_1.regex)(/^`.*`$/))));
+        const str = (0, combi_1.seq)((0, combi_1.regex)(/^`.*`$/), (0, combi_1.plusPrio)((0, combi_1.seq)("&", (0, combi_1.regex)(/^`.*`$/))));
+        const char = (0, combi_1.seq)((0, combi_1.regex)(/^'.*'$/), (0, combi_1.plusPrio)((0, combi_1.seq)("&", (0, combi_1.regex)(/^'.*'$/))));
+        return (0, combi_1.altPrio)(str, char);
     }
 }
 exports.ConcatenatedConstant = ConcatenatedConstant;

package/build/src/abap/2_statements/statement_parser.js

@@ -63,15 +63,16 @@ class WorkArea {
     }
 }
 class StatementParser {
-    constructor(version) {
+    constructor(version, reg) {
         if (!StatementParser.map) {
             StatementParser.map = new StatementMap();
         }
         this.version = version;
+        this.reg = reg;
     }
     /** input is one full object */
     run(input, globalMacros) {
-        const macros = new expand_macros_1.ExpandMacros(globalMacros, this.version);
+        const macros = new expand_macros_1.ExpandMacros(globalMacros, this.version, this.reg);
         const wa = input.map(i => new WorkArea(i.file, i.tokens));
         for (const w of wa) {
             this.process(w);

package/build/src/abap/5_syntax/global_definitions/find_global_definitions.js

@@ -114,7 +114,7 @@ class FindGlobalDefinitions {
                 obj.setDefinition(undefined);
             }
         }
-        else if (obj instanceof class_1.Class) {
+        else {
             const found = struc === null || struc === void 0 ? void 0 : struc.findFirstStructure(Structures.ClassDefinition);
             if (struc && file && found) {
                 try {

package/build/src/abap/abap_parser.js

@@ -8,9 +8,10 @@ const structure_parser_1 = require("./3_structures/structure_parser");
 const abap_file_information_1 = require("./4_file_information/abap_file_information");
 const abap_file_1 = require("./abap_file");
 class ABAPParser {
-    constructor(version, globalMacros) {
+    constructor(version, globalMacros, reg) {
         this.version = version ? version : version_1.defaultVersion;
         this.globalMacros = globalMacros ? globalMacros : [];
+        this.reg = reg;
     }
     // files is input for a single object
     parse(files) {
@@ -23,7 +24,7 @@ class ABAPParser {
         const lexingRuntime = Date.now() - b1;
         // 2: statements
         const b2 = Date.now();
-        const statementResult = new statement_parser_1.StatementParser(this.version).run(lexerResult, this.globalMacros);
+        const statementResult = new statement_parser_1.StatementParser(this.version, this.reg).run(lexerResult, this.globalMacros);
         const statementsRuntime = Date.now() - b2;
         // 3: structures
         const b3 = Date.now();

package/build/src/lsp/diagnostics.js

@@ -30,6 +30,7 @@ class Diagnostics {
                 end: { line: issue.getEnd().getRow() - 1, character: issue.getEnd().getCol() - 1 },
             },
             code: issue.getKey(),
+            codeDescription: { href: "https://rules.abaplint.org/" + issue.getKey() + "/" },
             message: issue.getMessage().toString(),
             source: "abaplint",
         };

package/build/src/objects/_abap_object.js

@@ -13,12 +13,12 @@ class ABAPObject extends _abstract_object_1.AbstractObject {
     static is(x) {
         return !!x && x instanceof ABAPObject;
     }
-    parse(version, globalMacros) {
+    parse(version, globalMacros, reg) {
         if (this.isDirty() === false) {
             return { updated: false, runtime: 0 };
         }
         const abapFiles = this.getFiles().filter(f => f.getFilename().endsWith(".abap"));
-        const result = new abap_parser_1.ABAPParser(version, globalMacros).parse(abapFiles);
+        const result = new abap_parser_1.ABAPParser(version, globalMacros, reg).parse(abapFiles);
         this.parsed = result.output;
         this.old = result.issues;
         this.dirty = false;
@@ -41,7 +41,7 @@ class ABAPObject extends _abstract_object_1.AbstractObject {
         return undefined;
     }
     getMainABAPFile() {
-        // todo, uris
+        // todo, uris, https://github.com/abaplint/abaplint/issues/673
         const search = this.getName().replace(/\//g, "#").toLowerCase() + "." + this.getType().toLowerCase() + ".abap";
         for (const file of this.getABAPFiles()) {
             if (file.getFilename().endsWith(search)) {

package/build/src/objects/_abstract_object.js

@@ -15,7 +15,7 @@ class AbstractObject {
     getParsingIssues() {
         return this.old;
     }
-    parse(_version, _globalMacros) {
+    parse(_version, _globalMacros, _reg) {
         return { updated: false, runtime: 0 };
     }
     getName() {

package/build/src/registry.js

@@ -68,7 +68,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.84.9";
+        return "2.85.0";
     }
     getDDICReferences() {
         return this.references;
@@ -259,7 +259,7 @@ class Registry {
     // todo, refactor, this is a mess, see where-used, a lot of the code should be in this method instead
     parsePrivate(input) {
         const config = this.getConfig();
-        const result = input.parse(config.getVersion(), config.getSyntaxSetttings().globalMacros);
+        const result = input.parse(config.getVersion(), config.getSyntaxSetttings().globalMacros, this);
         ParsingPerformance.push(input, result);
     }
     isDirty() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.84.9",
+    "version": "2.85.0",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,7 +50,7 @@
         "@types/mocha": "^9.1.0",
         "@types/node": "^17.0.13",
         "chai": "^4.3.6",
-        "eslint": "^8.7.0",
+        "eslint": "^8.8.0",
         "mocha": "^9.2.0",
         "c8": "^7.11.0",
         "source-map-support": "^0.5.21",