Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ben/next

Browse Source
This commit is contained in:
Benjamin Pasero
2016-09-05 16:48:31 +02:00
parent 41aa92e4c8 d2dcbdaade
commit 7a517bbd73
33 changed files with 263 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vs/workbench/api/node/extHostLanguageFeatures.ts
View File

@@ -10,7 +10,7 @@ import {IDisposable, dispose} from 'vs/base/common/lifecycle';
import {IThreadService} from 'vs/workbench/services/thread/common/threadService';
import * as vscode from 'vscode';
import * as TypeConverters from 'vs/workbench/api/node/extHostTypeConverters';
import {Range, Disposable, SignatureHelp, CompletionList} from 'vs/workbench/api/node/extHostTypes';
import {Range, Disposable, CompletionList} from 'vs/workbench/api/node/extHostTypes';
import {IPosition, IRange, ISingleEditOperation} from 'vs/editor/common/editorCommon';
import * as modes from 'vs/editor/common/modes';
import {ExtHostDocuments} from 'vs/workbench/api/node/extHostDocuments';
@@ -535,18 +535,16 @@ class SuggestAdapter {
const disposables: IDisposable[] = [];
let list: CompletionList;
if (Array.isArray(value)) {
list = new CompletionList(value);
} else if (value instanceof CompletionList) {
list = value;
result.incomplete = list.isIncomplete;
} else if (!value) {
if (!value) {
// undefined and null are valid results
return;
} else if (Array.isArray(value)) {
list = new CompletionList(value);
} else {
// warn about everything else
console.warn('INVALID result from completion provider. expected CompletionItem-array or CompletionList but got:', value);
return;
list = value;
result.incomplete = list.isIncomplete;
}
for (let i = 0; i < list.items.length; i++) {
@@ -622,7 +620,7 @@ class SignatureHelpAdapter {
const pos = TypeConverters.toPosition(position);
return asWinJsPromise(token => this._provider.provideSignatureHelp(doc, pos, token)).then(value => {
if (value instanceof SignatureHelp) {
if (value) {
return TypeConverters.SignatureHelp.from(value);
}
});

2
src/vs/workbench/api/node/extHostWorkspace.ts
View File

@@ -39,7 +39,7 @@ export class ExtHostWorkspace {
}
if (isEqualOrParent(path, this._workspacePath)) {
return relative(this._workspacePath, path);
return relative(this._workspacePath, path) || path;
}
return path;