feature/copy books configurable extensions #1479

lxpdd · 2022-07-18T10:10:03Z

No description provided.

1. Remove COBOL Copybook language id from package.json 2. Add .cpy and .copy file extensions to "cobol" language id 3. Remove "onLanguage:COBOL Copybook" activation event "COBOL Copybook" language grammar ("contributes.grammar" section in package json) "COBOL Copybook" snippets ("contributes.snippets" section in package json) "COBOL Copybook" configurationDefaults 4. Add a new setting "cobol-lsp.cpy-manager.copybook-extensions" (array or strings) with default [".CPY", ".COPY", ".cpy", ".copy"]

del SettingsService::toStrings because it breaks encapsulation and is being used as static method

…om "cobol-lsp.cpy-manager.copybook-extensions" and if it does treat it as a copybook (no analysis)

…ust (partly) injectService

…comments

cobol-lsp.copybook-resolve.ert.cbl.ABC.COBOL but also: cobol-lsp.copybook-resolve.ert.cbl.ABC.CPY.COBOL

and use an extension from server response

# Conflicts: # clients/cobol-lsp-vscode-extension/package.json # server/engine/src/main/java/org/eclipse/lsp/cobol/service/delegates/completions/CompletionStorage.java # server/engine/src/test/java/org/eclipse/lsp/cobol/service/delegates/completions/SnippetCompletionTest.java

…r client-server communication

lxpdd · 2022-07-18T11:39:59Z

☝️ please review @Nurkambay @shciubrcom @niharikasw91

clients/cobol-lsp-vscode-extension/package.json

This reverts commit 9452977.

…nalysis for didOpen/didChange triggers

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

Nurkambay · 2022-07-21T12:40:40Z

...ine/src/main/java/org/eclipse/lsp/cobol/service/delegates/completions/CompletionStorage.java

@@ -94,7 +94,7 @@ private void fillInStorage(Map<String, T> props) {
            props.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
  }

