feat(diagnostic): add showRelatedInformation

data/schema.json

@@ -1039,12 +1039,6 @@
       "description": "Enable diagnostic refresh on insert mode, default false.",
       "default": false
     },
-    "diagnostic.separateRelatedInformationAsDiagnostics": {
-      "type": "boolean",
-      "default": false,
-      "scope": "application",
-      "description": "Separate related information as diagnostics."
-    },
     "diagnostic.showDeprecated": {
       "type": "boolean",
       "default": true,

doc/coc-config.txt

@@ -272,12 +272,6 @@ Diagnostic~
 
 	Scope: `language-overridable`, default: `false`
 
-"diagnostic.separateRelatedInformationAsDiagnostics"	*coc-config-diagnostic-separateRelatedInformationAsDiagnostics*
-
-	Separate related information as diagnostics.
-
-	Scope: `application`, default: `false`
-
 "diagnostic.showDeprecated"				*coc-config-diagnostic-showDeprecated*
 
 	Show diagnostics with deprecated tag.

src/__tests__/client/integration.test.ts

@@ -598,51 +598,6 @@ describe('Client integration', () => {
     expect(fn).toBeCalled()
   })
 
-  it('should separate diagnostics', async () => {
-    async function startServer(disable?: boolean, handleDiagnostics?: (uri: string, diagnostics: Diagnostic[], next: HandleDiagnosticsSignature) => void): Promise<lsclient.LanguageClient> {
-      let clientOptions: lsclient.LanguageClientOptions = {
-        disableDiagnostics: disable,
-        separateDiagnostics: true,
-        initializationOptions: {},
-        middleware: {
-          handleDiagnostics
-        }
-      }
-      let serverModule = path.join(__dirname, './server/eventServer.js')
-      let serverOptions: lsclient.ServerOptions = {
-        module: serverModule,
-        transport: lsclient.TransportKind.stdio,
-      }
-      let client = new lsclient.LanguageClient('html', 'Test Language Server', serverOptions, clientOptions)
-      await client.start()
-      return client
-    }
-    let client = await startServer()
-    await client.sendNotification('diagnostics')
-    await helper.waitValue(() => {
-      let collection = client.diagnostics
-      let res = collection.get('lsptest:/2')
-      return res.length
-    }, 2)
-    await client.stop()
-    client = await startServer(true)
-    await client.sendNotification('diagnostics')
-    await helper.wait(50)
-    let collection = client.diagnostics
-    expect(collection).toBeUndefined()
-    await client.stop()
-    let called = false
-    client = await startServer(false, (uri, diagnostics, next) => {
-      called = true
-      next(uri, diagnostics)
-    })
-    await client.sendNotification('diagnostics')
-    await helper.waitValue(() => {
-      return called
-    }, true)
-    await client.stop()
-  })
-
   it('should check version on apply workspaceEdit', async () => {
     let uri = URI.file(__filename)
     await workspace.loadFile(uri.toString())

src/language-client/client.ts

@@ -174,7 +174,6 @@ export type LanguageClientOptions = {
   rootPatterns?: string[]
   requireRootPattern?: boolean
   documentSelector?: DocumentSelector
-  separateDiagnostics?: boolean
   disableMarkdown?: boolean
   disableWorkspaceFolders?: boolean
   disableDiagnostics?: boolean
@@ -206,7 +205,6 @@ type ResolvedClientOptions = {
   disabledFeatures: string[]
   disableMarkdown: boolean
   disableDynamicRegister: boolean
-  separateDiagnostics: boolean
   rootPatterns?: string[]
   requireRootPattern?: boolean
   documentSelector: DocumentSelector
@@ -382,15 +380,10 @@ export abstract class BaseLanguageClient implements FeatureClient<Middleware, La
         }
       }
     }
-    let separateDiagnostics = clientOptions.separateDiagnostics
-    if (clientOptions.separateDiagnostics === undefined) {
-      separateDiagnostics = workspace.getConfiguration('diagnostic', clientOptions.workspaceFolder).get('separateRelatedInformationAsDiagnostics') as boolean
-    }
     return {
       disabledFeatures,
       disableMarkdown,
       disableSnippetCompletion,
-      separateDiagnostics,
       diagnosticPullOptions: pullOption,
       rootPatterns: clientOptions.rootPatterns ?? [],
       requireRootPattern: clientOptions.requireRootPattern,
@@ -1575,24 +1568,8 @@ export abstract class BaseLanguageClient implements FeatureClient<Middleware, La
   private setDiagnostics(uri: string, diagnostics: Diagnostic[] | undefined) {
     if (!this._diagnostics) return
 
-    const separate = this.clientOptions.separateDiagnostics
     // TODO make is async
-    if (separate && diagnostics.length > 0) {
-      const entries: Map<string, Diagnostic[]> = new Map()
-      entries.set(uri, diagnostics)
-      for (const diagnostic of diagnostics) {
-        if (diagnostic.relatedInformation?.length) {
-          for (const info of diagnostic.relatedInformation) {
-            const diags: Diagnostic[] = entries.get(info.location.uri) || []
-            diags.push(Diagnostic.create(info.location.range, info.message, DiagnosticSeverity.Hint, diagnostic.code, diagnostic.source))
-            entries.set(info.location.uri, diags)
-          }
-        }
-        this._diagnostics.set(Array.from(entries))
-      }
-    } else {
-      this._diagnostics.set(uri, diagnostics)
-    }
+    this._diagnostics.set(uri, diagnostics)
   }
 
   private handleApplyWorkspaceEdit(params: ApplyWorkspaceEditParams): Promise<ApplyWorkspaceEditResult> {