refactor(highlights): avoid unnecessary try catch

chemzqm · chemzqm · commit 6e7b73533f2e · 2021-07-01T20:07:21.000+08:00
diff --git a/src/__tests__/handler/highlights.test.ts b/src/__tests__/handler/highlights.test.ts
@@ -1,5 +1,5 @@
 import { Neovim } from '@chemzqm/neovim'
-import { Disposable, Position, Range } from 'vscode-languageserver-protocol'
+import { Disposable, DocumentHighlightKind, Position, Range } from 'vscode-languageserver-protocol'
 import Highlights from '../../handler/highlights'
 import languages from '../../languages'
 import workspace from '../../workspace'
@@ -33,11 +33,12 @@ function registProvider(): void {
       // let word = document.get
       let matches = Array.from((document.getText() as any).matchAll(/\w+/g)) as any[]
       let filtered = matches.filter(o => o[0] == word)
-      return filtered.map(o => {
+      return filtered.map((o, i) => {
         let start = document.positionAt(o.index)
         let end = document.positionAt(o.index + o[0].length)
         return {
-          range: Range.create(start, end)
+          range: Range.create(start, end),
+          kind: i % 2 == 0 ? DocumentHighlightKind.Read : DocumentHighlightKind.Write
         }
       })
     }
@@ -121,7 +122,7 @@ describe('document highlights', () => {
     expect(err).toBeUndefined()
   })
 
-  it('should not throw when provide not found', async () => {
+  it('should not throw when provider not found', async () => {
     disposeAll(disposables)
     await helper.createDocument()
     await nvim.setLine('  oo')
diff --git a/src/handler/highlights.ts b/src/handler/highlights.ts
@@ -3,7 +3,7 @@ import { CancellationTokenSource, Disposable, DocumentHighlight, DocumentHighlig
 import events from '../events'
 import languages from '../languages'
 import Document from '../model/document'
-import { HandlerDelegate, CurrentState } from '../types'
+import { HandlerDelegate } from '../types'
 import { disposeAll } from '../util'
 import workspace from '../workspace'
 const logger = require('../util/logger')('documentHighlight')
@@ -35,17 +35,11 @@ export default class Highlights {
   public async highlight(): Promise<void> {
     let { nvim } = this
     this.cancel()
-    let state: CurrentState
-    try {
-      state = await this.handler.getCurrentState()
-      this.handler.checkProvier('documentHighlight', state.doc.textDocument)
-    } catch (e) {
-      return
-    }
-    let { doc, winid, position } = state
-    let cursors = await nvim.eval(`get(b:,'coc_cursors_activated',0)`) as number
-    if (cursors) return
-    let highlights = await this.getHighlights(doc, position)
+    let [bufnr, winid, pos, cursors] = await nvim.eval(`[bufnr("%"),win_getid(),coc#util#cursor(),get(b:,'coc_cursors_activated',0)]`) as [number, number, [number, number], number]
+    let doc = workspace.getDocument(bufnr)
+    if (!doc || !doc.attached || cursors) return
+    if (!languages.hasProvider('documentHighlight', doc.textDocument)) return
+    let highlights = await this.getHighlights(doc, Position.create(pos[0], pos[1]))
     if (!highlights) return
     let groups: { [index: string]: Range[] } = {}
     for (let hl of highlights) {
