From 2e09cbff255786df8b2c06a9304dc453631064e3 Mon Sep 17 00:00:00 2001 From: qwertycxz Date: Tue, 29 Oct 2024 10:43:14 +0800 Subject: [PATCH 1/2] Suppress diagnostics and formatter of verible LS Since HDL-support has implemented the diagnostics and formatter, the verible LS should not directly provide these features. --- CHANGELOG.md | 7 +++++++ src/extension.ts | 14 +++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8d1019c..9a0f0808 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)\ +## [Unreleased] - 2024-xx-xx + +### Fixed + +- Fix same warning of Verible LS shows twice [#449](https://github.com/mshr-h/vscode-verilog-hdl-support/issues/449) +- Fix Verible formatter arguments not working [#487](https://github.com/mshr-h/vscode-verilog-hdl-support/issues/487) + ## [1.15.3] - 2024-10-26 ### Fixed diff --git a/src/extension.ts b/src/extension.ts index 6756df5e..8ef3d54c 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT import * as vscode from 'vscode'; -import { LanguageClient, LanguageClientOptions, ServerOptions } from 'vscode-languageclient/node'; +import { LanguageClient, LanguageClientOptions, Message, ServerOptions } from 'vscode-languageclient/node'; import LintManager from './linter/LintManager'; import { CtagsManager } from './ctags'; @@ -249,6 +249,18 @@ function initAllLanguageClients() { // init verible-verilog-ls setupLanguageClient('veribleVerilogLs', 'verible-verilog-ls', [], [], { + connectionOptions: { + messageStrategy: { + handleMessage: (message, next) => { + if (Message.isResponse(message) && message.result['capabilities']) { + delete message.result['capabilities']['diagnosticProvider']; + delete message.result['capabilities']['documentFormattingProvider']; + delete message.result['capabilities']['documentRangeFormattingProvider']; + } + next(message); + } + } + }, documentSelector: [ { scheme: 'file', language: 'verilog' }, { scheme: 'file', language: 'systemverilog' }, From b62bcdf548eb79719adca3a5dacbee9185c136f2 Mon Sep 17 00:00:00 2001 From: qwertycxz Date: Tue, 29 Oct 2024 11:04:06 +0800 Subject: [PATCH 2/2] Fix trailing comma --- src/extension.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index 8ef3d54c..672720c3 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -258,8 +258,8 @@ function initAllLanguageClients() { delete message.result['capabilities']['documentRangeFormattingProvider']; } next(message); - } - } + }, + }, }, documentSelector: [ { scheme: 'file', language: 'verilog' },