Skip to content

Commit 05d6836

Browse files
janrajjanraj
janraj
authored and
janraj
committed
Merge remote-tracking branch 'upstream/master'
2 parents 5e4d30e + 3363d73 commit 05d6836

File tree

11 files changed

+580
-44
lines changed

11 files changed

+580
-44
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## 1.6.2 (December 24, 2016)
2+
3+
* Fix performance issue when editing type names containing multiple generic type parameters. ([#1088](https://github.com/OmniSharp/omnisharp-vscode/issues/1088), [#1086](https://github.com/OmniSharp/omnisharp-vscode/issues/1086))
4+
5+
## 1.6.1 (December 22, 2016)
6+
7+
* Fix crash when tasks.json contains comments. ([#1074](https://github.com/OmniSharp/omnisharp-vscode/issues/1074))
8+
19
## 1.6.0 (December 21, 2016)
210

311
#### C# Scripting

‎package.json‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "csharp",
33
"publisher": "ms-vscode",
4-
"version": "1.6.0",
4+
"version": "1.6.2",
55
"description": "C# for Visual Studio Code (powered by OmniSharp).",
66
"displayName": "C#",
77
"author": "Microsoft Corporation",
@@ -149,17 +149,17 @@
149149
},
150150
{
151151
"description": ".NET Core Debugger (Windows / x64)",
152-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-2/coreclr-debug-win7-x64.zip",
153-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-2/coreclr-debug-win7-x64.zip",
152+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-win7-x64.zip",
153+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-win7-x64.zip",
154154
"installPath": ".debugger",
155155
"runtimeIds": [
156156
"win7-x64"
157157
]
158158
},
159159
{
160160
"description": ".NET Core Debugger (macOS / x64)",
161-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-2/coreclr-debug-osx.10.11-x64.zip",
162-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-2/coreclr-debug-osx.10.11-x64.zip",
161+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-osx.10.11-x64.zip",
162+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-osx.10.11-x64.zip",
163163
"installPath": ".debugger",
164164
"runtimeIds": [
165165
"osx.10.11-x64"
@@ -171,8 +171,8 @@
171171
},
172172
{
173173
"description": ".NET Core Debugger (CentOS / x64)",
174-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-2/coreclr-debug-centos.7-x64.zip",
175-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-2/coreclr-debug-centos.7-x64.zip",
174+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-centos.7-x64.zip",
175+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-centos.7-x64.zip",
176176
"installPath": ".debugger",
177177
"runtimeIds": [
178178
"centos.7-x64"
@@ -184,8 +184,8 @@
184184
},
185185
{
186186
"description": ".NET Core Debugger (Debian / x64)",
187-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-2/coreclr-debug-debian.8-x64.zip",
188-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-2/coreclr-debug-debian.8-x64.zip",
187+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-debian.8-x64.zip",
188+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-debian.8-x64.zip",
189189
"installPath": ".debugger",
190190
"runtimeIds": [
191191
"debian.8-x64"
@@ -197,8 +197,8 @@
197197
},
198198
{
199199
"description": ".NET Core Debugger (Fedora 23 / x64)",
200-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-2/coreclr-debug-fedora.23-x64.zip",
201-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-2/coreclr-debug-fedora.23-x64.zip",
200+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-fedora.23-x64.zip",
201+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-fedora.23-x64.zip",
202202
"installPath": ".debugger",
203203
"runtimeIds": [
204204
"fedora.23-x64"
@@ -210,8 +210,8 @@
210210
},
211211
{
212212
"description": ".NET Core Debugger (Fedora 24 / x64)",
213-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-2/coreclr-debug-fedora.24-x64.zip",
214-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-2/coreclr-debug-fedora.24-x64.zip",
213+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-fedora.24-x64.zip",
214+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-fedora.24-x64.zip",
215215
"installPath": ".debugger",
216216
"runtimeIds": [
217217
"fedora.24-x64"
@@ -223,8 +223,8 @@
223223
},
224224
{
225225
"description": ".NET Core Debugger (OpenSUSE 13 / x64)",
226-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-2/coreclr-debug-opensuse.13.2-x64.zip",
227-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-2/coreclr-debug-opensuse.13.2-x64.zip",
226+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-opensuse.13.2-x64.zip",
227+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-opensuse.13.2-x64.zip",
228228
"installPath": ".debugger",
229229
"runtimeIds": [
230230
"opensuse.13.2-x64"
@@ -236,8 +236,8 @@
236236
},
237237
{
238238
"description": ".NET Core Debugger (OpenSUSE 42 / x64)",
239-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-2/coreclr-debug-opensuse.42.1-x64.zip",
240-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-2/coreclr-debug-opensuse.42.1-x64.zip",
239+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-opensuse.42.1-x64.zip",
240+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-opensuse.42.1-x64.zip",
241241
"installPath": ".debugger",
242242
"runtimeIds": [
243243
"opensuse.42.1-x64"
@@ -249,8 +249,8 @@
249249
},
250250
{
251251
"description": ".NET Core Debugger (RHEL / x64)",
252-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-2/coreclr-debug-rhel.7.2-x64.zip",
253-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-2/coreclr-debug-rhel.7.2-x64.zip",
252+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-rhel.7.2-x64.zip",
253+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-rhel.7.2-x64.zip",
254254
"installPath": ".debugger",
255255
"runtimeIds": [
256256
"rhel.7-x64"
@@ -262,8 +262,8 @@
262262
},
263263
{
264264
"description": ".NET Core Debugger (Ubuntu 14.04 / x64)",
265-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-2/coreclr-debug-ubuntu.14.04-x64.zip",
266-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-2/coreclr-debug-ubuntu.14.04-x64.zip",
265+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-ubuntu.14.04-x64.zip",
266+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-ubuntu.14.04-x64.zip",
267267
"installPath": ".debugger",
268268
"runtimeIds": [
269269
"ubuntu.14.04-x64"
@@ -275,8 +275,8 @@
275275
},
276276
{
277277
"description": ".NET Core Debugger (Ubuntu 16.04 / x64)",
278-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-2/coreclr-debug-ubuntu.16.04-x64.zip",
279-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-2/coreclr-debug-ubuntu.16.04-x64.zip",
278+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-ubuntu.16.04-x64.zip",
279+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-ubuntu.16.04-x64.zip",
280280
"installPath": ".debugger",
281281
"runtimeIds": [
282282
"ubuntu.16.04-x64"
@@ -288,8 +288,8 @@
288288
},
289289
{
290290
"description": ".NET Core Debugger (Ubuntu 16.10 / x64)",
291-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-2/coreclr-debug-ubuntu.16.10-x64.zip",
292-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-2/coreclr-debug-ubuntu.16.10-x64.zip",
291+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-ubuntu.16.10-x64.zip",
292+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-ubuntu.16.10-x64.zip",
293293
"installPath": ".debugger",
294294
"runtimeIds": [
295295
"ubuntu.16.10-x64"

‎src/assets.ts‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import * as tasks from 'vscode-tasks';
1010
import { OmniSharpServer } from './omnisharp/server';
1111
import * as serverUtils from './omnisharp/utils';
1212
import * as protocol from './omnisharp/protocol';
13+
import { tolerantParse } from './json';
1314

1415
interface DebugConfiguration {
1516
name: string;
@@ -133,17 +134,15 @@ export class AssetGenerator {
133134
}
134135

135136
let projectFileText = fs.readFileSync(this.projectFilePath, 'utf8');
136-
projectFileText = projectFileText.replace(/^\uFEFF/, '');
137137

138138
if (path.basename(this.projectFilePath).toLowerCase() === 'project.json') {
139139
let projectJsonObject: any;
140140

141141
try {
142-
// TODO: This error should be surfaced to the user. If the JSON can't be parsed
143-
// (maybe due to a syntax error like an extra comma), the user should be notified
144-
// to fix up their project.json.
145-
projectJsonObject = JSON.parse(projectFileText);
146-
} catch (error) {
142+
projectJsonObject = tolerantParse(projectFileText);
143+
}
144+
catch (error) {
145+
vscode.window.showErrorMessage('Failed to parse project.json file');
147146
projectJsonObject = null;
148147
}
149148

@@ -357,8 +356,17 @@ function getBuildOperations(tasksJsonPath: string) {
357356
}
358357

359358
const text = buffer.toString();
360-
const tasksJson: tasks.TaskConfiguration = JSON.parse(text);
361-
const buildTask = tasksJson.tasks.find(td => td.taskName === 'build');
359+
360+
let buildTask: tasks.TaskDescription;
361+
362+
try {
363+
const tasksJson: tasks.TaskConfiguration = tolerantParse(text);
364+
buildTask = tasksJson.tasks.find(td => td.taskName === 'build');
365+
}
366+
catch (error) {
367+
vscode.window.showErrorMessage(`Failed to parse tasks.json file`);
368+
buildTask = undefined;
369+
}
362370

363371
resolve({ updateTasksJson: (buildTask === undefined) });
364372
});

‎src/common.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,4 @@ export function deleteInstallFile(type: InstallFileType): Promise<void> {
111111
resolve();
112112
});
113113
});
114-
}
114+
}

0 commit comments

Comments
 (0)