diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000..5aaba19b
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,91 @@
+on:
+ workflow_call:
+ inputs:
+ workspace:
+ required: true
+ type: string
+ description: "yarn workspace name"
+ command:
+ required: true
+ type: string
+ description: "yarn command to run"
+ workflow_dispatch:
+ inputs:
+ workspace:
+ required: true
+ type: string
+ description: "yarn workspace name"
+ command:
+ required: true
+ type: string
+ description: "yarn command to run"
+
+jobs:
+ build:
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - os: windows-latest
+ target: x86_64-pc-windows-msvc
+ code-target: win32-x64
+ - os: windows-latest
+ target: i686-pc-windows-msvc
+ - os: windows-latest
+ target: aarch64-pc-windows-msvc
+ code-target: win32-arm64
+ - os: ubuntu-20.04
+ target: x86_64-unknown-linux-gnu
+ code-target: linux-x64
+ #container: ubuntu:18.04
+ #- os: ubuntu-20.04
+ # target: aarch64-unknown-linux-gnu
+ # code-target: linux-arm64
+ #- os: ubuntu-20.04
+ # target: arm-unknown-linux-gnueabihf
+ # code-target: linux-armhf
+ - os: macos-11
+ target: x86_64-apple-darwin
+ code-target: darwin-x64
+ - os: macos-11
+ target: aarch64-apple-darwin
+ code-target: darwin-arm64
+ runs-on: ${{ matrix.os }}
+ #container: ${{ matrix.container }}
+
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/setup-node@v3
+
+ - name: Setup yarn
+ id: setup-yarn
+ run: |
+ corepack enable
+ corepack prepare yarn@stable --activate
+ yarn set version stable
+ yarn -v
+
+ - name: Setup rust
+ uses: actions-rs/toolchain@v1
+ with:
+ toolchain: stable
+ target: ${{ matrix.target }}
+ override: true
+
+ - name: Get yarn cache directory path
+ id: yarn-cache-dir-path
+ run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+ - uses: actions/cache@v3
+ id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+ with:
+ path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+ key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+ restore-keys: |
+ ${{ runner.os }}-yarn-
+ - run: yarn install --frozen-lockfile
+ if: steps.yarn-cache.outputs.cache-hit != 'true'
+
+ - run: yarn workspace ${{ inputs.workspace }} run ${{ inputs.command }}
+ env:
+ CARGO_BUILD_TARGET: ${{ matrix.target }}
+
\ No newline at end of file
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 938c9ac2..9fd553ad 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -30,6 +30,7 @@ jobs:
publish-libraries:
if : ${{ needs.setup.outputs.libraries != '[]' }}
runs-on: ubuntu-latest
+ continue-on-error: true
needs: setup
strategy:
fail-fast: false
@@ -53,7 +54,6 @@ jobs:
- name: Install dependencies
run: |
yarn install --immutable
- cargo install wasm-pack
- name: Build
run: |
@@ -64,20 +64,20 @@ jobs:
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
- publish:
+ compute-version:
if : ${{ needs.setup.outputs.extensions != '[]' }}
- runs-on: ubuntu-latest
- needs:
- - setup
- - publish-libraries
strategy:
fail-fast: false
matrix:
workspace: ${{ fromJson(needs.setup.outputs.extensions)}}
+ runs-on: ubuntu-latest
+ needs:
+ - setup
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
+
- uses: actions/setup-node@v3
with:
node-version: '18.16.1'
@@ -142,7 +142,6 @@ jobs:
script: |
const fs = require('fs')
console.log("Change type is : ", "${{ steps.find-new-version.outputs.version_type}}")
-
if (fs.existsSync('.unstable') && "${{ steps.find-new-version.outputs.version_type}}" == "patch") {
const patch = parseInt('${{steps.find-new-version.outputs.patch}}', 10);
return "${{steps.find-new-version.outputs.major}}.${{steps.find-new-version.outputs.minor}}." + (patch + 1).toString();
@@ -151,40 +150,62 @@ jobs:
- name: Set tag
run: |
- git tag "${{ matrix.workspace.name }}-${{ steps.tag.outputs.result }}"
- git push origin "${{ matrix.workspace.name }}-${{ steps.tag.outputs.result }}"
-
+ git tag "${{ steps.get-tag-prefix.outputs.result }}-${{ steps.tag.outputs.result }}"
+ git push origin "${{ steps.get-tag-prefix.outputs.result }}-${{ steps.tag.outputs.result }}"
+
+ publish-core:
+ if: ${{ needs.setup.outputs.extensions != '[]' }}
+ needs:
+ - setup
+ - publish-libraries
+ - compute-version
+ strategy:
+ fail-fast: false
+ matrix:
+ workspace: ${{ fromJson(needs.setup.outputs.extensions)}}
+ runs-on: ubuntu-latest
+ continue-on-error: true
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ - uses: actions/setup-node@v3
+ with:
+ node-version: '18.16.1'
+
+ - id: setup-yarn
+ # Install yarn 3 & workspace-tools
+ run: |
+ corepack enable
+ corepack prepare yarn@stable --activate
+ yarn -v
+
- name: Install dependencies
run: |
yarn install --immutable
- cargo install wasm-pack
- name: Build
run: |
- yarn workspace ${{ matrix.workspace.name }} build
+ yarn workspace ${{ matrix.workspace.name }} core:build
- name: Publish
- run: yarn workspace ${{ matrix.workspace.name }} run publish ${{ github.ref_name == 'dev' && '--pre-release' || '' }} ${{ steps.tag.outputs.result }}
+ run: yarn workspace ${{ matrix.workspace.name }} run core:publish
env:
- VSCE_PAT: ${{ secrets.VSCE_PAT }}
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
-
- #- name: Run latest-tag
- # uses: EndBug/latest-tag@latest
- # with:
- # # You can change the name of the tag or branch with this input.
- # # Default: 'latest'
- # ref: ${{ steps.tag.outputs.result }}
- #
- # # If a description is provided, the action will use it to create an annotated tag. If none is given, the action will create a lightweight tag.
- # # Default: ''
- # description: Description for the tag
-
- # - name: Create GitHub release
- # uses: Roang-zero1/github-create-release-action@v3
- # with:
- # created_tag: ${{ steps.find-new-version.outputs.version_tag }}
- # release_title: ${{ steps.find-new-version.outputs.version_tag }}
- # env:
- # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ publish-extensions:
+ if : ${{ needs.setup.outputs.extensions != '[]' }}
+ needs:
+ - setup
+ - publish-libraries
+ - compute-version
+ strategy:
+ fail-fast: false
+ matrix:
+ workspace: ${{ fromJson(needs.setup.outputs.extensions)}}
+ uses: ./.github/workflows/publish-extension.yml
+ with:
+ workspace: ${{ matrix.workspace.name }}
+ secrets:
+ CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+ VSCE_PAT: ${{ secrets.VSCE_PAT }}
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 197954f6..f9b241c3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -103,68 +103,24 @@ jobs:
- run: yarn workspace ${{ matrix.workspace.name }} run format
build:
- runs-on: ubuntu-latest
needs: flatten-deps
strategy:
fail-fast: false
matrix:
workspace: ${{ fromJson(needs.flatten-deps.outputs.dependencies) }}
- steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-node@v3
-
- - name: Setup yarn
- id: setup-yarn
- run: |
- corepack enable
- corepack prepare yarn@stable --activate
-
- - name: install
- run: cargo install wasm-pack
-
- - name: Get yarn cache directory path
- id: yarn-cache-dir-path
- run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
- - uses: actions/cache@v3
- id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
- with:
- path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
- key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
- restore-keys: |
- ${{ runner.os }}-yarn-
- - run: yarn install --frozen-lockfile
- if: steps.yarn-cache.outputs.cache-hit != 'true'
-
- - run: yarn workspace ${{ matrix.workspace.name }} run build
+ uses: ./.github/workflows/build.yml
+ with:
+ workspace: ${{ matrix.workspace.name }}
+ command: build
+
test:
- runs-on: ubuntu-latest
needs: flatten-deps
strategy:
fail-fast: false
matrix:
workspace: ${{ fromJson(needs.flatten-deps.outputs.dependencies) }}
- steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-node@v3
-
- - name: Setup yarn
- id: setup-yarn
- run: |
- corepack enable
- corepack prepare yarn@stable --activate
-
- - name: Get yarn cache directory path
- id: yarn-cache-dir-path
- run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
- - uses: actions/cache@v3
- id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
- with:
- path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
- key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
- restore-keys: |
- ${{ runner.os }}-yarn-
- - run: yarn install --frozen-lockfile
- if: steps.yarn-cache.outputs.cache-hit != 'true'
-
- - run: yarn workspace ${{ matrix.workspace.name }} run test
\ No newline at end of file
+ uses: ./.github/workflows/test.yml
+ with:
+ workspace: ${{ matrix.workspace.name }}
+ command: test
\ No newline at end of file
diff --git a/.github/workflows/publish-extension.yml b/.github/workflows/publish-extension.yml
new file mode 100644
index 00000000..f686961c
--- /dev/null
+++ b/.github/workflows/publish-extension.yml
@@ -0,0 +1,121 @@
+on:
+ workflow_call:
+ inputs:
+ workspace:
+ required: true
+ type: string
+ description: "yarn workspace name"
+ secrets:
+ CARGO_REGISTRY_TOKEN:
+ required: true
+ VSCE_PAT:
+ required: true
+ workflow_dispatch:
+ inputs:
+ workspace:
+ required: true
+ type: string
+ description: "yarn workspace name"
+
+jobs:
+ build:
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - os: windows-latest
+ target: x86_64-pc-windows-msvc
+ code-target: win32-x64
+ - os: windows-latest
+ target: i686-pc-windows-msvc
+ code-target: win32-ia32
+ - os: windows-latest
+ target: aarch64-pc-windows-msvc
+ code-target: win32-arm64
+ - os: ubuntu-20.04
+ target: x86_64-unknown-linux-gnu
+ code-target: linux-x64
+ #container: ubuntu:18.04
+ #- os: ubuntu-20.04
+ # target: aarch64-unknown-linux-gnu
+ # code-target: linux-arm64
+ #- os: ubuntu-20.04
+ # target: arm-unknown-linux-gnueabihf
+ # code-target: linux-armhf
+ - os: macos-11
+ target: x86_64-apple-darwin
+ code-target: darwin-x64
+ - os: macos-11
+ target: aarch64-apple-darwin
+ code-target: darwin-arm64
+ runs-on: ${{ matrix.os }}
+ #container: ${{ matrix.container }}
+
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ fetch-tags: true
+
+ - name: Get tags
+ run: git fetch --tags origin
+
+ - uses: actions/setup-node@v3
+ with:
+ node-version: '18.16.1'
+
+ - id: setup-yarn
+ # Install yarn 3 & workspace-tools
+ run: |
+ corepack enable
+ corepack prepare yarn@stable --activate
+ yarn -v
+
+ - name: Setup rust
+ uses: actions-rs/toolchain@v1
+ with:
+ toolchain: stable
+ target: ${{ matrix.target }}
+ override: true
+
+ - name: Get tag prefix
+ id: get-tag-prefix
+ uses: actions/github-script@v6
+ with:
+ result-encoding: string
+ script: |
+ const workspace = "${{ inputs.workspace }}";
+ const language = workspace.split('-')[1];
+ return language;
+
+ - name: Retrieve version
+ id: retrieve-version
+ uses: "WyriHaximus/github-action-get-previous-tag@v1"
+ with:
+ prefix: "${{ steps.get-tag-prefix.outputs.result }}-"
+
+ - name: Extract semver
+ uses: actions/github-script@v6
+ id: tag
+ with:
+ result-encoding: string
+ script: |
+ const tag = '${{ steps.retrieve-version.outputs.tag }}';
+ const semver = tag.split('-')[1];
+ return semver;
+ - name: Install dependencies
+ run: |
+ yarn install --immutable
+
+ - name: Build
+ run: |
+ yarn workspace ${{ inputs.workspace }} build
+ env:
+ CARGO_BUILD_TARGET: ${{ matrix.target }}
+
+ - name: Publish
+ run: yarn workspace ${{ inputs.workspace }} run extension:publish ${{ github.ref_name == 'dev' && '--pre-release' || '' }} ${{ steps.tag.outputs.result }} --target ${{matrix.code-target}}
+ env:
+ VSCE_PAT: ${{ secrets.VSCE_PAT }}
+ CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 00000000..52c8b2ec
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,90 @@
+on:
+ workflow_call:
+ inputs:
+ workspace:
+ required: true
+ type: string
+ description: "yarn workspace name"
+ command:
+ required: true
+ type: string
+ description: "yarn command to run"
+ workflow_dispatch:
+ inputs:
+ workspace:
+ required: true
+ type: string
+ description: "yarn workspace name"
+ command:
+ required: true
+ type: string
+ description: "yarn command to run"
+
+jobs:
+ build:
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - os: windows-latest
+ target: x86_64-pc-windows-msvc
+ code-target: win32-x64
+ - os: windows-latest
+ target: i686-pc-windows-msvc
+ #- os: windows-latest
+ # target: aarch64-pc-windows-msvc
+ # code-target: win32-arm64
+ - os: ubuntu-20.04
+ target: x86_64-unknown-linux-gnu
+ code-target: linux-x64
+ #container: ubuntu:18.04
+ #- os: ubuntu-20.04
+ # target: aarch64-unknown-linux-gnu
+ # code-target: linux-arm64
+ #- os: ubuntu-20.04
+ # target: arm-unknown-linux-gnueabihf
+ # code-target: linux-armhf
+ - os: macos-11
+ target: x86_64-apple-darwin
+ code-target: darwin-x64
+ #- os: macos-11
+ # target: aarch64-apple-darwin
+ # code-target: darwin-arm64
+ runs-on: ${{ matrix.os }}
+ #container: ${{ matrix.container }}
+
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/setup-node@v3
+
+ - name: Setup yarn
+ id: setup-yarn
+ run: |
+ corepack enable
+ corepack prepare yarn@stable --activate
+ yarn set version stable
+ yarn -v
+
+ - name: Setup rust
+ uses: actions-rs/toolchain@v1
+ with:
+ toolchain: stable
+ target: ${{ matrix.target }}
+ override: true
+
+ - name: Get yarn cache directory path
+ id: yarn-cache-dir-path
+ run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+ - uses: actions/cache@v3
+ id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+ with:
+ path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+ key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+ restore-keys: |
+ ${{ runner.os }}-yarn-
+ - run: yarn install --frozen-lockfile
+ if: steps.yarn-cache.outputs.cache-hit != 'true'
+
+ - run: yarn workspace ${{ inputs.workspace }} run ${{ inputs.command }}
+ env:
+ CARGO_BUILD_TARGET: ${{ matrix.target }}
\ No newline at end of file
diff --git a/libs/lsp-server-wrapper/Cargo.toml b/libs/lsp-server-wrapper/Cargo.toml
index 3a3c52eb..1e31054a 100644
--- a/libs/lsp-server-wrapper/Cargo.toml
+++ b/libs/lsp-server-wrapper/Cargo.toml
@@ -1,5 +1,6 @@
[package]
-name = "lsp-server-wrapper"
+name = "osmium-libs-lsp-server-wrapper"
+description = "A wrapper around the LSP server crate with a tower-lsp like API"
license = "GPL-3.0-or-later"
version = "0.1.0"
edition = "2021"
diff --git a/libs/lsp-server-wrapper/LICENSE.txt b/libs/lsp-server-wrapper/LICENSE.txt
new file mode 100644
index 00000000..5dc6b429
--- /dev/null
+++ b/libs/lsp-server-wrapper/LICENSE.txt
@@ -0,0 +1,675 @@
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ {project} Copyright (C) {year} {fullname}
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+.
diff --git a/libs/lsp-server-wrapper/package.json b/libs/lsp-server-wrapper/package.json
index ab9edb4e..faf7a687 100644
--- a/libs/lsp-server-wrapper/package.json
+++ b/libs/lsp-server-wrapper/package.json
@@ -4,6 +4,7 @@
"build": "cargo build --release",
"format": "cargo fmt --check --all",
"test": "cargo test",
- "lint": "cargo clippy --all-targets --all-features -- -D warnings"
+ "lint": "cargo clippy --all-targets --all-features -- -D warnings",
+ "publish": "cargo package && cargo publish"
}
}
diff --git a/toolchains/solidity/core/Cargo.lock b/toolchains/solidity/core/Cargo.lock
index cfe81d74..481a071b 100644
--- a/toolchains/solidity/core/Cargo.lock
+++ b/toolchains/solidity/core/Cargo.lock
@@ -77,12 +77,6 @@ version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
-[[package]]
-name = "bumpalo"
-version = "3.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
-
[[package]]
name = "cfg-if"
version = "1.0.0"
@@ -146,6 +140,25 @@ dependencies = [
"windows-sys",
]
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
+dependencies = [
+ "cfg-if",
+]
+
[[package]]
name = "errno"
version = "0.3.5"
@@ -156,16 +169,6 @@ dependencies = [
"windows-sys",
]
-[[package]]
-name = "extension"
-version = "0.1.0"
-dependencies = [
- "js-sys",
- "linter-server",
- "osmium-libs-lsp-handler",
- "wasm-bindgen",
-]
-
[[package]]
name = "form_urlencoded"
version = "1.2.0"
@@ -220,15 +223,6 @@ version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
-[[package]]
-name = "js-sys"
-version = "0.3.65"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
-dependencies = [
- "wasm-bindgen",
-]
-
[[package]]
name = "lazy_static"
version = "1.4.0"
@@ -243,10 +237,9 @@ checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
[[package]]
name = "linter-server"
-version = "0.1.2"
+version = "0.2.0"
dependencies = [
- "js-sys",
- "osmium-libs-lsp-handler",
+ "osmium-libs-lsp-server-wrapper",
"solidhunter-lib",
]
@@ -262,6 +255,18 @@ version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+[[package]]
+name = "lsp-server"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b52dccdf3302eefab8c8a1273047f0a3c3dca4b527c8458d00c09484c8371928"
+dependencies = [
+ "crossbeam-channel",
+ "log",
+ "serde",
+ "serde_json",
+]
+
[[package]]
name = "lsp-types"
version = "0.94.1"
@@ -288,17 +293,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]]
-name = "osmium-libs-lsp-handler"
-version = "0.0.3"
+name = "osmium-libs-lsp-server-wrapper"
+version = "0.1.0"
dependencies = [
- "js-sys",
+ "lsp-server",
"lsp-types",
"serde",
- "serde-wasm-bindgen",
"serde_json",
"tracing",
- "wasm-bindgen",
- "wasm-bindgen-futures",
]
[[package]]
@@ -398,29 +400,18 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
[[package]]
name = "serde"
-version = "1.0.190"
+version = "1.0.193"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
dependencies = [
"serde_derive",
]
-[[package]]
-name = "serde-wasm-bindgen"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ba92964781421b6cef36bf0d7da26d201e96d84e1b10e7ae6ed416e516906d"
-dependencies = [
- "js-sys",
- "serde",
- "wasm-bindgen",
-]
-
[[package]]
name = "serde_derive"
-version = "1.0.190"
+version = "1.0.193"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
dependencies = [
"proc-macro2",
"quote",
@@ -609,82 +600,6 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.88"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.88"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.88"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.88"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.88"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
-
-[[package]]
-name = "web-sys"
-version = "0.3.65"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
[[package]]
name = "windows-sys"
version = "0.48.0"
diff --git a/toolchains/solidity/core/crates/extension/Cargo.toml b/toolchains/solidity/core/crates/extension/Cargo.toml
deleted file mode 100644
index fd209f81..00000000
--- a/toolchains/solidity/core/crates/extension/Cargo.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[package]
-name = "extension"
-version = "0.1.0"
-license = "GPL-3.0-or-later"
-edition = "2021"
-
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-wasm-bindgen = "0.2.87"
-osmium-libs-lsp-handler = { path = "../../../../../libs/lsp-handler", version = "0.0.3" }
-linter-server = { path= "../linter-server"}
-js-sys = "0.3.64"
\ No newline at end of file
diff --git a/toolchains/solidity/core/crates/extension/Makefile b/toolchains/solidity/core/crates/extension/Makefile
deleted file mode 100644
index 2d6c7ff0..00000000
--- a/toolchains/solidity/core/crates/extension/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-build:
- wasm-pack build --target nodejs --dev --out-dir ../../../extension/dist
\ No newline at end of file
diff --git a/toolchains/solidity/core/crates/extension/src/lib.rs b/toolchains/solidity/core/crates/extension/src/lib.rs
deleted file mode 100644
index f41ca686..00000000
--- a/toolchains/solidity/core/crates/extension/src/lib.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use linter_server::create_linter;
-use osmium_libs_lsp_handler::{Connection, Dispatcher};
-use wasm_bindgen::prelude::*;
-
-#[wasm_bindgen]
-pub fn create_extension(
- send_request: js_sys::Function,
- send_notification: js_sys::Function,
-) -> Dispatcher {
- let creators = vec![create_linter];
-
- let connection = Connection::new(send_request, send_notification);
- let mut dispatcher = Dispatcher::new(connection);
- dispatcher.setup(creators);
- dispatcher
-}
diff --git a/toolchains/solidity/core/crates/linter-server/Cargo.toml b/toolchains/solidity/core/crates/linter-server/Cargo.toml
index 91e79196..ce4305b0 100644
--- a/toolchains/solidity/core/crates/linter-server/Cargo.toml
+++ b/toolchains/solidity/core/crates/linter-server/Cargo.toml
@@ -1,15 +1,11 @@
[package]
name = "linter-server"
license = "GPL-3.0-or-later"
-version = "0.1.2"
+version = "0.2.0"
edition = "2021"
-[lib]
-crate-type = ["cdylib", "rlib"]
-
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-osmium-libs-lsp-handler = { path = "../../../../../libs/lsp-handler", version = "0.0.3" }
-solidhunter-lib = { path = "../linter-lib", version = "0.2.0" }
-js-sys = "0.3.64"
\ No newline at end of file
+osmium-libs-lsp-server-wrapper = { path = "../../../../../libs/lsp-server-wrapper", version = "0.1.0" }
+solidhunter-lib = { path = "../linter-lib", version = "0.2.0" }
\ No newline at end of file
diff --git a/toolchains/solidity/core/crates/linter-server/src/lib.rs b/toolchains/solidity/core/crates/linter-server/src/lib.rs
deleted file mode 100644
index 9adf3568..00000000
--- a/toolchains/solidity/core/crates/linter-server/src/lib.rs
+++ /dev/null
@@ -1,181 +0,0 @@
-use std::cell::RefCell;
-
-use osmium_libs_lsp_handler::{
- lsp_types::{
- Diagnostic, DiagnosticSeverity, DidChangeTextDocumentParams, DidChangeWatchedFilesParams,
- DidOpenTextDocumentParams, InitializeParams, InitializeResult, InitializedParams,
- MessageType, Position, Range, ServerCapabilities, TextDocumentSyncCapability,
- TextDocumentSyncKind, Url,
- },
- Connection, Handler, Result,
-};
-use solidhunter_lib::{linter::SolidLinter, types::LintDiag};
-
-struct Backend {
- connection: Connection,
- config_file_path: String,
- linter: RefCell>,
-}
-
-impl Handler for Backend {
- fn initialize(&self, _: InitializeParams) -> Result {
- eprintln!("starting example main loop");
- Ok(InitializeResult {
- server_info: None,
- capabilities: ServerCapabilities {
- text_document_sync: Some(TextDocumentSyncCapability::Kind(
- TextDocumentSyncKind::FULL,
- )),
- ..ServerCapabilities::default()
- },
- })
- }
-
- fn initialized(&self, _: InitializedParams) {
- eprintln!(
- "Initializing server with config file: {:?}",
- self.config_file_path
- );
- self.connection
- .log_message(MessageType::INFO, "Server initialized!");
-
- if std::path::Path::new(&self.config_file_path).is_file() {
- let mut linter = SolidLinter::new();
- let res = linter.initialize_rules(&self.config_file_path);
- if let Err(e) = res {
- eprintln!("Error initializing rules: {:?}", e);
- self.linter
- .borrow_mut()
- .replace(SolidLinter::new_fileless());
- return;
- }
- self.linter.replace(Some(linter));
- } else {
- self.linter
- .borrow_mut()
- .replace(SolidLinter::new_fileless());
- }
-
- self.connection
- .log_message(MessageType::INFO, "Linter initialized!");
- }
-
- fn shutdown(&self) -> Result<()> {
- self.connection
- .log_message(MessageType::INFO, "Server shutdown!");
- Ok(())
- }
-
- fn did_open(&self, params: DidOpenTextDocumentParams) {
- self.connection.log_message(
- MessageType::INFO,
- format!("file opened!: {:}", params.text_document.uri),
- );
-
- let filepath = filepath_from_uri(¶ms.text_document.uri);
- let mut linter = self.linter.borrow_mut();
- let linter = match linter.as_mut() {
- Some(l) => l,
- None => {
- eprintln!("Linter cannot be ran due to previous errors");
- return;
- }
- };
- let diags_res = linter.parse_content(&filepath, ¶ms.text_document.text);
-
- if let Ok(diags) = diags_res {
- let diags = diags
- .diags
- .iter()
- .map(|d| diagnostic_from_lintdiag(d.clone()))
- .collect();
- eprintln!("diags: {:#?}", diags);
- self.connection
- .publish_diagnostics(params.text_document.uri.clone(), diags, None);
- } else if let Err(e) = diags_res {
- self.connection
- .log_message(MessageType::ERROR, e.to_string());
- }
- }
-
- fn did_change(&self, params: DidChangeTextDocumentParams) {
- self.connection.log_message(
- MessageType::INFO,
- format!("file changed!: {:}", params.text_document.uri),
- );
-
- let filepath = filepath_from_uri(¶ms.text_document.uri);
- let mut linter = self.linter.borrow_mut();
- let linter = match linter.as_mut() {
- Some(l) => l,
- None => {
- eprintln!("Linter cannot be ran due to previous errors");
- return;
- }
- };
- let diags_res = linter.parse_content(&filepath, ¶ms.content_changes[0].text);
-
- if let Ok(diags) = diags_res {
- let diags = diags
- .diags
- .iter()
- .map(|d| diagnostic_from_lintdiag(d.clone()))
- .collect();
- eprintln!("diags: {:#?}", diags);
- self.connection
- .publish_diagnostics(params.text_document.uri.clone(), diags, None);
- } else if let Err(e) = diags_res {
- self.connection
- .log_message(MessageType::ERROR, e.to_string());
- }
- }
-
- fn did_change_watched_files(&self, _: DidChangeWatchedFilesParams) {
- self.connection
- .log_message(MessageType::INFO, "configuration file changed!");
-
- if std::path::Path::new(&self.config_file_path).is_file() {
- let mut linter = SolidLinter::new();
- let res = linter.initialize_rules(&self.config_file_path);
- if res.is_ok() {
- self.linter.replace(Some(linter));
- }
- }
- }
-}
-
-pub fn filepath_from_uri(uri: &Url) -> String {
- let path = uri.path();
- path.to_string()
-}
-
-fn diagnostic_from_lintdiag(diag: LintDiag) -> Diagnostic {
- Diagnostic {
- range: Range {
- start: Position {
- line: diag.range.start.line as u32 - 1,
- character: diag.range.start.character as u32,
- },
- end: Position {
- line: diag.range.end.line as u32 - 1,
- character: diag.range.end.character as u32,
- },
- },
- severity: Some(DiagnosticSeverity::WARNING),
- code: None,
- code_description: None,
- source: Some("osmium-solidity-linter".to_string()),
- message: diag.message,
- related_information: None,
- tags: None,
- data: None,
- }
-}
-
-pub fn create_linter(connection: Connection) -> Box {
- Box::new(Backend {
- connection,
- config_file_path: ".solidhunter.json".to_string(),
- linter: RefCell::new(None),
- })
-}
diff --git a/toolchains/solidity/core/crates/linter-server/src/main.rs b/toolchains/solidity/core/crates/linter-server/src/main.rs
new file mode 100644
index 00000000..28f0932b
--- /dev/null
+++ b/toolchains/solidity/core/crates/linter-server/src/main.rs
@@ -0,0 +1,141 @@
+use osmium_libs_lsp_server_wrapper::{
+ lsp_types::*, Client, LanguageServer, LspStdioServer, Result,
+};
+use solidhunter_lib::{linter::SolidLinter, types::LintDiag};
+use std::{cell::RefCell, rc::Rc};
+
+struct Backend {
+ connection: Rc>,
+ linter: RefCell>,
+}
+
+impl LanguageServer for Backend {
+ fn initialize(&self, _: InitializeParams) -> Result {
+ eprintln!("starting example main loop");
+ Ok(InitializeResult {
+ server_info: None,
+ capabilities: ServerCapabilities {
+ text_document_sync: Some(TextDocumentSyncCapability::Kind(
+ TextDocumentSyncKind::FULL,
+ )),
+ ..ServerCapabilities::default()
+ },
+ })
+ }
+
+ fn initialized(&self, _: InitializedParams) {
+ self.connection
+ .borrow_mut()
+ .log_message(MessageType::INFO, "Server initialized!");
+
+ self.linter
+ .borrow_mut()
+ .replace(SolidLinter::new_fileless());
+
+ self.connection
+ .borrow_mut()
+ .log_message(MessageType::INFO, "Linter initialized!");
+ }
+
+ fn shutdown(&self) -> Result<()> {
+ self.connection
+ .borrow_mut()
+ .log_message(MessageType::INFO, "Server shutdown!");
+ Ok(())
+ }
+
+ fn did_open(&self, params: DidOpenTextDocumentParams) {
+ self.connection.borrow_mut().log_message(
+ MessageType::INFO,
+ format!("file opened!: {:}", params.text_document.uri),
+ );
+
+ self.lint(params.text_document.uri, params.text_document.text);
+ }
+
+ fn did_change(&self, params: DidChangeTextDocumentParams) {
+ self.connection.borrow_mut().log_message(
+ MessageType::INFO,
+ format!("file changed!: {:}", params.text_document.uri),
+ );
+
+ self.lint(
+ params.text_document.uri,
+ params.content_changes[0].text.clone(),
+ );
+ }
+}
+
+impl Backend {
+ pub fn new(connection: Rc>) -> Self {
+ Self {
+ connection,
+ linter: RefCell::new(None),
+ }
+ }
+
+ pub fn lint(&self, uri: Url, text: String) {
+ let filepath = filepath_from_uri(&uri);
+ let mut linter = self.linter.borrow_mut();
+ let linter = match linter.as_mut() {
+ Some(l) => l,
+ None => {
+ eprintln!("Linter cannot be ran due to previous errors");
+ return;
+ }
+ };
+ let diags_res = linter.parse_content(&filepath, &text);
+
+ if let Ok(diags) = diags_res {
+ let diags = diags
+ .diags
+ .iter()
+ .map(|d| diagnostic_from_lintdiag(d.clone()))
+ .collect();
+ eprintln!("diags: {:#?}", diags);
+ self.connection
+ .borrow_mut()
+ .publish_diagnostics(uri.clone(), diags, None);
+ } else if let Err(e) = diags_res {
+ self.connection
+ .borrow_mut()
+ .log_message(MessageType::ERROR, e.to_string());
+ }
+ }
+}
+
+pub fn filepath_from_uri(uri: &Url) -> String {
+ let path = uri.path();
+ path.to_string()
+}
+
+fn diagnostic_from_lintdiag(diag: LintDiag) -> Diagnostic {
+ Diagnostic {
+ range: Range {
+ start: Position {
+ line: diag.range.start.line as u32 - 1,
+ character: diag.range.start.character as u32,
+ },
+ end: Position {
+ line: diag.range.end.line as u32 - 1,
+ character: diag.range.end.character as u32,
+ },
+ },
+ severity: Some(DiagnosticSeverity::WARNING),
+ code: None,
+ code_description: None,
+ source: Some("osmium-solidity-linter".to_string()),
+ message: diag.message,
+ related_information: None,
+ tags: None,
+ data: None,
+ }
+}
+
+fn main() -> std::result::Result<(), usize> {
+ let server = LspStdioServer::new();
+ LspStdioServer::serve(server, Backend::new).map_err(|err| {
+ eprintln!("Error: {:?}", err);
+ 1
+ })
+}
diff --git a/toolchains/solidity/core/package.json b/toolchains/solidity/core/package.json
index 8f4c0931..d9dc450b 100644
--- a/toolchains/solidity/core/package.json
+++ b/toolchains/solidity/core/package.json
@@ -3,7 +3,7 @@
"version": "0.0.2",
"license": "MIT",
"scripts": {
- "core:build": "cd crates/extension && make && cd ../..",
+ "core:build": "cargo build --workspace --release && node scripts/copy-core.js",
"core:lint": "cargo clippy -- -D warnings",
"core:format": "cargo fmt --check --all",
"core:test": "cargo test --workspace",
diff --git a/toolchains/solidity/core/scripts/copy-core.js b/toolchains/solidity/core/scripts/copy-core.js
new file mode 100644
index 00000000..386df391
--- /dev/null
+++ b/toolchains/solidity/core/scripts/copy-core.js
@@ -0,0 +1,30 @@
+const fs = require('fs');
+
+const targetFolder = 'target';
+const outputFolder = __dirname + '/../../extension/dist';
+
+fs.readdir('target', { withFileTypes: true }, (err, dirs) => {
+ if (err) {
+ console.error(err);
+ return;
+ }
+
+ const directories = dirs.filter(file => file.isDirectory()).map(file => file.name);
+ const targetDirectories = directories.filter(directory => directory !== 'tmp' && directory !== 'debug');
+ const dir = targetDirectories[0];
+ fs.readdir(`target/${dir}`, { withFileTypes: true }, (err, entries) => {
+ if (err) {
+ console.error(err);
+ return;
+ }
+ const files = entries.filter(file => file.isFile()).map(file => file.name);
+ const serverBinaries = files.filter(file => file.endsWith('-server'));
+ serverBinaries.forEach(binary => {
+ fs.copyFile(`target/${dir}/${binary}`, `${outputFolder}/${binary}`, (err) => {
+ if (err) {
+ console.error(err);
+ }
+ });
+ });
+ });
+});
diff --git a/toolchains/solidity/extension/dist/.gitignore b/toolchains/solidity/extension/dist/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/toolchains/solidity/extension/dist/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/toolchains/solidity/extension/package.json b/toolchains/solidity/extension/package.json
index f8fb7ae1..c4875980 100644
--- a/toolchains/solidity/extension/package.json
+++ b/toolchains/solidity/extension/package.json
@@ -2,7 +2,7 @@
"name": "osmium-solidity-extension",
"displayName": "Osmium Solidity",
"description": "",
- "version": "0.0.1",
+ "version": "0.2.0",
"publisher": "OsmiumToolchains",
"repository": {
"type": "git",
@@ -18,7 +18,7 @@
"activationEvents": [
"onLanguage:solidity"
],
- "main": "./dist/client.js",
+ "main": "./dist/extension.js",
"contributes": {
"commands": [
{
diff --git a/toolchains/solidity/extension/src/client.ts b/toolchains/solidity/extension/src/extension.ts
similarity index 90%
rename from toolchains/solidity/extension/src/client.ts
rename to toolchains/solidity/extension/src/extension.ts
index 2c44efdd..2d021566 100644
--- a/toolchains/solidity/extension/src/client.ts
+++ b/toolchains/solidity/extension/src/extension.ts
@@ -18,17 +18,17 @@ let client: LanguageClient;
export async function activate(context: ExtensionContext) {
// The server is implemented in node
- const serverModule = context.asAbsolutePath(
- path.join('dist', 'server.js')
+ const serverBinary = context.asAbsolutePath(
+ path.join('dist', 'linter-server')
);
// If the extension is launched in debug mode then the debug server options are used
// Otherwise the run options are used
const serverOptions: ServerOptions = {
- run: { module: serverModule, transport: TransportKind.ipc },
+ run: { command: serverBinary, transport: TransportKind.stdio },
debug: {
- module: serverModule,
- transport: TransportKind.ipc,
+ command: serverBinary,
+ transport: TransportKind.stdio,
}
};
diff --git a/toolchains/solidity/extension/src/server.ts b/toolchains/solidity/extension/src/server.ts
deleted file mode 100644
index cbe766e2..00000000
--- a/toolchains/solidity/extension/src/server.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/* --------------------------------------------------------------------------------------------
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- * ------------------------------------------------------------------------------------------ */
-import {
- createConnection,
- TextDocuments,
- Diagnostic,
- DiagnosticSeverity,
- ProposedFeatures,
- InitializeParams,
- DidChangeConfigurationNotification,
- CompletionItem,
- CompletionItemKind,
- TextDocumentPositionParams,
- TextDocumentSyncKind,
- InitializeResult
-} from 'vscode-languageserver/node';
-import {create_extension} from '../dist';
-
-// Create a connection for the server, using Node's IPC as a transport.
-// Also include all preview / proposed LSP features.
-const connection = createConnection(ProposedFeatures.all);
-
-
-
-
-const sendRequest = (method: string, params: any) => {
- return connection.sendRequest(method, params);
-};
-
-const sendNotification = (method: string, params: any) => {
- connection.sendNotification(method, params);
-};
-
-const extension = create_extension(sendRequest, sendNotification);
-
-connection.onInitialize((params: InitializeParams) => {
- return extension.onRequest('initialize', params);
-});
-
-connection.onRequest((method: string, params: any) => {
- connection.console.log(`onRequest: ${method}`);
-
- return extension.onRequest(method, params);
-});
-
-connection.onNotification((method: string, params: any) => {
- extension.onNotification(method, params);
-});
-
-connection.listen();
diff --git a/toolchains/solidity/extension/webpack.config.js b/toolchains/solidity/extension/webpack.config.js
index c5d42b7f..ac2e9abb 100644
--- a/toolchains/solidity/extension/webpack.config.js
+++ b/toolchains/solidity/extension/webpack.config.js
@@ -13,8 +13,7 @@ const extensionConfig = {
mode: 'none', // this leaves the source code as close as possible to the original (when packaging we set this to 'production')
entry: {
- client: './src/client.ts', // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/
- server: './src/server.ts',
+ extension: './src/extension.ts', // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/
},
output: {
// the bundle is stored in the 'dist' folder (check package.json), 📖 -> https://webpack.js.org/configuration/output/