Skip to content

Commit

Permalink
not check solargraph command, fix #14
Browse files Browse the repository at this point in the history
  • Loading branch information
chemzqm committed Aug 11, 2019
1 parent f7732c4 commit e252ff3
Show file tree
Hide file tree
Showing 4 changed files with 488 additions and 376 deletions.
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -248,15 +248,15 @@
"devDependencies": {
"@chemzqm/tsconfig": "^0.0.3",
"@chemzqm/tslint-config": "^1.0.18",
"@types/node": "^10.14.9",
"coc.nvim": "^0.0.71",
"@types/node": "^12.7.1",
"coc.nvim": "^0.0.73",
"rimraf": "^2.6.3",
"ts-loader": "^6.0.3",
"tslint": "^5.17.0",
"typescript": "^3.5.2",
"webpack": "^4.34.0",
"webpack-cli": "^3.3.4",
"solargraph-utils": "^0.8.2",
"ts-loader": "^6.0.4",
"tslint": "^5.18.0",
"typescript": "^3.5.3",
"webpack": "^4.39.1",
"webpack-cli": "^3.3.6",
"solargraph-utils": "^1.0.1",
"tslib": "^1.10.0",
"turndown": "^5.0.3",
"vscode-languageserver-protocol": "^3.15.0-next.6",
Expand Down
9 changes: 0 additions & 9 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,13 @@ import { makeLanguageClient } from './language-client'
import { createConfig, downloadCore, verifyGemIsCurrent } from './util'
import SolargraphDocumentProvider from './SolargraphDocumentProvider'
import * as solargraph from 'solargraph-utils'
import which from 'which'

export async function activate(context: ExtensionContext): Promise<void> {
let { subscriptions } = context
const config = workspace.getConfiguration().get<any>('solargraph', {}) as any
const enable = config.enable
if (enable === false) return
let command = config.commandPath || 'solargraph'
try {
which.sync(command)
} catch (e) {
workspace.showMessage(`Solargraph command '${command}' not found!`, 'error')
return
}

const selector = config.filetypes || ['ruby']
let applyConfiguration = (_config: solargraph.Configuration) => {
_config.commandPath = config.commandPath || 'solargraph'
_config.useBundler = config.useBundler || false
Expand Down
12 changes: 8 additions & 4 deletions src/language-client.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Middleware, LanguageClient, LanguageClientOptions, ServerOptions, workspace, ProvideCompletionItemsSignature, ProviderResult } from 'coc.nvim'
import { TextDocument, Position, CompletionItem, CompletionList } from 'vscode-languageserver-types'
import { CompletionContext, CancellationToken, MarkedString } from 'vscode-languageserver-protocol'
import * as solargraph from 'solargraph-utils'
import { LanguageClient, LanguageClientOptions, Middleware, ProvideCompletionItemsSignature, ProviderResult, ServerOptions, workspace } from 'coc.nvim'
import net from 'net'
import * as solargraph from 'solargraph-utils'
import { CancellationToken, CompletionContext } from 'vscode-languageserver-protocol'
import { CompletionItem, CompletionList, Position, TextDocument } from 'vscode-languageserver-types'

// export function makeLanguageClient(socketProvider: solargraph.SocketProvider): LanguageClient {
export function makeLanguageClient(configuration: solargraph.Configuration): LanguageClient {
Expand Down Expand Up @@ -57,6 +57,10 @@ export function makeLanguageClient(configuration: solargraph.Configuration): Lan
return () => {
return new Promise(resolve => {
let child = solargraph.commands.solargraphCommand(['stdio'], configuration)
child.on('error', err => {
// tslint:disable-next-line: no-console
console.error('Solargraph error:', err.message)
})
child.stderr.on('data', (data: Buffer) => {
// tslint:disable-next-line: no-console
console.log(data.toString())
Expand Down
Loading

0 comments on commit e252ff3

Please sign in to comment.