@abaplint/core 2.90.3 → 2.90.6

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/2_statements/statements/insert_internal.js

@@ -6,7 +6,7 @@ const version_1 = require("../../../version");
 const expressions_1 = require("../expressions");
 class InsertInternal {
     getMatcher() {
-        const target = (0, combi_1.alt)(expressions_1.Source, expressions_1.Dynamic);
+        const target = (0, combi_1.altPrio)(expressions_1.Source, expressions_1.Dynamic);
         const assigning = (0, combi_1.seq)("ASSIGNING", expressions_1.FSTarget);
         const ref = (0, combi_1.seq)("REFERENCE INTO", expressions_1.Target);
         const index = (0, combi_1.seq)("INDEX", expressions_1.Source);
@@ -14,10 +14,10 @@ class InsertInternal {
         const into = (0, combi_1.seq)("INTO", (0, combi_1.opt)("TABLE"), expressions_1.Target);
         const to = (0, combi_1.seq)("TO", expressions_1.Source);
         const from = (0, combi_1.seq)("FROM", expressions_1.Source);
-        const fromTo = (0, combi_1.seq)((0, combi_1.opt)(from), (0, combi_1.opt)(to));
+        const fromTo = (0, combi_1.seq)((0, combi_1.optPrio)(from), (0, combi_1.optPrio)(to));
         const foo = (0, combi_1.per)(into, ref, index, assigning);
         const lines = (0, combi_1.seq)("LINES OF", target, (0, combi_1.opt)(fromTo));
-        const src = (0, combi_1.alt)((0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source), expressions_1.SimpleSource4);
+        const src = (0, combi_1.alt)(expressions_1.SimpleSource4, (0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source));
         const tab = (0, combi_1.seq)("TABLE", expressions_1.Source);
         const ret = (0, combi_1.seq)("INSERT", (0, combi_1.altPrio)(tab, (0, combi_1.seq)((0, combi_1.altPrio)(initial, lines, src), foo)));
         return ret;

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/abap/5_syntax/statements/insert_internal.js

@@ -18,7 +18,7 @@ class InsertInternal {
         }
         const afterAssigning = node.findExpressionAfterToken("ASSIGNING");
         if ((afterAssigning === null || afterAssigning === void 0 ? void 0 : afterAssigning.get()) instanceof Expressions.FSTarget) {
-            let source = node.findDirectExpression(Expressions.SimpleSource2);
+            let source = node.findDirectExpression(Expressions.SimpleSource4);
             if (source === undefined) {
                 source = node.findDirectExpression(Expressions.Source);
             }
@@ -34,7 +34,7 @@ class InsertInternal {
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename, targetType);
         }
-        for (const s of node.findDirectExpressions(Expressions.SimpleSource1)) {
+        for (const s of node.findDirectExpressions(Expressions.SimpleSource4)) {
             new source_1.Source().runSyntax(s, scope, filename, targetType);
         }
     }

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.3";
+        return "2.90.6";
     }
     getDDICReferences() {
         return this.references;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.90.3",
+    "version": "2.90.6",
     "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.23.2",
         "@types/chai": "^4.3.1",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^17.0.32",
+        "@types/node": "^17.0.34",
         "chai": "^4.3.6",
         "eslint": "^8.15.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"
     }
 }