@abaplint/core 2.90.4 → 2.90.7

package/build/abaplint.d.ts

@@ -1,5 +1,4 @@
 import * as LServer from 'vscode-languageserver-types';
-import * as SemanticProtocol from 'vscode-languageserver-protocol/lib/common/protocol.semanticTokens';
 import { WorkspaceEdit } from 'vscode-languageserver-types';
 
 export declare class ABAPFile extends AbstractFile {
@@ -3447,8 +3446,8 @@ export declare class LanguageServer {
     documentHighlight(_params: ITextDocumentPositionParams): LServer.DocumentHighlight[];
     implementation(params: ITextDocumentPositionParams): LServer.Location[];
     references(params: ITextDocumentPositionParams): LServer.Location[];
-    static semanticTokensLegend(): SemanticProtocol.SemanticTokensLegend;
-    semanticTokensRange(range: ITextDocumentRange): SemanticProtocol.SemanticTokens;
+    static semanticTokensLegend(): LServer.SemanticTokensLegend;
+    semanticTokensRange(range: ITextDocumentRange): LServer.SemanticTokens;
     help(textDocument: LServer.TextDocumentIdentifier, position: LServer.Position): string;
     listDefinitionPositions(textDocument: LServer.TextDocumentIdentifier): LServer.Range[];
     listReadPositions(textDocument: LServer.TextDocumentIdentifier): LServer.Range[];

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

@@ -69,6 +69,12 @@ class Stream {
     nextNextChar() {
         return this.raw.substr(this.offset + 1, 2);
     }
+    getRaw() {
+        return this.raw;
+    }
+    getOffset() {
+        return this.offset;
+    }
 }
 class Lexer {
     static run(file, virtual) {
@@ -84,10 +90,7 @@ class Lexer {
             const col = this.stream.getCol();
             const row = this.stream.getRow();
             let whiteBefore = false;
-            let prev = this.stream.prevChar();
-            if (s.length === 2) {
-                prev = this.stream.prevPrevChar().substr(0, 1);
-            }
+            const prev = this.stream.getRaw().substr(this.stream.getOffset() - s.length, 1);
             if (prev === " " || prev === "\n" || prev === "\t" || prev === ":") {
                 whiteBefore = true;
             }
@@ -113,13 +116,13 @@ class Lexer {
                 if (first === "|" && last === "|") {
                     tok = new Tokens.StringTemplate(pos, s);
                 }
-                else if (first === "|" && last === "{") {
+                else if (first === "|" && last === "{" && whiteAfter === true) {
                     tok = new Tokens.StringTemplateBegin(pos, s);
                 }
-                else if (first === "}" && last === "|") {
+                else if (first === "}" && last === "|" && whiteBefore === true) {
                     tok = new Tokens.StringTemplateEnd(pos, s);
                 }
-                else if (first === "}" && last === "{") {
+                else if (first === "}" && last === "{" && whiteAfter === true && whiteBefore === true) {
                     tok = new Tokens.StringTemplateMiddle(pos, s);
                 }
                 else {

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

@@ -4,7 +4,7 @@ exports.MethodParamName = void 0;
 const combi_1 = require("../combi");
 class MethodParamName extends combi_1.Expression {
     getRunnable() {
-        const field = (0, combi_1.regex)(/^!?(\/\w+\/)?\w+$/);
+        const field = (0, combi_1.regex)(/^!?\w*(\/\w+\/)?\w+$/);
         return field;
     }
 }

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

@@ -475,7 +475,7 @@ BuiltIn.methods = [
             "off": new basic_1.IntegerType(),
             "len": new basic_1.IntegerType(),
         },
-        return: new basic_1.StringType(),
+        return: new basic_1.IntegerType(),
         version: version_1.Version.v702,
     },
     {
@@ -491,7 +491,7 @@ BuiltIn.methods = [
             "off": new basic_1.IntegerType(),
             "len": new basic_1.IntegerType(),
         },
-        return: new basic_1.StringType(),
+        return: new basic_1.IntegerType(),
         version: version_1.Version.v702,
     },
     {
@@ -507,7 +507,7 @@ BuiltIn.methods = [
             "off": new basic_1.IntegerType(),
             "len": new basic_1.IntegerType(),
         },
-        return: new basic_1.StringType(),
+        return: new basic_1.IntegerType(),
         version: version_1.Version.v702,
     },
     {

package/build/src/lsp/semantic.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SemanticHighlighting = void 0;
-const SemanticProtocol = require("vscode-languageserver-protocol/lib/common/protocol.semanticTokens");
+const LServer = require("vscode-languageserver-types");
 const position_1 = require("../position");
 const tokens_1 = require("../abap/1_lexer/tokens");
 const nodes_1 = require("../abap/nodes");
@@ -30,7 +30,7 @@ class SemanticHighlighting {
             SemanticHighlighting.tokenTypes.push(SOURCE_ABAP);
             SemanticHighlighting.tokenTypeMap[BLOCK_ABAP] = SemanticHighlighting.tokenTypes.length;
             SemanticHighlighting.tokenTypes.push(BLOCK_ABAP);
-            for (const t in SemanticProtocol.SemanticTokenTypes) {
+            for (const t in LServer.SemanticTokenTypes) {
                 SemanticHighlighting.tokenTypeMap[t] = SemanticHighlighting.tokenTypes.length;
                 SemanticHighlighting.tokenTypes.push(t);
             }
@@ -58,7 +58,7 @@ class SemanticHighlighting {
             const statementInstance = s.get();
             for (const t of s.getTokenNodes()) {
                 const tokenInstance = t.get();
-                let tokenType = SemanticProtocol.SemanticTokenTypes.keyword;
+                let tokenType = LServer.SemanticTokenTypes.keyword;
                 if (tokenInstance instanceof tokens_1.Punctuation) {
                     tokenType = SOURCE_ABAP;
                 }
@@ -81,10 +81,10 @@ class SemanticHighlighting {
                     || tokenInstance instanceof tokens_1.StringTemplateBegin
                     || tokenInstance instanceof tokens_1.StringTemplateEnd
                     || tokenInstance instanceof tokens_1.StringTemplateMiddle) {
-                    tokenType = SemanticProtocol.SemanticTokenTypes.string;
+                    tokenType = LServer.SemanticTokenTypes.string;
                 }
                 else if (tokenInstance instanceof tokens_1.Comment) {
-                    tokenType = SemanticProtocol.SemanticTokenTypes.comment;
+                    tokenType = LServer.SemanticTokenTypes.comment;
                 }
                 else if (t instanceof nodes_1.TokenNodeRegex) {
                     tokenType = SOURCE_ABAP;

package/build/src/registry.js

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

package/build/src/rules/dangerous_statement.js

@@ -24,7 +24,7 @@ class DangerousStatementConf extends _basic_rule_config_1.BasicRuleConfig {
         this.deleteReport = true;
         this.deleteTextpool = true;
         this.deleteDynpro = true;
-        this.importDynpro = true;
+        this.exportDynpro = true;
         /** Finds instances of dynamic SQL: SELECT, UPDATE, DELETE, INSERT, MODIFY */
         this.dynamicSQL = true;
     }
@@ -89,8 +89,8 @@ dynamic SQL can potentially create SQL injection problems`,
             else if (this.conf.deleteDynpro && statement instanceof Statements.DeleteDynpro) {
                 message = "DELETE DYNPRO";
             }
-            else if (this.conf.importDynpro && statement instanceof Statements.ImportDynpro) {
-                message = "IMPORT DYNPRO";
+            else if (this.conf.exportDynpro && statement instanceof Statements.ExportDynpro) {
+                message = "EXPORT DYNPRO";
             }
             if (message) {
                 issues.push(issue_1.Issue.atStatement(file, statementNode, this.getDescription(message), this.getMetadata().key, this.conf.severity));
@@ -112,7 +112,8 @@ dynamic SQL can potentially create SQL injection problems`,
             || statement instanceof Statements.InsertDatabase
             || statement instanceof Statements.ModifyDatabase
             || statement instanceof Statements.DeleteDatabase) {
-            if (statementNode.findFirstExpression(Expressions.Dynamic)) {
+            const dyn = statementNode.findFirstExpression(Expressions.Dynamic);
+            if (dyn && dyn.findDirectExpression(Expressions.Constant) === undefined) {
                 return "Dynamic SQL";
             }
         }

package/build/src/rules/slow_parameter_passing.js

@@ -19,7 +19,7 @@ class SlowParameterPassing {
         return {
             key: "slow_parameter_passing",
             title: "Slow Parameter Passing",
-            shortDescription: `Detects show pass by value passing for methods where parameter is not changed`,
+            shortDescription: `Detects slow pass by value passing for methods where parameter is not changed`,
             tags: [_irule_1.RuleTag.Performance],
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.90.4",
+    "version": "2.90.7",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -45,14 +45,14 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.23.2",
+        "@microsoft/api-extractor": "^7.24.1",
         "@types/chai": "^4.3.1",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^17.0.32",
+        "@types/node": "^17.0.35",
         "chai": "^4.3.6",
-        "eslint": "^8.15.0",
+        "eslint": "^8.16.0",
         "mocha": "^10.0.0",
-        "c8": "^7.11.2",
+        "c8": "^7.11.3",
         "source-map-support": "^0.5.21",
         "ts-json-schema-generator": "^1.0.0",
         "typescript": "^4.6.4"
@@ -60,7 +60,6 @@
     "dependencies": {
         "fast-xml-parser": "^4.0.7",
         "json5": "^2.2.1",
-        "vscode-languageserver-protocol": "=3.16.0",
-        "vscode-languageserver-types": "=3.16.0"
+        "vscode-languageserver-types": "^3.17.1"
     }
 }