Merge pull request #10 from lefessan/z-2023-09-13-import-superbol-lsp

Import SuperBOL LSP

.github/workflows/workflow.yml

@@ -17,7 +17,6 @@ jobs:
         os:
           - ubuntu-latest
           - macos-latest
-          - windows-latest
         ocaml-compiler:
           - 4.13.0
         skip_test:
@@ -41,22 +40,12 @@ jobs:
 #          restore-keys: |
 #            v2-${{ runner.os }}-opam-${{ matrix.ocaml-compiler }}-
 
-      - name: Set-up OCaml on Windows
-        uses: ocaml/setup-ocaml@v2
-        if: runner.os == 'Windows'
+      - name: Use OCaml ${{ matrix.ocaml-compiler }}
+        uses: avsm/setup-ocaml@v2
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          opam-repositories: |
-            opam-repository-mingw: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset
-            default: https://github.com/ocaml/opam-repository.git
-
-      - name: Set-up OCaml on Unix
-        uses: ocaml/setup-ocaml@v2
-        if: runner.os != 'Windows'
-        with:
-          ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          opam-repositories: |
-            default: https://github.com/ocaml/opam-repository.git
+          opam-pin: false
+          opam-depext: false
 
       - name: Set git user
         run: |
@@ -67,8 +56,7 @@ jobs:
 
       - run: opam pin add . -y --no-action
 
