Skip to content

Commit 7f37e60

Browse files
Merge pull request #1451 from DustinCampbell/1.10.0-beta2-update
1.10.0 beta2 update
2 parents e269344 + 8e39825 commit 7f37e60

File tree

3 files changed

+32
-17
lines changed

3 files changed

+32
-17
lines changed

CHANGELOG.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,32 @@
55

66
## 1.10.0 _(Not Yet Released)_
77

8-
#### Unit Testing
8+
#### Completion List
99

10-
* Add support for NUnit Test Adapter. ([#1434](https://github.com/OmniSharp/omnisharp-vscode/issues/1434), PR: [omnisharp-roslyn#834](https://github.com/OmniSharp/omnisharp-roslyn/pull/834))
11-
* Tests that define display names are now run properly. ([#1426](https://github.com/OmniSharp/omnisharp-vscode/issues/1426), PR: [omnisharp-roslyn#833](https://github.com/OmniSharp/omnisharp-roslyn/pull/833))
12-
* Tests with similar names are no longer incorrectly run together when one of them is clicked. ([#1432](https://github.com/OmniSharp/omnisharp-vscode/issues/1432), PR: [omnisharp-roslyn#833](https://github.com/OmniSharp/omnisharp-roslyn/pull/833))
13-
* Improve response from running/debugging tests to include output from build and test summary. ([#419](https://github.com/OmniSharp/omnisharp-vscode/issues/419), [#455](https://github.com/OmniSharp/omnisharp-vscode/issues/455), PR: [#1436](https://github.com/OmniSharp/omnisharp-vscode/pull/1436))
14-
* Added `csharp.unitTestDebugingOptions` setting to pass launch.json-style debug options (example: `justMyCode`) when unit test debugging.
10+
* Several improvements to the completion list! _(All contributed by [@filipw](https://github.com/filipw) with PR [omnisharp-roslyn#840](https://github.com/OmniSharp/omnisharp-roslyn/pull/840))_
11+
* Attributes are completed properly without the 'Attribute' suffix. ([#393](https://github.com/OmniSharp/omnisharp-vscode/issues/393))
12+
* Named parameters now appear in the completion list. ([#652](https://github.com/OmniSharp/omnisharp-vscode/issues/652))
13+
* Object initializer members now appear in the completion list. ([#260](https://github.com/OmniSharp/omnisharp-vscode/issues/260))
14+
* Completion appears within XML doc comment CREFs.
15+
* Initial support for completion on 'override' and 'partial' keywords. ([#1044](https://github.com/OmniSharp/omnisharp-vscode/issues/1044))
1516

1617
#### Project System
1718

1819
* Project references to projects located outside of the current workspace directory are now loaded and processed. ([#963](https://github.com/OmniSharp/omnisharp-vscode/issues/963), PR: [omnisharp-roslyn#832](https://github.com/OmniSharp/omnisharp-vscode/issues/963))
20+
* OmniSharp now loads .NET Core projects using the SDKs included with the .NET Core SDK appropriate for that project, if they're installed on the machine. ([#1438](https://github.com/OmniSharp/omnisharp-vscode/issues/1438), [omnisharp-roslyn#765](https://github.com/OmniSharp/omnisharp-roslyn/issues/765), PR: [omnisharp-roslyn#847](https://github.com/OmniSharp/omnisharp-roslyn/pull/847))
1921

2022
#### Scripting
2123

2224
* Support Metadata as Source for Go To Definition in CSX files. ([omnisharp-roslyn#755](https://github.com/OmniSharp/omnisharp-roslyn/issues/755), PR: ([omnisharp-roslyn#829](https://github.com/OmniSharp/omnisharp-roslyn/pull/829)) _(Contributed by [@filipw](https://github.com/filipw))_
2325

26+
#### Unit Testing
27+
28+
* Add support for NUnit Test Adapter. ([#1434](https://github.com/OmniSharp/omnisharp-vscode/issues/1434), PR: [omnisharp-roslyn#834](https://github.com/OmniSharp/omnisharp-roslyn/pull/834))
29+
* Tests that define display names are now run properly. ([#1426](https://github.com/OmniSharp/omnisharp-vscode/issues/1426), PR: [omnisharp-roslyn#833](https://github.com/OmniSharp/omnisharp-roslyn/pull/833))
30+
* Tests with similar names are no longer incorrectly run together when one of them is clicked. ([#1432](https://github.com/OmniSharp/omnisharp-vscode/issues/1432), PR: [omnisharp-roslyn#833](https://github.com/OmniSharp/omnisharp-roslyn/pull/833))
31+
* Improve response from running/debugging tests to include output from build and test summary. ([#419](https://github.com/OmniSharp/omnisharp-vscode/issues/419), [#455](https://github.com/OmniSharp/omnisharp-vscode/issues/455), PR: [#1436](https://github.com/OmniSharp/omnisharp-vscode/pull/1436))
32+
* Added `csharp.unitTestDebugingOptions` setting to pass launch.json-style debug options (example: `justMyCode`) when unit test debugging.
33+
2434
#### Other Updates and Fixes
2535

2636
* New `csharp.suppressHiddenDiagnostics` setting that can be set to true to display hidden diagnostics, such as 'unnecessary using directive'. ([#1429](https://github.com/OmniSharp/omnisharp-vscode/issues/1429), PR: [#1435](https://github.com/OmniSharp/omnisharp-vscode/pull/1435)) _(Contributed by [@cruz82](https://github.com/cruz82))_

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "csharp",
33
"publisher": "ms-vscode",
4-
"version": "1.10.0-beta1",
4+
"version": "1.10.0-beta2",
55
"description": "C# for Visual Studio Code (powered by OmniSharp).",
66
"displayName": "C#",
77
"author": "Microsoft Corporation",
@@ -123,7 +123,7 @@
123123
},
124124
{
125125
"description": "OmniSharp (.NET 4.6 / x86)",
126-
"url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.16.0.zip",
126+
"url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.17.0.zip",
127127
"installPath": "./bin/omnisharp",
128128
"platforms": [
129129
"win32"
@@ -135,7 +135,7 @@
135135
},
136136
{
137137
"description": "OmniSharp (.NET 4.6 / x64)",
138-
"url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.16.0.zip",
138+
"url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.17.0.zip",
139139
"installPath": "./bin/omnisharp",
140140
"platforms": [
141141
"win32"
@@ -147,7 +147,7 @@
147147
},
148148
{
149149
"description": "OmniSharp (Mono 4.6)",
150-
"url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-mono-1.16.0.zip",
150+
"url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-mono-1.17.0.zip",
151151
"installPath": "./bin/omnisharp",
152152
"platforms": [
153153
"darwin",

src/features/completionItemProvider.ts

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ export default class OmniSharpCompletionItemProvider extends AbstractSupport imp
2828
req.WantKind = true;
2929
req.WantReturnType = true;
3030

31-
return serverUtils.autoComplete(this._server, req).then(values => {
31+
return serverUtils.autoComplete(this._server, req).then(responses => {
3232

33-
if (!values) {
33+
if (!responses) {
3434
return;
3535
}
3636

@@ -39,11 +39,16 @@ export default class OmniSharpCompletionItemProvider extends AbstractSupport imp
3939

4040
// transform AutoCompleteResponse to CompletionItem and
4141
// group by code snippet
42-
for (let value of values) {
43-
let completion = new CompletionItem(value.CompletionText.replace(/\(|\)|<|>/g, ''));
44-
completion.detail = value.ReturnType ? `${value.ReturnType} ${value.DisplayText}` : value.DisplayText;
45-
completion.documentation = extractSummaryText(value.Description);
46-
completion.kind = _kinds[value.Kind] || CompletionItemKind.Property;
42+
for (let response of responses) {
43+
let completion = new CompletionItem(response.DisplayText);
44+
45+
completion.detail = response.ReturnType
46+
? `${response.ReturnType} ${response.DisplayText}`
47+
: response.DisplayText;
48+
49+
completion.documentation = extractSummaryText(response.Description);
50+
completion.kind = _kinds[response.Kind] || CompletionItemKind.Property;
51+
completion.insertText = response.CompletionText.replace(/<>/g, '');
4752

4853
let array = completions[completion.label];
4954
if (!array) {

0 commit comments

Comments
 (0)