diff --git a/src/vs/editor/common/services/modelServiceImpl.ts b/src/vs/editor/common/services/modelServiceImpl.ts
index 07fb4b3742c86505efbc3f1417b65f952b80cb5f..ea86dd1baf4ddeec7cb5c1eb41f2ddfaac9e2fc9 100644
--- a/src/vs/editor/common/services/modelServiceImpl.ts
+++ b/src/vs/editor/common/services/modelServiceImpl.ts
@@ -164,16 +164,24 @@ class ModelMarkerHandler {
 		}
 
 		let hoverMessage: MarkdownString | null = null;
-		let { message, source, relatedInformation } = marker;
+		let { message, source, relatedInformation, code } = marker;
 
 		if (typeof message === 'string') {
 			message = message.trim();
 
 			if (source) {
 				if (/\n/g.test(message)) {
-					message = nls.localize('diagAndSourceMultiline', "[{0}]\n{1}", source, message);
+					if (code) {
+						message = nls.localize('diagAndSourceAndCodeMultiline', "[{0}]\n{1}\n[{2}]", source, message, code);
+					} else {
+						message = nls.localize('diagAndSourceMultiline', "[{0}]\n{1}", source, message);
+					}
 				} else {
-					message = nls.localize('diagAndSource', "[{0}] {1}", source, message);
+					if (code) {
+						message = nls.localize('diagAndSourceAndCode', "[{0}] {1} [{2}]", source, message, code);
+					} else {
+						message = nls.localize('diagAndSource', "[{0}] {1}", source, message);
+					}
 				}
 			}
 
diff --git a/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts b/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
index 164210a3bfdd977aff34a6322e9d933a52dc7420..694533f44f70155d7fdfdc3a9032b77fb1faf147 100644
--- a/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
+++ b/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
@@ -77,7 +77,7 @@ class MessageWidget {
 		dispose(this._disposables);
 	}
 
-	update({ source, message, relatedInformation }: IMarker): void {
+	update({ source, message, relatedInformation, code }: IMarker): void {
 
 		if (source) {
 			this._lines = 0;
@@ -87,6 +87,9 @@ class MessageWidget {
 			for (let i = 0; i < lines.length; i++) {
 				let line = lines[i];
 				this._lines += 1;
+				if (code && i === lines.length - 1) {
+					line += ` [${code}]`;
+				}
 				this._longestLineLength = Math.max(line.length, this._longestLineLength);
 				if (i === 0) {
 					message = `[${source}] ${line}`;
@@ -96,6 +99,9 @@ class MessageWidget {
 			}
 		} else {
 			this._lines = 1;
+			if (code) {
+				message += ` [${code}]`;
+			}
 			this._longestLineLength = message.length;
 		}