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

fix untitled buffer not work

Browse source 
Closes #261
This commit is contained in:
Qiming Zhao 2021-02-22 18:42:35 +08:00
parent e3eae62e37
commit 0f3e462afd
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/server/typescriptServiceClient.ts
View file

@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import cp from 'child_process'
import { ServiceStat, Uri, window, workspace } from 'coc.nvim'
import { Document, ServiceStat, Uri, window, workspace } from 'coc.nvim'
import fs from 'fs'
import os from 'os'
import path from 'path'
@ -491,7 +491,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
public toResource(filepath: string): string {
if (this._apiVersion.gte(API.v213)) {
if (filepath.startsWith('untitled:')) {
if (filepath.startsWith(this.inMemoryResourcePrefix + 'untitled:')) {
let resource = Uri.parse(filepath)
if (this.inMemoryResourcePrefix) {
const dirName = path.dirname(resource.path)
@ -524,14 +524,22 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
}
}
public getDocument(resource: string): Document | undefined {
if (resource.startsWith('untitled:')) {
let bufnr = parseInt(resource.split(':', 2)[1], 10)
return workspace.getDocument(bufnr)
}
return workspace.getDocument(resource)
}
private get inMemoryResourcePrefix(): string {
return this._apiVersion.gte(API.v270) ? '^' : ''
}
public asUrl(filepath: string): Uri {
if (this._apiVersion.gte(API.v213)) {
if (filepath.startsWith('untitled:')) {
let resource = Uri.parse(filepath)
if (filepath.startsWith(this.inMemoryResourcePrefix + 'untitled:')) {
let resource = Uri.parse(filepath.slice(this.inMemoryResourcePrefix.length))
if (this.inMemoryResourcePrefix) {
const dirName = path.dirname(resource.path)
const fileName = path.basename(resource.path)

2
src/server/typescriptServiceClientHost.ts
View file

@ -181,7 +181,7 @@ export default class TypeScriptServiceClientHost implements Disposable {
public async findLanguage(uri: string): Promise<LanguageProvider> {
try {
let doc = await workspace.loadFile(uri)
let doc = this.client.getDocument(uri)
if (!doc) return undefined
let languages = Array.from(this.languagePerId.values())
return languages.find(language => language.handles(uri, doc.textDocument))