Merge branch 'master' into integrationTest

Author: Ravi Chande

CHANGELOG.md

@@ -5,6 +5,10 @@
 
 ## 1.14.0 _(Not Yet Released)_
 
+#### C# Language Support
+
+* Support for C# 7.2 (PR: [omnisharp-roslyn#1055](https://github.com/OmniSharp/omnisharp-roslyn/pull/1055)) _(Contributed by [@filipw](https://github.com/filipw))_
+
 #### Debugger
 
 * Fixes symbol loading while debugging apps running under .NET Core 2.1 (ex: netcoreapp 2.1) on Linux and macOS
@@ -15,10 +19,26 @@
 #### Editor
 
 * Fix to allow signature help return results for attribute constructors. ([#1814](https://github.com/OmniSharp/omnisharp-vscode/issues/1814), PR: [omnisharp-roslyn#1007](https://github.com/OmniSharp/omnisharp-roslyn/pull/1007))
+* Fix to return correct SymbolKinds from WorkspaceSymbolprovider ([#1907](https://github.com/OmniSharp/omnisharp-vscode/issues/1907), PR: [#1911](https://github.com/OmniSharp/omnisharp-vscode/pull/1911)) _(Contributed by [@craig006](https://github.com/craig006))_
+* Improved newline formatting in hover info ([#1057](https://github.com/OmniSharp/omnisharp-vscode/issues/1057), PR: [#1918](https://github.com/OmniSharp/omnisharp-vscode/pull/1918))
+* Disabled Go To Definition on property acessor keywords ([#1949](https://github.com/OmniSharp/omnisharp-vscode/issues/1949), PR: [omnisharp-roslyn#1086](https://github.com/OmniSharp/omnisharp-roslyn/pull/1086))
+* Bug fixes to IntelliSense (completion, signature help): (([#1664](https://github.com/OmniSharp/omnisharp-vscode/issues/1664), [1440](https://github.com/OmniSharp/omnisharp-vscode/issues/1440), PR: [omnisharp-roslyn#1030](https://github.com/OmniSharp/omnisharp-roslyn/pull/1030)); ([#146](https://github.com/OmniSharp/omnisharp-vscode/issues/146) , PR: [#1776](https://github.com/OmniSharp/omnisharp-vscode/pull/1776)))
+* Improved "Format Code" behavior: ([#214](https://github.com/OmniSharp/omnisharp-vscode/issues/214), PR: [omnisharp-roslyn#1043](https://github.com/OmniSharp/omnisharp-roslyn/pull/1043))
+* Improved code action ordering: ([omnisharp-roslyn#758](https://github.com/OmniSharp/omnisharp-roslyn/issues/758), PR: [omnisharp-roslyn#1078](https://github.com/OmniSharp/omnisharp-roslyn/pull/1078))
 
 #### Project System
 
 * Addressed problems with projects not being refreshed by OmniSharp after a package restore. ([#1583](https://github.com/OmniSharp/omnisharp-vscode/issues/1583), [#1661](https://github.com/OmniSharp/omnisharp-vscode/issues/1661), [#1785](https://github.com/OmniSharp/omnisharp-vscode/issues/1785), PR: [omnisharp-roslyn#1003](https://github.com/OmniSharp/omnisharp-roslyn/pull/1003))
+* Added option to disable warning about project.json deprecation ([1920](https://github.com/OmniSharp/omnisharp-vscode/issues/1920), PR: [#1926](https://github.com/OmniSharp/omnisharp-vscode/pull/1926))
+
+#### Task Generation
+
+* Updated task generator to match latest schema from VS Code (PR: [#1932](https://github.com/OmniSharp/omnisharp-vscode/pull/1923)) _(Contributed by [@natec425](https://github.com/natec425))_
+* Fixed a typo in tasks.json (PR: [1945](https://github.com/OmniSharp/omnisharp-vscode/pull/1945)) _(Contributed by [@SebastianPfliegel](SebastianPfliegel))_
+
+#### Misc
+
+* Fixed offline packaging ([1912](https://github.com/OmniSharp/omnisharp-vscode/issues/1912), [1930](https://github.com/OmniSharp/omnisharp-vscode/issues/1930), PR: [#1931](https://github.com/OmniSharp/omnisharp-vscode/pull/1931))
 
 ## 1.13.1 (November 13, 2017)
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "csharp",
   "publisher": "ms-vscode",
-  "version": "1.14.0-beta3",
+  "version": "1.14.0-beta4",
   "description": "C# for Visual Studio Code (powered by OmniSharp).",
   "displayName": "C#",
   "author": "Microsoft Corporation",
@@ -50,7 +50,7 @@
     "semver": "*",
     "tmp": "0.0.33",
     "vscode-debugprotocol": "^1.6.1",
-    "vscode-extension-telemetry": "0.0.8",
+    "vscode-extension-telemetry": "0.0.11",
     "yauzl": "^2.5.0"
   },
   "devDependencies": {

src/features/documentation.ts

@@ -36,42 +36,45 @@ export function GetDocumentationString(structDoc: protocol.DocumentationComment)
     let indentSpaces = "\t\t";
     let documentation = "";
 
-    if (structDoc.SummaryText) {
-        documentation += structDoc.SummaryText + newLine;
+    if (structDoc) {
+        if (structDoc.SummaryText) {
+            documentation += structDoc.SummaryText + newLine;
+        }
+
+        if (structDoc.TypeParamElements && structDoc.TypeParamElements.length > 0) {
+            documentation += "Type Parameters:" + newLine;
+            documentation += indentSpaces + structDoc.TypeParamElements.map(displayDocumentationObject).join("\n" + indentSpaces) + newLine;
+        }
+
+        if (structDoc.ParamElements && structDoc.ParamElements.length > 0) {
+            documentation += "Parameters:" + newLine;
+            documentation += indentSpaces + structDoc.ParamElements.map(displayDocumentationObject).join("\n" + indentSpaces) + newLine;
+        }
+
+        if (structDoc.ReturnsText) {
+            documentation += structDoc.ReturnsText + newLine;
+        }
+
+        if (structDoc.RemarksText) {
+            documentation += structDoc.RemarksText + newLine;
+        }
+
+        if (structDoc.ExampleText) {
+            documentation += structDoc.ExampleText + newLine;
+        }
+
+        if (structDoc.ValueText) {
+            documentation += structDoc.ValueText + newLine;
+        }
+
+        if (structDoc.Exception && structDoc.Exception.length > 0) {
+            documentation += "Exceptions:" + newLine;
+            documentation += indentSpaces + structDoc.Exception.map(displayDocumentationObject).join("\n" + indentSpaces) + newLine;
+        }
+
+        documentation = documentation.trim();
     }
-
-    if (structDoc.TypeParamElements && structDoc.TypeParamElements.length > 0) {
-        documentation += "Type Parameters:" + newLine;
-        documentation += indentSpaces + structDoc.TypeParamElements.map(displayDocumentationObject).join("\n" + indentSpaces) + newLine;
-    }
-
-    if (structDoc.ParamElements && structDoc.ParamElements.length > 0) {
-        documentation += "Parameters:" + newLine;
-        documentation += indentSpaces + structDoc.ParamElements.map(displayDocumentationObject).join("\n" + indentSpaces) + newLine;
-    }
-
-    if (structDoc.ReturnsText) {
-        documentation += structDoc.ReturnsText + newLine;
-    }
-
-    if (structDoc.RemarksText) {
-        documentation += structDoc.RemarksText + newLine;
-    }
-
-    if (structDoc.ExampleText) {
-        documentation += structDoc.ExampleText + newLine;
-    }
-
-    if (structDoc.ValueText) {
-        documentation += structDoc.ValueText + newLine;
-    }
-
-    if (structDoc.Exception && structDoc.Exception.length > 0) {
-        documentation += "Exceptions:" + newLine;
-        documentation += indentSpaces + structDoc.Exception.map(displayDocumentationObject).join("\n" + indentSpaces) + newLine;
-    }
-
-    documentation = documentation.trim();
+    
     return documentation;
 }