Merge pull request #536 from jcreedcmu/jcreed/fix-none

jcreedcmu · web-flow · commit 1f4e69940de8 · 2020-08-13T11:04:09.000-04:00
Fix #535
diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CodeQL for Visual Studio Code: Changelog
 
+## 1.3.3 - [UNRELEASED]
+
+- Fix display of raw results entities with label but no url.
+
 ## 1.3.2 - 12 August 2020
 
 - Fix error with choosing qlpack search path.
diff --git a/extensions/ql-vscode/src/adapt.ts b/extensions/ql-vscode/src/adapt.ts
@@ -73,7 +73,7 @@ export function adaptValue(val: ColumnValue): ResultValue {
   }
 
   if (url === undefined) {
-    return 'none';
+    return val.label || '';
   }
 
   return {

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ export function adaptValue(val: ColumnValue): ResultValue {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`if (url === undefined) {`
`76`		`- return 'none';`
	`76`	`+ return val.label \|\| '';`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`return {`