-      - run: opam depext -y superbol-vscode-platform polka-js-stubs interop-js-stubs node-js-stubs vscode-js-stubs vscode-languageclient-js-stubs vscode-package-json vscode-json vscode-debugadapter vscode-debugprotocol
-        if: matrix.os != 'windows-latest'
+      - run: opam depext -y superbol-vscode-platform polka-js-stubs interop-js-stubs node-js-stubs vscode-js-stubs vscode-languageclient-js-stubs vscode-package-json vscode-json vscode-debugadapter vscode-debugprotocol superbol-free superbol_free_lib cobol_common cobol_parser ebcdic_lib cobol_lsp ppx_cobcflags pretty cobol_config cobol_ast cobol_indent cobol_preproc cobol_data cobol_typeck
 #        if: steps.cache-opam.outputs.cache-hit != 'true'
 
       - run: opam install -y opam/*.opam --deps-only --with-test
@@ -83,6 +71,11 @@ jobs:
 
       # Use fields.github-workflow-before-build to add something here
 
+      - run: git submodule init
+
+      - run: git submodule update
+
+
       - run: make build
 
       # Use fields.github-workflow-after-build to add something here

.gitignore

@@ -8,6 +8,7 @@
 /vscode-json
 /vscode-debugadapter
 /vscode-debugprotocol
+/superbol-free
 *~
 _build
 .merlin

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "import/gnucobol"]
+	path = import/gnucobol
+	url = https://github.com/OcamlPro/gnucobol.git
+[submodule "import/merlin"]
+	path = import/merlin
+	url = https://github.com/nberth/merlin.git

Makefile

@@ -20,7 +20,7 @@ all: build
 build:
 	./scripts/before.sh build
 	opam exec -- dune build @install
-	./scripts/copy-bin.sh superbol-vscode-platform polka-js-stubs interop-js-stubs node-js-stubs vscode-js-stubs vscode-languageclient-js-stubs vscode-package-json vscode-json vscode-debugadapter vscode-debugprotocol
+	./scripts/copy-bin.sh superbol-vscode-platform polka-js-stubs interop-js-stubs node-js-stubs vscode-js-stubs vscode-languageclient-js-stubs vscode-package-json vscode-json vscode-debugadapter vscode-debugprotocol superbol-free superbol_free_lib cobol_common cobol_parser ebcdic_lib cobol_lsp ppx_cobcflags pretty cobol_config cobol_ast cobol_indent cobol_preproc cobol_data cobol_typeck
 	./scripts/after.sh build
 
 build-deps:

Makefile.header

@@ -1,9 +1,9 @@
 PROJECT=superbol_vscode_platform
-SRCDIR=src/superbol-vscode-platform
+SRCDIR=src/vscode/superbol-vscode-platform
 
 compile:
 	opam exec -- dune build
-	cp -f _build/default/src/vscode-package-json/main.exe vscode-package-json
+	cp -f _build/default/src/vscode/vscode-package-json/main.exe vscode-package-json
 	yarn esbuild _build/default/$(SRCDIR)/$(PROJECT).bc.js \
                 --bundle \
                 --external:vscode \

drom.toml

@@ -5,7 +5,7 @@ share-version = "0.9.2"
 
 [project]
 authors = ["Fabrice Le Fessant <[email protected]>", "Emilien Lemaire <[email protected]>"]
-ci-systems = ["ubuntu-latest", "macos-latest", "windows-latest"]
+ci-systems = ["ubuntu-latest", "macos-latest"]
 copyright = "OCamlPro SAS"
 edition = "4.13.0"
 github-organization = "ocamlpro"
@@ -33,7 +33,7 @@ of the superbol-vscode-platform OCaml project
 """
 
 [project]
-skip = ["@test", "@ocamlformat", "@ocp-indent", "README.md"]
+skip = ["@test", "@ocamlformat", "@ocp-indent", "README.md", "sphinx/about.rst", "LICENSE.md"]
 
 # project-wide library dependencies (not for package-specific deps)
 [dependencies]
@@ -51,7 +51,7 @@ for-test = true
 [project]
 
 # dirs to skip while scanning for dune files
-skip-dirs = ["node_modules"]
+skip-dirs = ["node_modules" ]
 
 # dirs to scan for share/ folders (with package names)
 share-dirs = ["share"]
@@ -85,44 +85,109 @@ ATTIC
 !.vscode/launch.json
 *.vsix
 """
+github-workflow-before-build = """
+
+      - run: git submodule init
+
+      - run: git submodule update
+
+"""
+
+
+[[package]]
+dir = "src/vscode/superbol-vscode-platform"
+# edit 'src/vscode/superbol-vscode-platform/package.toml' for package-specific options
+
+[[package]]
+dir = "src/vscode/polka-js-stubs"
+# edit 'src/vscode/polka-js-stubs/package.toml' for package-specific options
+
+[[package]]
+dir = "src/vscode/interop-js-stubs"
+# edit 'src/vscode/interop-js-stubs/package.toml' for package-specific options
+
+[[package]]
+dir = "src/vscode/node-js-stubs"
+# edit 'src/vscode/node-js-stubs/package.toml' for package-specific options
+
+[[package]]
+dir = "src/vscode/vscode-js-stubs"
+# edit 'src/vscode/vscode-js-stubs/package.toml' for package-specific options
+
+[[package]]
+dir = "src/vscode/vscode-languageclient-js-stubs"
+# edit 'src/vscode/vscode-languageclient-js-stubs/package.toml' for package-specific options
 
 [[package]]
-dir = "src/superbol-vscode-platform"
-# edit 'src/superbol-vscode-platform/package.toml' for package-specific options
+dir = "src/vscode/vscode-package-json"
+# edit 'src/vscode/vscode-package-json/package.toml' for package-specific options
 
 [[package]]
-dir = "src/polka-js-stubs"
-# edit 'src/polka-js-stubs/package.toml' for package-specific options
+dir = "src/vscode/vscode-json"
+# edit 'src/vscode/vscode-json/package.toml' for package-specific options
 
 [[package]]
-dir = "src/interop-js-stubs"
-# edit 'src/interop-js-stubs/package.toml' for package-specific options
+dir = "src/vscode/vscode-debugadapter"
+# edit 'src/vscode/vscode-debugadapter/package.toml' for package-specific options
 
 [[package]]
-dir = "src/node-js-stubs"
-# edit 'src/node-js-stubs/package.toml' for package-specific options
+dir = "src/vscode/vscode-debugprotocol"
+# edit 'src/vscode/vscode-debugprotocol/package.toml' for package-specific options
+
+
 
 [[package]]
-dir = "src/vscode-js-stubs"
-# edit 'src/vscode-js-stubs/package.toml' for package-specific options
+dir = "src/lsp/superbol-free"
+# edit 'src/lsp/superbol/package.toml' for package-specific options
 
 [[package]]
-dir = "src/vscode-languageclient-js-stubs"
-# edit 'src/vscode-languageclient-js-stubs/package.toml' for package-specific options
+dir = "src/lsp/superbol_free_lib"
+# edit 'src/lsp/superbol_lib/package.toml' for package-specific options
 
 [[package]]
-dir = "src/vscode-package-json"
-# edit 'src/vscode-package-json/package.toml' for package-specific options
+dir = "src/lsp/cobol_common"
+# edit 'src/lsp/cobol_common/package.toml' for package-specific options
 
 [[package]]
-dir = "src/vscode-json"
-# edit 'src/vscode-json/package.toml' for package-specific options
+dir = "src/lsp/cobol_parser"
+# edit 'src/lsp/cobol_parser/package.toml' for package-specific options
 
 [[package]]
-dir = "src/vscode-debugadapter"
-# edit 'src/vscode-debugadapter/package.toml' for package-specific options
+dir = "src/lsp/ebcdic_lib"
+# edit 'src/lsp/ebcdic_lib/package.toml' for package-specific options
 
 [[package]]
-dir = "src/vscode-debugprotocol"
-# edit 'src/vscode-debugprotocol/package.toml' for package-specific options
+dir = "src/lsp/cobol_lsp"
+# edit 'src/lsp/cobol_lsp/package.toml' for package-specific options
 
+[[package]]
+dir = "src/lsp/ppx_cobcflags"
+# edit 'src/lsp/cobol_lsp/package.toml' for package-specific options
+
+[[package]]
+dir = "src/lsp/pretty"
+# edit 'src/lsp/cobol_lsp/package.toml' for package-specific options
+
+[[package]]
+dir = "src/lsp/cobol_config"
+# edit 'src/lsp/cobol_lsp/package.toml' for package-specific options
+
+[[package]]
+dir = "src/lsp/cobol_ast"
+# edit 'src/lsp/cobol_lsp/package.toml' for package-specific options
+
+[[package]]
+dir = "src/lsp/cobol_indent"
+# edit 'src/lsp/cobol_lsp/package.toml' for package-specific options
+
+[[package]]
+dir = "src/lsp/cobol_preproc"
+# edit 'src/lsp/cobol_lsp/package.toml' for package-specific options
+
+[[package]]
+dir = "src/lsp/cobol_data"
+# edit 'src/lsp/cobol_lsp/package.toml' for package-specific options
+
+[[package]]
+dir = "src/lsp/cobol_typeck"
+# edit 'src/lsp/cobol_lsp/package.toml' for package-specific options