From b07d94ee41b5490efd972ecc0c754f482157ad55 Mon Sep 17 00:00:00 2001 From: ChiTimesChi <88190723+ChiTimesChi@users.noreply.github.com> Date: Wed, 18 Sep 2024 20:02:36 +0100 Subject: [PATCH 1/3] remove global solidity extension settings --- .vscode/settings.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 116a5a5174..b61cf6f526 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -16,11 +16,6 @@ "eslint.format.enable": true, "editorconfig.generateAuto": false, "files.trimTrailingWhitespace": true, - "solidity.packageDefaultDependenciesContractsDirectory": "contracts", - "solidity.packageDefaultDependenciesDirectory": "lib", - "solidity.compileUsingRemoteVersion": "v0.8.17+commit.8df45f5f", - "solidity.formatter": "prettier", - "solidity.defaultCompiler": "remote", "tailwindCSS.classAttributes": [ ".*class.*", ".*Class.*", From 6e41b296d5a51011a9ad5fb0705180f34003f178 Mon Sep 17 00:00:00 2001 From: ChiTimesChi <88190723+ChiTimesChi@users.noreply.github.com> Date: Wed, 18 Sep 2024 20:04:54 +0100 Subject: [PATCH 2/3] use monorepo support in global workspace only --- .vscode/settings.json | 1 + packages/contracts-core/.vscode/settings.json | 3 +++ packages/contracts-rfq/.vscode/settings.json | 3 +++ packages/solidity-devops/.vscode/settings.json | 3 +++ 4 files changed, 10 insertions(+) create mode 100644 packages/contracts-core/.vscode/settings.json create mode 100644 packages/contracts-rfq/.vscode/settings.json create mode 100644 packages/solidity-devops/.vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json index b61cf6f526..82ad2456a1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -16,6 +16,7 @@ "eslint.format.enable": true, "editorconfig.generateAuto": false, "files.trimTrailingWhitespace": true, + "solidity.monoRepoSupport": true, "tailwindCSS.classAttributes": [ ".*class.*", ".*Class.*", diff --git a/packages/contracts-core/.vscode/settings.json b/packages/contracts-core/.vscode/settings.json new file mode 100644 index 0000000000..e430b639be --- /dev/null +++ b/packages/contracts-core/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "solidity.monoRepoSupport": false +} diff --git a/packages/contracts-rfq/.vscode/settings.json b/packages/contracts-rfq/.vscode/settings.json new file mode 100644 index 0000000000..e430b639be --- /dev/null +++ b/packages/contracts-rfq/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "solidity.monoRepoSupport": false +} diff --git a/packages/solidity-devops/.vscode/settings.json b/packages/solidity-devops/.vscode/settings.json new file mode 100644 index 0000000000..e430b639be --- /dev/null +++ b/packages/solidity-devops/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "solidity.monoRepoSupport": false +} From 9049299b8977d0c4e924f5169319eaa324e3b876 Mon Sep 17 00:00:00 2001 From: ChiTimesChi <88190723+ChiTimesChi@users.noreply.github.com> Date: Wed, 18 Sep 2024 20:29:31 +0100 Subject: [PATCH 3/3] - use Solidity extension for formatting *.sol files - use `forge fmt` as formatter in Solidity extension --- .vscode/settings.json | 4 ++++ packages/contracts-core/.vscode/settings.json | 4 ++++ packages/contracts-rfq/.vscode/settings.json | 4 ++++ packages/solidity-devops/.vscode/settings.json | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/.vscode/settings.json b/.vscode/settings.json index 82ad2456a1..e754f0e0f5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,8 @@ { "editor.fontLigatures": "'calt', 'liga', 'ss01', 'ss02', 'ss03', 'ss04', 'ss05', 'ss06', 'ss07', 'ss08', 'ss09'", + "[solidity]": { + "editor.defaultFormatter": "JuanBlanco.solidity" + }, "[typescript]": { "editor.defaultFormatter": "dbaeumer.vscode-eslint" }, @@ -16,6 +19,7 @@ "eslint.format.enable": true, "editorconfig.generateAuto": false, "files.trimTrailingWhitespace": true, + "solidity.formatter": "forge", "solidity.monoRepoSupport": true, "tailwindCSS.classAttributes": [ ".*class.*", diff --git a/packages/contracts-core/.vscode/settings.json b/packages/contracts-core/.vscode/settings.json index e430b639be..9cab755557 100644 --- a/packages/contracts-core/.vscode/settings.json +++ b/packages/contracts-core/.vscode/settings.json @@ -1,3 +1,7 @@ { + "[solidity]": { + "editor.defaultFormatter": "JuanBlanco.solidity" + }, + "solidity.formatter": "forge", "solidity.monoRepoSupport": false } diff --git a/packages/contracts-rfq/.vscode/settings.json b/packages/contracts-rfq/.vscode/settings.json index e430b639be..9cab755557 100644 --- a/packages/contracts-rfq/.vscode/settings.json +++ b/packages/contracts-rfq/.vscode/settings.json @@ -1,3 +1,7 @@ { + "[solidity]": { + "editor.defaultFormatter": "JuanBlanco.solidity" + }, + "solidity.formatter": "forge", "solidity.monoRepoSupport": false } diff --git a/packages/solidity-devops/.vscode/settings.json b/packages/solidity-devops/.vscode/settings.json index e430b639be..9cab755557 100644 --- a/packages/solidity-devops/.vscode/settings.json +++ b/packages/solidity-devops/.vscode/settings.json @@ -1,3 +1,7 @@ { + "[solidity]": { + "editor.defaultFormatter": "JuanBlanco.solidity" + }, + "solidity.formatter": "forge", "solidity.monoRepoSupport": false }