NomicFoundation · antico5 · Apr 12, 2023 · Mar 15, 2023 · Mar 15, 2023 · Mar 15, 2023
diff --git a/client/package.json b/client/package.json
@@ -58,13 +58,12 @@
     "@types/prettier": "2.6.0",
     "@types/vscode": "^1.70",
     "eslint": "^7.23.0",
-    "rimraf": "3.0.2"
+    "rimraf": "3.0.2",
+    "prettier": "2.5.1"
   },
   "dependencies": {
     "@nomicfoundation/solidity-language-server": "0.6.15",
     "@sentry/node": "6.19.1",
-    "prettier": "2.5.1",
-    "prettier-plugin-solidity": "1.1.2",
     "vscode-languageclient": "^7.0.0"
   },
   "contributes": {

diff --git a/client/src/extension.ts b/client/src/extension.ts
@@ -4,7 +4,6 @@ import { warnOnOtherSolidityExtensions } from "./popups/warnOnOtherSolidityExten
 import { indexHardhatProjects } from "./setup/indexHardhatProjects";
 import { setupCommands } from "./setup/setupCommands";
 import { setupExtensionState } from "./setup/setupExtensionState";
-import { setupFormatterHook } from "./setup/setupFormatterHook";
 import { setupLanguageServerHooks } from "./setup/setupLanguageServerHooks";
 import { setupTaskProvider } from "./setup/setupTaskProvider";
 import { setupWorkspaceHooks } from "./setup/setupWorkspaceHooks";
@@ -25,7 +24,6 @@ export async function activate(context: ExtensionContext) {
 
   await indexHardhatProjects(extensionState);
 
-  setupFormatterHook(extensionState);
   setupLanguageServerHooks(extensionState);
   setupTaskProvider(extensionState);
   await setupCommands(extensionState);

diff --git a/client/src/formatter/forgeFormatter.ts b/client/src/formatter/forgeFormatter.ts
diff --git a/client/src/formatter/index.ts b/client/src/formatter/index.ts
diff --git a/client/src/formatter/prettierFormatter.ts b/client/src/formatter/prettierFormatter.ts
diff --git a/client/src/setup/setupFormatterHook.ts b/client/src/setup/setupFormatterHook.ts
diff --git a/client/src/setup/setupLanguageServerHooks.ts b/client/src/setup/setupLanguageServerHooks.ts
@@ -59,6 +59,7 @@ const startLanguageServer = (extensionState: ExtensionState): void => {
       env: extensionState.env,
       telemetryEnabled: extensionState.telemetryEnabled,
       machineId: extensionState.machineId,
+      extensionConfig: workspace.getConfiguration("solidity"),
     },
   };
 
@@ -92,12 +93,16 @@ const startLanguageServer = (extensionState: ExtensionState): void => {
     notifyTelemetryChanged
   );
 
-  const hardhatTelemetryChangeDisposable = workspace.onDidChangeConfiguration(
-    notifyTelemetryChanged
-  );
+  const configChangedDisposable = workspace.onDidChangeConfiguration(() => {
+    notifyTelemetryChanged();
+    client.sendNotification(
+      "custom/didChangeExtensionConfig",
+      workspace.getConfiguration("solidity")
+    );
+  });
 
   extensionState.listenerDisposables.push(globalTelemetryChangeDisposable);
-  extensionState.listenerDisposables.push(hardhatTelemetryChangeDisposable);
+  extensionState.listenerDisposables.push(configChangedDisposable);
 
   client.start();
 

diff --git a/coc/README.md b/coc/README.md
@@ -14,6 +14,13 @@ In your vim/neovim, run this command:
 :CocInstall @nomicfoundation/coc-solidity
 ```
 
+## Configure
+
+In your coc-settings.json, the following settings are supported:
+
+- `"@nomicfoundation/coc-solidity.telemetry": true|false`
+- `"@nomicfoundation/coc-solidity.formatter": "prettier"|"forge"|"none"`
+
 ## Features
 
 ### Code Completions
@@ -173,6 +180,10 @@ The **Hardhat config file** that is used when validating a Solidity file is show
 ![Open Config](https://raw.githubusercontent.com/NomicFoundation/hardhat-vscode/main/docs/gifs/open-config.gif "Open Config")
 
 
+## Format document
+
+Running `:call CocActionAsync('format')` will trigger document formatting.
+
 ## Language server logs
 
 If you encounter an issue with the plugin, you can inspect the server logs by running `:CocCommand workspace.showOutput`. This can help troubleshooting the problem.

diff --git a/coc/README.template.md b/coc/README.template.md
@@ -14,8 +14,19 @@ In your vim/neovim, run this command:
 :CocInstall @nomicfoundation/coc-solidity
 ```
 
+## Configure
+
+In your coc-settings.json, the following settings are supported:
+
+- `"@nomicfoundation/coc-solidity.telemetry": true|false`
+- `"@nomicfoundation/coc-solidity.formatter": "prettier"|"forge"|"none"`
+
 [include '../docs/features.md']
 
+## Format document
+
+Running `:call CocActionAsync('format')` will trigger document formatting.
+
 ## Language server logs
 
 If you encounter an issue with the plugin, you can inspect the server logs by running `:CocCommand workspace.showOutput`. This can help troubleshooting the problem.

diff --git a/coc/src/index.ts b/coc/src/index.ts
@@ -35,6 +35,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
         env: "production",
         telemetryEnabled,
         machineId: await machineId(),
+        extensionConfig: getExtensionConfig(),
       },
     }
   );

diff --git a/package-lock.json b/package-lock.json