Skip to content
This repository has been archived by the owner on Jul 3, 2024. It is now read-only.

Commit

Permalink
merge: dev into main
Browse files Browse the repository at this point in the history
  • Loading branch information
0xmemorygrinder committed Feb 27, 2024
2 parents 272cef7 + 24968cf commit 40dd024
Show file tree
Hide file tree
Showing 34 changed files with 2,083 additions and 1,260 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/publish-extension-auto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ jobs:
- 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: i686-pc-windows-msvc
# code-target: win32-ia32
- os: windows-latest
target: aarch64-pc-windows-msvc
code-target: win32-arm64
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-extension-manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ jobs:
- 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: i686-pc-windows-msvc
# code-target: win32-ia32
- os: windows-latest
target: aarch64-pc-windows-msvc
code-target: win32-arm64
Expand Down
708 changes: 363 additions & 345 deletions .pnp.cjs

Large diffs are not rendered by default.

44 changes: 15 additions & 29 deletions .pnp.loader.mjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@
"lint": "echo 'linting...'",
"format": "echo 'formatting...'",
"test": "echo 'testing...'"
}
},
"packageManager": "[email protected]"
}
73 changes: 72 additions & 1 deletion toolchains/solidity/core/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion toolchains/solidity/core/crates/linter-server/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "linter-server"
license = "GPL-3.0-or-later"
version = "0.2.2"
version = "0.2.3"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
10 changes: 4 additions & 6 deletions toolchains/solidity/core/crates/linter-server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,14 @@ impl LanguageServer for Backend {
self.lint(params.text_document.uri, params.text_document.text);
}

fn did_change(&self, params: DidChangeTextDocumentParams) {
fn did_save(&self, params: DidSaveTextDocumentParams) {
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(),
);
if let Some(text) = params.text {
self.lint(params.text_document.uri, text);
}
}

fn did_change_watched_files(&self, params: DidChangeWatchedFilesParams) {
Expand Down
3 changes: 3 additions & 0 deletions toolchains/solidity/core/crates/slither-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ tokio = { version="1.34.0", features = ["full"] }
tower-lsp = "0.20.0"
colored = "2.0.4"
thiserror = "1.0.50"
glob = "0.3.1"
toml = "0.8.8"
tokio-util = "0.7.10"
6 changes: 4 additions & 2 deletions toolchains/solidity/core/crates/slither-server/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ use thiserror::Error;

#[derive(Error, Debug)]
pub enum SlitherError {
#[error("Error while runing slither")]
Unknown,
#[error("Error while runing slither: {0}")]
Unknown(String),
#[error("Error while runing the slither command: {0}")]
IoCommandError(#[from] std::io::Error),
#[error("Error while parsing slither output: {0}")]
ParsingFailed(#[from] serde_json::Error),
#[error("Error when trying to find the foundry.toml file")]
FoundryTomlNotFound,
}
Loading

0 comments on commit 40dd024

Please sign in to comment.