Update VSCode and TypeScript

pull/17/merge
Felix Becker 2016-10-11 03:34:15 +02:00
parent 00d703b19a
commit 4b3e1098f2
3 changed files with 13 additions and 8 deletions

View File

@ -9,7 +9,7 @@
"preview": true, "preview": true,
"version": "0.0.9", "version": "0.0.9",
"engines": { "engines": {
"vscode": "^1.4.0" "vscode": "^1.6.0"
}, },
"keywords": [ "keywords": [
"php", "php",
@ -45,13 +45,14 @@
}, },
"devDependencies": { "devDependencies": {
"tslint": "^3.15.1", "tslint": "^3.15.1",
"typescript": "^1.8.10", "typescript": "^2.0.3",
"typings": "^1.3.3", "typings": "^1.3.3",
"vsce": "^1.8.1", "vsce": "^1.8.1",
"vscode": "^0.11.17" "vscode": "^0.11.17"
}, },
"dependencies": { "dependencies": {
"semver": "^5.3.0", "semver": "^5.3.0",
"vscode-languageclient": "^2.4.2-next.24" "vscode": "^0.11.18",
"vscode-languageclient": "^2.5.0"
} }
} }

View File

@ -41,8 +41,8 @@ export function activate(context: vscode.ExtensionContext) {
const serverOptions = () => new Promise<ChildProcess | StreamInfo>((resolve, reject) => { const serverOptions = () => new Promise<ChildProcess | StreamInfo>((resolve, reject) => {
function spawnServer(...args: string[]): ChildProcess { function spawnServer(...args: string[]): ChildProcess {
// The server is implemented in PHP // The server is implemented in PHP
const serverPath = context.asAbsolutePath(path.join('vendor', 'felixfbecker', 'language-server', 'bin', 'php-language-server.php')); args.unshift(context.asAbsolutePath(path.join('vendor', 'felixfbecker', 'language-server', 'bin', 'php-language-server.php')));
const childProcess = spawn('php', [serverPath, ...args]); const childProcess = spawn('php', args);
childProcess.stderr.on('data', (chunk: Buffer) => { childProcess.stderr.on('data', (chunk: Buffer) => {
console.error(chunk + ''); console.error(chunk + '');
}); });

View File

@ -1,15 +1,19 @@
{ {
"compilerOptions": { "compilerOptions": {
"target": "ES5", "target": "ES6",
"module": "commonjs", "module": "commonjs",
"moduleResolution": "node", "moduleResolution": "node",
"outDir": "out", "outDir": "out",
"noLib": true, "noLib": true,
"noImplicitAny": true, "noImplicitAny": true,
"sourceMap": true, "sourceMap": true,
"rootDir": "src" "rootDir": "src",
"strictNullChecks": true,
"noImplicitThis": true,
"noImplicitReturns": true
}, },
"exclude": [ "exclude": [
"node_modules" "node_modules",
"out"
] ]
} }