fix: unbounded occurs support added

Author: ishche

server/engine/src/main/java/org/eclipse/lsp/cobol/service/CobolLanguageServer.java

@@ -67,16 +67,16 @@ public class CobolLanguageServer implements LanguageServer {
   @Inject
   @SuppressWarnings("squid:S107")
   CobolLanguageServer(
-      TextDocumentService textService,
-      WorkspaceService workspaceService,
-      WatcherService watchingService,
-      SettingsService settingsService,
-      LocaleStore localeStore,
-      CustomThreadPoolExecutor customThreadPoolExecutor,
-      DisposableLSPStateService disposableLSPStateService,
-      CopybookNameService copybookNameService,
-      Keywords keywords,
-      MessageService messageService) {
+          TextDocumentService textService,
+          WorkspaceService workspaceService,
+          WatcherService watchingService,
+          SettingsService settingsService,
+          LocaleStore localeStore,
+          CustomThreadPoolExecutor customThreadPoolExecutor,
+          DisposableLSPStateService disposableLSPStateService,
+          CopybookNameService copybookNameService,
+          Keywords keywords,
+          MessageService messageService) {
     this.textService = textService;
     this.workspaceService = workspaceService;
     this.watchingService = watchingService;
@@ -128,7 +128,7 @@ public CompletableFuture<InitializeResult> initialize(@NonNull InitializeParams
     WorkspaceFoldersOptions workspaceFoldersOptions = new WorkspaceFoldersOptions();
     workspaceFoldersOptions.setSupported(TRUE);
     WorkspaceServerCapabilities workspaceServiceCapabilities =
-        new WorkspaceServerCapabilities(workspaceFoldersOptions);
+            new WorkspaceServerCapabilities(workspaceFoldersOptions);
     capabilities.setWorkspace(workspaceServiceCapabilities);
 
     return supplyAsync(() -> new InitializeResult(capabilities));
@@ -153,19 +153,19 @@ public void initialized(@Nullable InitializedParams params) {
 
   private void notifyConfiguredCopybookExtensions() {
     settingsService
-        .fetchTextConfiguration(CPY_EXTENSIONS.label)
-        .thenAccept(
-            config -> {
-              if (textService instanceof CobolTextDocumentService) {
-                ((CobolTextDocumentService) textService).notifyExtensionConfig(config);
-              }
-            });
+            .fetchTextConfiguration(CPY_EXTENSIONS.label)
+            .thenAccept(
+                    config -> {
+                      if (textService instanceof CobolTextDocumentService) {
+                        ((CobolTextDocumentService) textService).notifyExtensionConfig(config);
+                      }
+                    });
   }
 
   private void getLogLevelFromClient() {
     settingsService
-        .fetchConfiguration(LOGGING_LEVEL.label)
-        .thenAccept(LogLevelUtils.updateLogLevel());
+            .fetchConfiguration(LOGGING_LEVEL.label)
+            .thenAccept(LogLevelUtils.updateLogLevel());
   }
 
   private void getLocaleFromClient() {
@@ -223,7 +223,9 @@ private ExecuteCommandOptions collectExecuteCommandList() {
     return new ExecuteCommandOptions(ImmutableList.of(ErrorCodes.MISSING_COPYBOOK.getLabel()));
   }
 
-  /** Represents the JSON RPC response structure for shutdown command as per LSP specification */
+  /**
+   * Represents the JSON RPC response structure for shutdown command as per LSP specification
+   */
   @AllArgsConstructor
   private static class ShutdownResponse {
     private final String result;

server/engine/src/test/java/org/eclipse/lsp/cobol/service/CobolLanguageServerTest.java

@@ -145,7 +145,7 @@ private void prepareSettingsService(SettingsService settingsService, LocaleStore
   }
 
   @Test
-  void initializedConfig() {
+  void initializedConfig() throws ExecutionException, InterruptedException {
     SettingsService settingsService = mock(SettingsServiceImpl.class);
     WatcherService watchingService = mock(WatcherService.class);
     LocaleStore localeStore = mock(LocaleStore.class);
@@ -157,8 +157,8 @@ void initializedConfig() {
     DialectService dialectService = mock(DialectService.class);
     when(dialectService.getSettingsSections()).thenReturn(ImmutableList.of("daco"));
 
-    when(settingsService.fetchTextConfiguration(anyString()))
-        .thenReturn(CompletableFuture.supplyAsync(ImmutableList::of));
+    CompletableFuture<List<String>> completableFuture = CompletableFuture.supplyAsync(ImmutableList::of);
+    when(settingsService.fetchTextConfiguration(anyString())).thenReturn(completableFuture);
     prepareSettingsService(settingsService, localeStore);
 
     CobolLanguageServer server =
@@ -175,6 +175,7 @@ void initializedConfig() {
             messageService);
 
     server.initialized(new InitializedParams());
+    completableFuture.get();
     verify(textService, times(1)).notifyExtensionConfig(any());
   }
 

server/engine/src/test/java/org/eclipse/lsp/cobol/usecases/variables/TestUnboundedOccurs.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023 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.usecases.variables;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import org.eclipse.lsp.cobol.test.engine.UseCaseEngine;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Occurs unbounded should not cause an error.
+ */
+class TestUnboundedOccurs {
+
+  private static final String TEXT = "       IDENTIFICATION DIVISION.\n"
+          + "       PROGRAM-ID. Subscripts.\n"
+          + "       DATA DIVISION.\n"
+          + "       LINKAGE SECTION.\n"
+          + "       01 {$*tab3}.\n"
+          + "          05 {$*oc1} occurs unbounded.\n"
+          + "             10 {$*item} PIC X.";
+
+  @Test
+  void test() {
+    UseCaseEngine.runTest(TEXT, ImmutableList.of(), ImmutableMap.of());
+  }
+}

server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolParser.g4

@@ -825,7 +825,7 @@ dataJustifiedClause
    ;
 
 dataOccursClause
-   : OCCURS integerLiteral dataOccursTo? TIMES? (DEPENDING ON? qualifiedDataName)? dataOccursSort* (INDEXED BY? LOCAL? indexName+)?
+   : OCCURS (integerLiteral | UNBOUNDED) dataOccursTo? TIMES? (DEPENDING ON? qualifiedDataName)? dataOccursSort* (INDEXED BY? LOCAL? indexName+)?
    ;
 
 dataOccursTo