-  private void getDialectArray(List<Object> dialectObject) {
+  private void updateDialects(List<Object> dialectObject) {


…sions in config

niharikasw91 · 2022-07-22T12:26:30Z

clients/cobol-lsp-vscode-extension/package.json

+                    "default": [
+                        ".CPY",
+                        ".COPY",
+                        ".cpy",


Please look out for the (.) prefix.

niharikasw91

Following are the observations:

Autocomplete suggestion for copybook name should be unique ( xyz.cpy and xyz.COPY should be shown only once)
With (.) as prefix the extensions are not recognised
Do we need to have default .cpy in case of no extensions are defined in the extension settings?
When the extension has setting started with (.) the defauly .cpy file is picked and the file name is converted from small_case to upper case

lxpdd · 2022-07-25T11:18:39Z

@niharikasw91

Following are the observations:

Autocomplete suggestion for copybook name should be unique ( xyz.cpy and xyz.COPY should be shown only once)

With (.) as prefix the extensions are not recognised

Do we need to have default .cpy in case of no extensions are defined in the extension settings?

When the extension has setting started with (.) the defauly .cpy file is picked and the file name is converted from small_case to upper case

1 - resolved
2 - resolved, also "" as empty extension is supported now (tested for local file, and not for downloading)
3 - removed, now no extensions is supported when there isn't extension list in the config
4 - couldn't reproduce it, couldn't even test (both linux and windows environment, I couldn't see upper_case and lower_case files in VS Code at the same time, probably should be reported to VS Code team, maybe related to that issue: microsoft/vscode#94307)

# Conflicts: # server/engine/src/main/java/org/eclipse/lsp/cobol/service/CobolWorkspaceServiceImpl.java # server/engine/src/main/java/org/eclipse/lsp/cobol/service/delegates/completions/CompletionStorage.java # server/engine/src/test/java/org/eclipse/lsp/cobol/service/delegates/completions/SnippetCompletionTest.java

VitGottwald · 2022-08-12T14:28:40Z

LGTM. @ishche, @ap891843, could you, please, give it a quick look and if ok approve?

ishche · 2022-08-12T14:31:51Z

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

@@ -14,9 +14,10 @@
 */
 package org.eclipse.lsp.cobol.service.mocks;

-import com.google.common.collect.ImmutableList;
-import com.google.gson.JsonPrimitive;
+//import com.google.common.collect.ImmutableList;


Pls remove the commented code

ap891843 · 2022-08-12T15:06:28Z

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

@@ -124,7 +124,7 @@ public String readFromInputStream(InputStream inputStream, Charset charset) thro

  @Override
  public List<String> listFilesInDirectory(Path path) {
-    try (Stream<Path> streamPath = Files.list(path)) {
+    try (Stream<Path> streamPath = Files.walk(path, 2)) {


Did not undestand logic behind maxDepth to 2

lxpdd added 12 commits July 8, 2022 10:24

add SettingsService::getTextConfiguration;

42413d3

del SettingsService::toStrings because it breaks encapsulation and is being used as static method

check if the file extension matches any of the filename extensions fr…

9520432

…om "cobol-lsp.cpy-manager.copybook-extensions" and if it does treat it as a copybook (no analysis)

add copybook extensions watcher, fixed collection copybook names, adj…

9af56eb

…ust (partly) injectService

copybookNameService has new method: findByName(name)

1dffc10

inject CopybookNameService into GrammarPreprocessorListener, cleanup …

b1a5483

…comments

rework regex to match not only string:

c7a5524

cobol-lsp.copybook-resolve.ert.cbl.ABC.COBOL but also: cobol-lsp.copybook-resolve.ert.cbl.ABC.CPY.COBOL

removed constant COPYBOOK_EXT_ARRAY,

6d578ae

and use an extension from server response

rename getConfigurations -> fetchConfigurations and fixed tests

66fe360

rename getConfiguration -> fetchConfiguration part 2

44876d8

revert some minor changes, add TODO eclipse-che4z#1478 JSON format fo…

b1f4766

…r client-server communication

lxpdd changed the title ~~[WIP] Feature/copy books configurable extensions~~ feature/copy books configurable extensions Jul 18, 2022

ishche requested review from niharikasw91 and Nurkambay and removed request for niharikasw91 July 18, 2022 12:05

ishche reviewed Jul 18, 2022

View reviewed changes

clients/cobol-lsp-vscode-extension/package.json Show resolved Hide resolved

ishche requested changes Jul 18, 2022

View reviewed changes

clients/cobol-lsp-vscode-extension/package.json Outdated Show resolved Hide resolved

remove yarn dependency

7813cb5

lxpdd requested a review from ishche July 18, 2022 12:43

zeibura approved these changes Jul 18, 2022

View reviewed changes

lxpdd added 5 commits July 18, 2022 17:54

reduce direct usage of List<Object>fetchConfigurations(...)

9452977

Revert "reduce direct usage of List<Object>fetchConfigurations(...)"

cce327c

This reverts commit 9452977.

don't analyze copybooks on didChange/didOpen triggers

08d4d44

adjusted tests according to the new requirement to ignore copybooks a…

9fabbc1

…nalysis for didOpen/didChange triggers

fixed tests that used isCopybook function

c2078b2

Nurkambay reviewed Jul 21, 2022

View reviewed changes

server/engine/src/main/java/org/eclipse/lsp/cobol/service/copybooks/CopybookNameService.java Outdated Show resolved Hide resolved

Nurkambay reviewed Jul 21, 2022

View reviewed changes

server/engine/src/main/java/org/eclipse/lsp/cobol/service/copybooks/CopybookNameService.java Outdated Show resolved Hide resolved

Nurkambay reviewed Jul 21, 2022

View reviewed changes

Nurkambay approved these changes Jul 21, 2022

View reviewed changes

fix formatting by PR comments, add more tests to cover order of exten…

2dca6bb

…sions in config

niharikasw91 reviewed Jul 22, 2022

View reviewed changes

clients/cobol-lsp-vscode-extension/package.json

"default": [

".CPY",

".COPY",

".cpy",

Copy link

Contributor

niharikasw91 Jul 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please look out for the (.) prefix.

niharikasw91 requested changes Jul 22, 2022

View reviewed changes

make copybook names unique

0329974

lxpdd added 14 commits July 25, 2022 13:35

fixed broken tests with invalid test data

d39a820

[WIP] resolve copybooks according to program dialects

90acf88

[WIP]

696fddc

resolved problem with multiple dialects

e4c87b0

resolved problem with multiple dialects

ee1e427

fixed tests

d1c28c5

aftermerge cleanup

ae28fc8

cpy_extensions import for tests

cc784b2

SettingsService.getCopybookExtension() added after merge

d48b96f

SettingsService.getCopybookExtension() added after merge

fda93c1

remove copybookCommand

b4544fe

cleanup

b2c5413

cleanup todos and fixed remote copybooks issue

25557dd

ishche approved these changes Aug 12, 2022

View reviewed changes

ap891843 reviewed Aug 12, 2022

View reviewed changes

ap891843 approved these changes Aug 12, 2022

View reviewed changes

ishche merged commit f024751 into eclipse-che4z:development Aug 13, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feature/copy books configurable extensions #1479

feature/copy books configurable extensions #1479

lxpdd commented Jul 18, 2022

lxpdd commented Jul 18, 2022

Nurkambay Jul 21, 2022

niharikasw91 Jul 22, 2022

niharikasw91 left a comment

lxpdd commented Jul 25, 2022

VitGottwald commented Aug 12, 2022

ishche Aug 12, 2022

ap891843 Aug 12, 2022

feature/copy books configurable extensions #1479

feature/copy books configurable extensions #1479

Conversation

lxpdd commented Jul 18, 2022

lxpdd commented Jul 18, 2022

Nurkambay Jul 21, 2022

Choose a reason for hiding this comment

niharikasw91 Jul 22, 2022

Choose a reason for hiding this comment

niharikasw91 left a comment

Choose a reason for hiding this comment

lxpdd commented Jul 25, 2022

VitGottwald commented Aug 12, 2022

ishche Aug 12, 2022

Choose a reason for hiding this comment

ap891843 Aug 12, 2022

Choose a reason for hiding this comment