archived/coc-tsserver
1
0
Fork 0
Code Issues Pull requests Activity

fix validate.enable not work sometimes

Browse source
This commit is contained in:
chemzqm 2019-06-11 15:42:52 +08:00
parent 1e6153289f
commit fff7bdd57f
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/server/features/bufferSyncSupport.ts
View file

@ -271,7 +271,10 @@ export default class BufferSyncSupport {
}
for (const resource of handledResources) {
this.pendingDiagnostics.set(resource.toString(), Date.now())
let uri = resource.toString()
if (this.shouldValidate(uri)) {
this.pendingDiagnostics.set(uri, Date.now())
}
}
this.triggerDiagnostics()
@ -285,8 +288,7 @@ export default class BufferSyncSupport {
public requestAllDiagnostics(): void {
for (const uri of this.uris) {
let doc = workspace.getDocument(uri)
if (doc && this.shouldValidate(doc.filetype)) {
if (this.shouldValidate(uri)) {
this.pendingDiagnostics.set(uri, Date.now())
}
}
@ -297,7 +299,7 @@ export default class BufferSyncSupport {
public requestDiagnostic(uri: string): boolean {
let document = workspace.getDocument(uri)
if (!document || !this.shouldValidate(document.filetype)) return false
if (!document || !this.shouldValidate(uri)) return false
this.pendingDiagnostics.set(uri, Date.now())
const lineCount = document.lineCount
const delay = Math.min(Math.max(Math.ceil(lineCount / 20), 300), 800)
@ -339,11 +341,13 @@ export default class BufferSyncSupport {
this._validateTypeScript = tsConfig.get<boolean>('validate.enable', true)
}
private shouldValidate(filetype: string): boolean {
if (languageModeIds.languageIds.indexOf(filetype) == -1) {
public shouldValidate(uri: string): boolean {
let doc = workspace.getDocument(uri)
if (!doc) return false
if (languageModeIds.languageIds.indexOf(doc.filetype) == -1) {
return false
}
if (filetype.startsWith('javascript')) {
if (doc.filetype.startsWith('javascript')) {
return this._validateJavaScript
}
return this._validateTypeScript

9
src/server/languageProvider.ts
View file

@ -313,12 +313,9 @@ export default class LanguageProvider {
file: Uri,
diagnostics: (Diagnostic & { reportUnnecessary: any })[]
): void {
this.client.diagnosticsManager.diagnosticsReceived(
diagnosticsKind,
file.toString(),
diagnostics
)
if (!this.client.bufferSyncSupport.shouldValidate(file.toString())) {
return
}
const config = workspace.getConfiguration(this.id, file.toString())
const reportUnnecessary = config.get<boolean>('showUnused', true)
this.client.diagnosticsManager.diagnosticsReceived(diagnosticsKind, file.toString(), diagnostics.filter(diag => {