feat: Support COBOL functions

clients/cobol-lsp-vscode-extension/src/test/suite/lsp.spec.test.ts

@@ -34,24 +34,10 @@ suite("Integration Test Suite", function () {
  const editor = helper.get_editor("USER2.cbl");
  await helper.waitForDiagnostics(editor.document.uri);
  const diagnostics = vscode.languages.getDiagnostics(editor.document.uri);
- assert.strictEqual(diagnostics.length, 2);
- assert.ok(diagnostics.length === 2);
+ assert.strictEqual(diagnostics.length, 1);
  const d0 = diagnostics[0];
- const d1 = diagnostics[1];
- assert.strictEqual(
- d0.message,
- "Missing token PROGRAM-ID at programIdParagraph",
- );
- helper.assertRangeIsEqual(d0.range, range(pos(13, 30), pos(13, 31)));
- assert.strictEqual(d0.severity, diagnostics[1].severity);
- assert.strictEqual(
- d0.severity,
- vscode.DiagnosticSeverity.Error,
- "No syntax errors detected in USER2.cbl",
- );
-
- assert.strictEqual(d1.message, "Syntax error on 'HELLO-WORLD'");
- helper.assertRangeIsEqual(d1.range, range(pos(14, 20), pos(14, 31)));
+ assert.strictEqual(d0.message, "Syntax error on 'Program1-id'");
+ helper.assertRangeIsEqual(d0.range, range(pos(14, 7), pos(14, 18)));
  });
 
  test("TC152050, TC152053: Error case - file has semantic errors and are marked with detailed hints", async () => {
@@ -557,7 +543,7 @@ suite("Integration Test Suite", function () {
  await helper.showDocument(copybookPath);
 
  await helper.waitFor(
- () => vscode.languages.getDiagnostics(copybookUri).length === 2,
+ () => vscode.languages.getDiagnostics(copybookUri).length === 1,
  );
  copyDiagnostics = vscode.languages.getDiagnostics(copybookUri);
  assert.strictEqual(

clients/cobol-lsp-vscode-extension/syntaxes/COBOL.tmLanguage.json

@@ -164,7 +164,7 @@
  }
  },
  "cobol-general-keyword": {
- "match": "(?<![\\-\\w])(?i:ABD|ABORT|ACCEPT|ACCESS|ADATA|ADD|CBLCARD|COBOL2|COBOL3|CPSM|DLI|EDF|EXCI|FEPI|NATLANG|NOCBLCARD|NOCPSM|NODEBUG|NOEDF|NOFEPI|NOLENGTH|NOLINKAGE|NOOPTIONS|NOSPIE|OPTIONS|SP|SPIE|SYSEIB|ADDRESS|ADEXIT|ADV|ADVANCING|ADX|AFP|AFTER|ALIAS|ALL|ALPHABET|ALPHABETIC|ALPHABETIC-LOWER|ALPHABETIC-UPPER|ALPHANUMERIC|ALPHANUMERIC-EDITED|ALPHNUM|ALSO|ALTER|ALTERNATE|ANA|ANALIST|AND|ANSI|ANY|APOST|APPLY|AR|ARCH|ARE|AREA|AREAS|ARITH|ASCENDING|ASCII|ASSIGN|ASSOCIATED_DATA|ASSOCIATED_DATA_LENGTH|AT|AUTHOR|AUTO|AVG|AWO|BEFORE|BIN|BINARY|BLANK|BLOCK|BLOCK0|BOTH|BOTTOM|BUF|BUFSIZE|BY|BYFUNCTION|BYTITLE|CALL|CANCEL|CAPABLE|CBL|CCSVERSION|CHAINING|CHANGED|CHANNEL|CHARACTER|CHARACTERS|CICS|CLASS|CLEANSIGN|CLOCK-UNITS|CLOSE|CLOSE-DISPOSITION|CO|CODEPAGE|CODE-SET|COLLATING|COLS|COMMA|COMMITMENT|COMMON|COMP|COMPAT|COMPILE|COMPUTATIONAL|COMPUTATIONAL-1|COMPUTATIONAL-2|COMPUTATIONAL-3|COMPUTATIONAL-4|COMPUTATIONAL-5|COMPUTE|COMP-1|COMP-2|COMP-3|COMP-4|COMP-5|CONFIGURATION|CONTAINS|CONTENT|CONTINUE|CONTROL|CONVERTING|COPYLOC|COPYRIGHT|CORR|CORRESPONDING|COUNT|CP|CPLC|CPYR|CR|CRUNCH|CS|CURR|CURRENCY|CYCLE|DACO-CONTROL|DATA|DATE|DATE-COMPILED|DATE-WRITTEN|DAY|DAY-OF-WEEK|DB|DBCS|DEBUG|DEBUGGING|DEC|DECIMAL-POINT|DECK|DECLARATIVES|DEF|DEFAULT|DEFAULT-DISPLAY|DEFINE|DEFINITION|DELETE|DELIMITED|DELIMITER|DEPENDING|DESCENDING|DESIGNER|DFHRESP|DFHVALUE|DIAGTRUNC|DISABLE|DISK|DISPLAY|DISPLAY-1|DISPSIGN|DIVIDE|DIVISION|DLL|DN|DOWN|DS|DSN|DSNAME|DTR|DU|DUMP|DUPLICATES|DWARF|DYN|DYNAM|DYNAMIC|EBCDIC|EGCS|EGI|EJPD|ELSE|EMA|EMI|EN|ENABLE|ENCODING|END|ENDP|ENDPERIOD|END-ACCEPT|END-ADD|END-CALL|END-COMPUTE|END-DELETE|END-DIVIDE|END-EVALUATE|END-IF|END-MULTIPLY|END-OF-PAGE|END-PERFORM|END-READ|END-RECEIVE|END-RETURN|END-REWRITE|END-SEARCH|END-START|END-STRING|END-SUBTRACT|END-UNSTRING|END-WRITE|END-XML|ENGLISH|ENTRY|ENVIRONMENT|EOC|EODS|EOP|EQUAL|ERROR|ESCAPE|ESI|EVALUATE|EVENP|EVENPACK|EVERY|EX|EXCEPTION|EXCLUSIVE|EXEC|EXHIBIT|EXIT|EXP|EXPORTALL|EXTEND|EXTERNAL|FALSE|FASTSRT|FD|FIELD|FILED|FILE|FILE-CONTROL|FILL|FILLER|FIND|FIRST|FLAG|FLAGSTD|FNC|FOOTING|FOR|FORCENUMCMP|FROM|FSRT|FULL|FUNCTION|FUNCTION-POINTER|GENERATE|GET|GIVING|GLOBAL|GO|GOBACK|GREATER|GROUP-USAGE|HEX|HGPR|HIGH-VALUE|HIGH-VALUES|IC|ID|IDENTIFICATION|IF|IMPLICIT|IN|INDEX|INDEXED|INEXIT|INFO|INITCHECK|INITIAL|INITIALIZE|INITIATE|INL|INLINE|INPUT|INPUT-OUTPUT|INSERT|INSPECT|INSTALLATION|INTDATE|INTEGER|INTO|INVALID|INVD|INVDATA|INVMPSZ|INVPARTN|INVREQ|INX|IS|I-O|I-O-CONTROL|JA|JAPANESE|JP|JUST|JUSTIFIED|KANJI|KEPT|KEY|KEYBOARD|LABEL|LANG|LANGUAGE|LAST|LAX|LAXPERF|LAXREDEF|LAYOUT|LC|LEADING|LEFT|LENGTH|LESS|LIBEXIT|LIBRARY|LIBX|LILIAN|LIMIT|LINAGE|LINAGE-COUNTER|LINE|LINECOUNT|LINES|LINKAGE|LIST|LM|LOCAL|LOCAL-STORAGE|LOCK|LONGMIXED|LONGUPPER|LOW-VALUE|LOW-VALUES|LP|LU|LXPRF|LXRDF|MAP|MAPFAIL|MATCH|MAX|MAXPCF|MD|MDECK|MEMORY|MERGE|MESSAGE|MIG|MIXED|MMDDYYYY|MODE|MODULES|MOVE|MSG|MSGEXIT|MSGX|MULTIPLE|MULTIPLY|NAME|NAMED|NAT|NATIONAL|NATIONAL-EDITED|NATIVE|NC|ND|NEGATIVE|NETWORK|NEXT|NO|NO-POS|NOADATA|NOADEXIT|NOADV|NOADX|NOALIAS|NOALPHNUM|NOAWO|NOBIN|NOBLOCK0|NOC|NOCICS|NOCLEANSIGN|NOCOMPILE|NOCOPYLOC|NOCOPYRIGHT|NOCPLC|NOCPYR|NOCS|NOCURR|NOCURRENCY|NOD|NODBCS|NODECK|NODEF|NODEFINE|NODIAGTRUNC|NODLL|NODSNAME|NODTR|NODU|NODUMP|NODWARF|NODYN|NODYNAM|NOEJPD|NOENDPERIOD|NOEVENPACK|NOEX|NOEXIT|NOEXP|NOEXPORTALL|NOF|NOFASTSRT|NOFLAG|NOFLAGSTD|NOFNC|NOFORCENUMCMP|NOFSRT|NOIC|NOINEXIT|NOINITCHECK|NOINITIAL|NOINL|NOINLINE|NOINVD|NOINVDATA|NOINX|NOLAXPERF|NOLAXREDEF|NOLIBEXIT|NOLIBX|NOLIST|NOMAP|NOMD|NOMDECK|NOMSGEXIT|NOMSGX|NONAME|NONC|NONUM|NONUMBER|NONUMCHECK|NOOBJ|NOOBJECT|NOOFF|NOOFFSET|NOOMITODOMIN|NOPAC|NOPARMCHECK|NOPC|NOPFD|NOPRESERVE|NOPRTEXIT|NOPRTX|NORENT|NORULES|NOS|NOSEP|NOSEPARATE|NOSEQ|NOSEQUENCE|NOSERV|NOSERVICE|NOSLACKBYTES|NOSO|NOSOURCE|NOSQL|NOSQLC|NOSQLCCSID|NOSQLIMS|NOSSR|NOSSRANGE|NOSTGOPT|NOSUPP|NOSUPPRESS|NOT|NOTERM|NOTERMINAL|NOTEST|NOTHREAD|NOTRUNCBIN|NOUNRA|NOUNREFALL|NOUNREFSOURCE|NOUNRS|NOVBREF|NOVOLATILE|NOWD|NOWORD|NOX|NOXREF|NOZC|NOZLEN|NOZON|NOZONECHECK|NOZWB|NS|NSYMBOL|NULL|NULLS|NUM|NUMBER|NUMCHECK|NUMERIC|NUMERIC-EDITED|NUMPROC|OBJ|OBJECT|OBJECT-COMPUTER|OCCURS|ODT|OF|OFF|OFFSET|OMITODOMIN|OMITTED|ON|OOM|OPEN|OPT|OPTFILE|OPTIMIZE|OPTIONAL|OR|ORDER|ORDERLY|ORGANIZATION|OTHER|OUT|OUTDD|OUTPUT|OVERFLOW|OWN|OWNER|PAC|PACKED-DECIMAL|PADDING|PAGE|PARAGRAPH|PARMCHECK|PARSE|PARTNFAIL|PASSWORD|PATH|PC|PERFORM|PFD|PGMN|PGMNAME|PIC|PICTURE|POINTER|POINTER-32|PORT|POSITION|POSITIVE|PRESERVE|PRINTER|PROCEDURE|PROCEDURES|PROCEDURE-POINTER|PROCEED|PROCESS|PROCESSING|PROGRAM|PROGRAM-ID|PRTEXIT|PRTX|PURGE|QUA|QUALIFY|QUOTE|QUOTES|RANDOM|RDATT|READ|READER|READY|RECEIVE|RECORD|RECORDING|RECORDS|RECURSIVE|REDEFINES|REEL|REFERENCE|REFERENCES|RELATIVE|RELEASE|RELOAD|REMAINDER|REMARKS|REMOTE|REMOVAL|REMOVE|RENAMES|RENT|REPLACE|REPLACING|REPORT|REPORTS|RERUN|RESERVE|RESET|RESUME|RETURN|RETURNING|REVERSED|REWIND|REWRITE|RIGHT|RMODE|ROUNDED|RULES|RUN|SAME|SAVE|SD|SEARCH|SECTION|SECURITY|SEGMENT|SEGMENT-LIMIT|SELECT|SEND|SENTENCE|SEP|SEPARATE|SEQ|SEQUENCE|SEQUENTIAL|SERV|SERVICE|SET|SHORT|SIGN|SIZE|SLACKBYTES|SLCKB|SN|SO|SORT|SORT-MERGE|SOURCE|SOURCE-COMPUTER|SPACE|SPACES|SPECIAL-NAMES|SQL|SQLC|SQLCCSID|SQLIMS|SSR|SSRANGE|STANDARD|STANDARD-1|STANDARD-2|START|STATS|STATUS|STD|STGOPT|STOP|STRICT|STRING|SUBTRACT|SUCC|SUM|SUPP|SUPPRESS|SYMBOL|SYMBOLIC|SYNC|SYNCHRONIZED|SYSLIB|TALLYING|TAPE|TABLE|TERM|TERMINAL|TERMINATE|TEST|THAN|THEN|THREAD|THROUGH|THRU|TIME|TIMER|TIMES|TO|TODAYS-DATE|TODAYS-NAME|TOP|TRACE|TRAILING|TRUE|TRUNC|TRUNCBIN|TUNE|UE|UENGLISH|UNEXPIN|UNIT|UNREF|UNSTRING|UNTIL|UP|UPON|UPPER|USAGE|USE|USING|UTF-8|VALIDATING|VALUE|VALUES|VARYING|VBREF|VIRTUAL|VLR|VOLATILE|VOLSER|VS|VSAMOPENFS|WAIT|WARNING|WD|WHEN|WHEN-COMPILED|WITH|WORD|WORDS|WORKING-STORAGE|WRITE|WRITE-ONLY|XML|XMLPARSE|XMLSS|XOPTS|XP|XREF|YEAR|YYYYDDD|YYYYMMDD|ZC|ZD|ZERO|ZEROES|ZEROS|ZLEN|ZON|ZONECHECK|ZONEDATA|ZWB|IS|INTRINSIC|REPOSITORY|EPILOG|NOCMPR2|NOTRIG|CPP|DATEPROC|DP|GDS|GRAPHIC|KA|LEASM|LIB|LIN|MARGINS|NODE|NODATEPROC|NODP|NOEPILOG|NOFLAGMIG|NOGRAPHIC|NOLIB|NOOPSEQUENCE|NOOPT|NOOPTIMIZE|NOP|NOPROLOG|NOSTDTRUNC|NSEQ|OP|OPMARGINS|OPSEQUENCE|PROLOG|RES|SZ|TRIG|YEARWINDOW|YW)(?![\\-\\w])",
+ "match": "(?<![\\-\\w])(?i:ABD|ABORT|ACCEPT|ACCESS|ADATA|ADD|AS|CBLCARD|COBOL2|COBOL3|CPSM|DLI|EDF|EXCI|FEPI|NATLANG|NOCBLCARD|NOCPSM|NODEBUG|NOEDF|NOFEPI|NOLENGTH|NOLINKAGE|NOOPTIONS|NOSPIE|OPTIONS|SP|SPIE|SYSEIB|ADDRESS|ADEXIT|ADV|ADVANCING|ADX|AFP|AFTER|ALIAS|ALL|ALPHABET|ALPHABETIC|ALPHABETIC-LOWER|ALPHABETIC-UPPER|ALPHANUMERIC|ALPHANUMERIC-EDITED|ALPHNUM|ALSO|ALTER|ALTERNATE|ANA|ANALIST|AND|ANSI|ANY|APOST|APPLY|AR|ARCH|ARE|AREA|AREAS|ARITH|ASCENDING|ASCII|ASSIGN|ASSOCIATED_DATA|ASSOCIATED_DATA_LENGTH|AT|AUTHOR|AUTO|AVG|AWO|BEFORE|BIN|BINARY|BLANK|BLOCK|BLOCK0|BOTH|BOTTOM|BUF|BUFSIZE|BY|BYFUNCTION|BYTITLE|CALL|CANCEL|CAPABLE|CBL|CCSVERSION|CHAINING|CHANGED|CHANNEL|CHARACTER|CHARACTERS|CICS|CLASS|CLEANSIGN|CLOCK-UNITS|CLOSE|CLOSE-DISPOSITION|CO|CODEPAGE|CODE-SET|COLLATING|COLS|COMMA|COMMITMENT|COMMON|COMP|COMPAT|COMPILE|COMPUTATIONAL|COMPUTATIONAL-1|COMPUTATIONAL-2|COMPUTATIONAL-3|COMPUTATIONAL-4|COMPUTATIONAL-5|COMPUTE|COMP-1|COMP-2|COMP-3|COMP-4|COMP-5|CONFIGURATION|CONTAINS|CONTENT|CONTINUE|CONTROL|CONVERTING|COPYLOC|COPYRIGHT|CORR|CORRESPONDING|COUNT|CP|CPLC|CPYR|CR|CRUNCH|CS|CURR|CURRENCY|CYCLE|DACO-CONTROL|DATA|DATE|DATE-COMPILED|DATE-WRITTEN|DAY|DAY-OF-WEEK|DB|DBCS|DEBUG|DEBUGGING|DEC|DECIMAL-POINT|DECK|DECLARATIVES|DEF|DEFAULT|DEFAULT-DISPLAY|DEFINE|DEFINITION|DELETE|DELIMITED|DELIMITER|DEPENDING|DESCENDING|DESIGNER|DFHRESP|DFHVALUE|DIAGTRUNC|DISABLE|DISK|DISPLAY|DISPLAY-1|DISPSIGN|DIVIDE|DIVISION|DLL|DN|DOWN|DS|DSN|DSNAME|DTR|DU|DUMP|DUPLICATES|DWARF|DYN|DYNAM|DYNAMIC|EBCDIC|EGCS|EGI|EJPD|ELSE|EMA|EMI|EN|ENABLE|ENCODING|END|ENDP|ENDPERIOD|END-ACCEPT|END-ADD|END-CALL|END-COMPUTE|END-DELETE|END-DIVIDE|END-EVALUATE|END-IF|END-MULTIPLY|END-OF-PAGE|END-PERFORM|END-READ|END-RECEIVE|END-RETURN|END-REWRITE|END-SEARCH|END-START|END-STRING|END-SUBTRACT|END-UNSTRING|END-WRITE|END-XML|ENGLISH|ENTRY|ENTRY-NAME|ENTRY-INTERFACE|ENVIRONMENT|EOC|EODS|EOP|EQUAL|ERROR|ESCAPE|ESI|EVALUATE|EVENP|EVENPACK|EVERY|EX|EXCEPTION|EXCLUSIVE|EXEC|EXHIBIT|EXIT|EXP|EXPORTALL|EXTEND|EXTERNAL|FALSE|FASTSRT|FD|FIELD|FILED|FILE|FILE-CONTROL|FILL|FILLER|FIND|FIRST|FLAG|FLAGSTD|FNC|FOOTING|FOR|FORCENUMCMP|FROM|FSRT|FULL|FUNCTION|FUNCTION-ID|FUNCTION-POINTER|GENERATE|GET|GIVING|GLOBAL|GO|GOBACK|GREATER|GROUP-USAGE|HEX|HGPR|HIGH-VALUE|HIGH-VALUES|IC|ID|IDENTIFICATION|IF|IMPLICIT|IN|INDEX|INDEXED|INEXIT|INFO|INITCHECK|INITIAL|INITIALIZE|INITIATE|INL|INLINE|INPUT|INPUT-OUTPUT|INSERT|INSPECT|INSTALLATION|INTDATE|INTEGER|INTO|INVALID|INVD|INVDATA|INVMPSZ|INVPARTN|INVREQ|INX|IS|I-O|I-O-CONTROL|JA|JAPANESE|JP|JUST|JUSTIFIED|KANJI|KEPT|KEY|KEYBOARD|LABEL|LANG|LANGUAGE|LAST|LAX|LAXPERF|LAXREDEF|LAYOUT|LC|LEADING|LEFT|LENGTH|LESS|LIBEXIT|LIBRARY|LIBX|LILIAN|LIMIT|LINAGE|LINAGE-COUNTER|LINE|LINECOUNT|LINES|LINKAGE|LIST|LM|LOCAL|LOCAL-STORAGE|LOCK|LONGMIXED|LONGUPPER|LOW-VALUE|LOW-VALUES|LP|LU|LXPRF|LXRDF|MAP|MAPFAIL|MATCH|MAX|MAXPCF|MD|MDECK|MEMORY|MERGE|MESSAGE|MIG|MIXED|MMDDYYYY|MODE|MODULES|MOVE|MSG|MSGEXIT|MSGX|MULTIPLE|MULTIPLY|NAME|NAMED|NAT|NATIONAL|NATIONAL-EDITED|NATIVE|NC|ND|NEGATIVE|NETWORK|NEXT|NO|NO-POS|NOADATA|NOADEXIT|NOADV|NOADX|NOALIAS|NOALPHNUM|NOAWO|NOBIN|NOBLOCK0|NOC|NOCICS|NOCLEANSIGN|NOCOMPILE|NOCOPYLOC|NOCOPYRIGHT|NOCPLC|NOCPYR|NOCS|NOCURR|NOCURRENCY|NOD|NODBCS|NODECK|NODEF|NODEFINE|NODIAGTRUNC|NODLL|NODSNAME|NODTR|NODU|NODUMP|NODWARF|NODYN|NODYNAM|NOEJPD|NOENDPERIOD|NOEVENPACK|NOEX|NOEXIT|NOEXP|NOEXPORTALL|NOF|NOFASTSRT|NOFLAG|NOFLAGSTD|NOFNC|NOFORCENUMCMP|NOFSRT|NOIC|NOINEXIT|NOINITCHECK|NOINITIAL|NOINL|NOINLINE|NOINVD|NOINVDATA|NOINX|NOLAXPERF|NOLAXREDEF|NOLIBEXIT|NOLIBX|NOLIST|NOMAP|NOMD|NOMDECK|NOMSGEXIT|NOMSGX|NONAME|NONC|NONUM|NONUMBER|NONUMCHECK|NOOBJ|NOOBJECT|NOOFF|NOOFFSET|NOOMITODOMIN|NOPAC|NOPARMCHECK|NOPC|NOPFD|NOPRESERVE|NOPRTEXIT|NOPRTX|NORENT|NORULES|NOS|NOSEP|NOSEPARATE|NOSEQ|NOSEQUENCE|NOSERV|NOSERVICE|NOSLACKBYTES|NOSO|NOSOURCE|NOSQL|NOSQLC|NOSQLCCSID|NOSQLIMS|NOSSR|NOSSRANGE|NOSTGOPT|NOSUPP|NOSUPPRESS|NOT|NOTERM|NOTERMINAL|NOTEST|NOTHREAD|NOTRUNCBIN|NOUNRA|NOUNREFALL|NOUNREFSOURCE|NOUNRS|NOVBREF|NOVOLATILE|NOWD|NOWORD|NOX|NOXREF|NOZC|NOZLEN|NOZON|NOZONECHECK|NOZWB|NS|NSYMBOL|NULL|NULLS|NUM|NUMBER|NUMCHECK|NUMERIC|NUMERIC-EDITED|NUMPROC|OBJ|OBJECT|OBJECT-COMPUTER|OCCURS|ODT|OF|OFF|OFFSET|OMITODOMIN|OMITTED|ON|OOM|OPEN|OPT|OPTFILE|OPTIMIZE|OPTIONAL|OR|ORDER|ORDERLY|ORGANIZATION|OTHER|OUT|OUTDD|OUTPUT|OVERFLOW|OWN|OWNER|PAC|PACKED-DECIMAL|PADDING|PAGE|PARAGRAPH|PARMCHECK|PARSE|PARTNFAIL|PASSWORD|PATH|PC|PERFORM|PFD|PGMN|PGMNAME|PIC|PICTURE|POINTER|POINTER-32|PORT|POSITION|POSITIVE|PRESERVE|PRINTER|PROCEDURE|PROCEDURES|PROCEDURE-POINTER|PROCEED|PROCESS|PROCESSING|PROGRAM|PROGRAM-ID|PROTOTYPE|PRTEXIT|PRTX|PURGE|QUA|QUALIFY|QUOTE|QUOTES|RANDOM|RDATT|READ|READER|READY|RECEIVE|RECORD|RECORDING|RECORDS|RECURSIVE|REDEFINES|REEL|REFERENCE|REFERENCES|RELATIVE|RELEASE|RELOAD|REMAINDER|REMARKS|REMOTE|REMOVAL|REMOVE|RENAMES|RENT|REPLACE|REPLACING|REPORT|REPORTS|RERUN|RESERVE|RESET|RESUME|RETURN|RETURNING|REVERSED|REWIND|REWRITE|RIGHT|RMODE|ROUNDED|RULES|RUN|SAME|SAVE|SD|SEARCH|SECTION|SECURITY|SEGMENT|SEGMENT-LIMIT|SELECT|SEND|SENTENCE|SEP|SEPARATE|SEQ|SEQUENCE|SEQUENTIAL|SERV|SERVICE|SET|SHORT|SIGN|SIZE|SLACKBYTES|SLCKB|SN|SO|SORT|SORT-MERGE|SOURCE|SOURCE-COMPUTER|SPACE|SPACES|SPECIAL-NAMES|SQL|SQLC|SQLCCSID|SQLIMS|SSR|SSRANGE|STANDARD|STANDARD-1|STANDARD-2|START|STATIC|STATS|STATUS|STD|STGOPT|STOP|STRICT|STRING|SUBTRACT|SUCC|SUM|SUPP|SUPPRESS|SYMBOL|SYMBOLIC|SYNC|SYNCHRONIZED|SYSLIB|TALLYING|TAPE|TABLE|TERM|TERMINAL|TERMINATE|TEST|THAN|THEN|THREAD|THROUGH|THRU|TIME|TIMER|TIMES|TO|TODAYS-DATE|TODAYS-NAME|TOP|TRACE|TRAILING|TRUE|TRUNC|TRUNCBIN|TUNE|UE|UENGLISH|UNEXPIN|UNIT|UNREF|UNSTRING|UNTIL|UP|UPON|UPPER|USAGE|USE|USING|UTF-8|VALIDATING|VALUE|VALUES|VARYING|VBREF|VIRTUAL|VLR|VOLATILE|VOLSER|VS|VSAMOPENFS|WAIT|WARNING|WD|WHEN|WHEN-COMPILED|WITH|WORD|WORDS|WORKING-STORAGE|WRITE|WRITE-ONLY|XML|XMLPARSE|XMLSS|XOPTS|XP|XREF|YEAR|YYYYDDD|YYYYMMDD|ZC|ZD|ZERO|ZEROES|ZEROS|ZLEN|ZON|ZONECHECK|ZONEDATA|ZWB|IS|INTRINSIC|REPOSITORY|EPILOG|NOCMPR2|NOTRIG|CPP|DATEPROC|DP|GDS|GRAPHIC|KA|LEASM|LIB|LIN|MARGINS|NODE|NODATEPROC|NODP|NOEPILOG|NOFLAGMIG|NOGRAPHIC|NOLIB|NOOPSEQUENCE|NOOPT|NOOPTIMIZE|NOP|NOPROLOG|NOSTDTRUNC|NSEQ|OP|OPMARGINS|OPSEQUENCE|PROLOG|RES|SZ|TRIG|YEARWINDOW|YW)(?![\\-\\w])",
  "name": "keyword.cobol"
  },
  "cobol-preprocessor-keywords": {

server/common/pom.xml

@@ -21,7 +21,7 @@
  <modelVersion>4.0.0</modelVersion>
  <artifactId>common</artifactId>
  <groupId>org.eclipse.lsp.cobol</groupId>
- <version>1.0.8</version>
+ <version>1.0.9</version>
 
  <properties>
  <maven.compiler.source>8</maven.compiler.source>

server/common/src/main/java/org/eclipse/lsp/cobol/common/model/NodeType.java

@@ -33,6 +33,7 @@ public enum NodeType {
  EXIT_SECTION,
  FILE_CONTROL_ENTRY,
  FILE_USAGE,
+ FUNCTION_REFERENCE,
  GO_BACK,
  GO_TO,
  IF,
@@ -48,8 +49,8 @@ public enum NodeType {
  PARAGRAPH,
  PARAGRAPH_NAME_NODE,
  PERFORM,
- PROCEDURE_DIVISION,
  PROCEDURE_SECTION,
+ PROCEDURE_RETURNING,
  PROGRAM,
  PROGRAM_END,
  PROGRAM_ID,

server/common/src/main/java/org/eclipse/lsp/cobol/common/model/tree/CodeBlockUsageNode.java

@@ -24,6 +24,8 @@
 import org.eclipse.lsp.cobol.common.model.NodeType;
 import org.eclipse.lsp4j.Location;
 
+import com.google.common.collect.ImmutableList;
+
 import java.util.List;
 
 /** The class represents usages of paragraphs or sections. */
@@ -33,9 +35,9 @@
 public class CodeBlockUsageNode extends Node implements DefinedAndUsedStructure {
  private final String name;
  @Setter
- private List<Location> definitions;
+ private List<Location> definitions = ImmutableList.of();
  @Setter
- private List<Location> usages;
+ private List<Location> usages = ImmutableList.of();
 
  public CodeBlockUsageNode(Locality location, String name) {
  super(location, NodeType.CODE_BLOCK_USAGE);

server/common/src/main/java/org/eclipse/lsp/cobol/common/model/tree/FunctionReference.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2024 Broadcom.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Broadcom, Inc. - initial API and implementation
+ *
+ */
+package org.eclipse.lsp.cobol.common.model.tree;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+import org.eclipse.lsp.cobol.common.model.DefinedAndUsedStructure;
+import org.eclipse.lsp.cobol.common.model.Locality;
+import org.eclipse.lsp.cobol.common.model.NodeType;
+import org.eclipse.lsp4j.Location;
+
+import com.google.common.collect.ImmutableList;
+
+@ToString(callSuper = true)
+@Getter
+@EqualsAndHashCode(callSuper = true)
+public class FunctionReference extends Node implements DefinedAndUsedStructure {
+ final String name;
+ @Setter
+ private List<Location> definitions = ImmutableList.of();
+ @Setter
+ private List<Location> usages = ImmutableList.of();
+
+ public FunctionReference(Locality locality, String name) {
+ super(locality, NodeType.FUNCTION_REFERENCE);
+ this.name = name;
+ }
+
+ @Override
+ public List<Location> getDefinitions() {
+ return definitions;
+ }
+
+ @Override
+ public List<Location> getUsages() {
+ return usages;
+ }
+}

server/common/src/main/java/org/eclipse/lsp/cobol/common/model/tree/ParagraphNameNode.java

@@ -21,16 +21,18 @@
 import org.eclipse.lsp.cobol.common.model.NodeType;
 import org.eclipse.lsp4j.Location;
 
+import com.google.common.collect.ImmutableList;
+
 import java.util.List;
 
 /** The class represents paragraphs or section name node in COBOL grammar. */
 @Getter
 public class ParagraphNameNode extends Node implements DefinedAndUsedStructure {
  private final String name;
  @Setter
- private List<Location> definitions;
+ private List<Location> definitions = ImmutableList.of();
  @Setter
- private List<Location> usages;
+ private List<Location> usages = ImmutableList.of();
 
  public ParagraphNameNode(Locality location, String paragraphName) {
  super(location, NodeType.PARAGRAPH_NAME_NODE);

server/common/src/main/java/org/eclipse/lsp/cobol/common/model/tree/ProcedureDivisionNode.java

@@ -15,13 +15,20 @@
 package org.eclipse.lsp.cobol.common.model.tree;
 
 import lombok.ToString;
+
+import java.util.Optional;
+
 import org.eclipse.lsp.cobol.common.model.Locality;
-import org.eclipse.lsp.cobol.common.model.NodeType;
+import org.eclipse.lsp.cobol.common.model.variables.DivisionType;
 
 /** The class represents procedure division in COBOL. */
 @ToString(callSuper = true)
-public class ProcedureDivisionNode extends Node {
- public ProcedureDivisionNode(Locality location) {
- super(location, NodeType.PROCEDURE_DIVISION);
+public class ProcedureDivisionNode extends DivisionNode {
+ public ProcedureDivisionNode(Locality location, Optional<Locality> clauses) {
+ super(location, DivisionType.PROCEDURE_DIVISION);
+ clausesLocation = clauses.orElse(location);
  }
+
+ public boolean hasReturningClause = false;
+ public final Locality clausesLocation;
 }

server/common/src/main/java/org/eclipse/lsp/cobol/common/model/tree/ProcedureDivisionReturningNode.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024 Broadcom.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Broadcom, Inc. - initial API and implementation
+ *
+ */
+package org.eclipse.lsp.cobol.common.model.tree;
+
+import lombok.ToString;
+import org.eclipse.lsp.cobol.common.model.Locality;
+import org.eclipse.lsp.cobol.common.model.NodeType;
+import org.eclipse.lsp.cobol.common.model.tree.variable.VariableNameAndLocality;
+
+@ToString(callSuper = true)
+public class ProcedureDivisionReturningNode extends Node {
+ public final VariableNameAndLocality variable;
+
+ public ProcedureDivisionReturningNode(Locality location, VariableNameAndLocality v) {
+ super(location, NodeType.PROCEDURE_RETURNING);
+ this.variable = v;
+ }
+}