Fixes microsoft#138185. Unicode highlight hover is no longer shown for unicode characters in comments.

Author: hediet

src/vs/editor/common/viewModel/viewModelDecorations.ts

@@ -122,16 +122,8 @@ export class ViewModelDecorations implements IDisposable {
 			let modelDecoration = modelDecorations[i];
 			let decorationOptions = modelDecoration.options;
 
-			if (decorationOptions.hideInCommentTokens) {
-				let allTokensComments = testTokensInRange(
-					this.model,
-					modelDecoration.range,
-					(tokenType) => tokenType === StandardTokenType.Comment
-				);
-
-				if (allTokensComments) {
-					continue;
-				}
+			if (!isModelDecorationVisible(this.model, modelDecoration)) {
+				continue;
 			}
 
 			let viewModelDecoration = this._getOrCreateViewModelDecoration(modelDecoration);
@@ -176,6 +168,21 @@ export class ViewModelDecorations implements IDisposable {
 	}
 }
 
+export function isModelDecorationVisible(model: ITextModel, decoration: IModelDecoration): boolean {
+	if (decoration.options.hideInCommentTokens) {
+		const allTokensAreComments = testTokensInRange(
+			model,
+			decoration.range,
+			(tokenType) => tokenType === StandardTokenType.Comment
+		);
+		if (allTokensAreComments) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
 /**
  * Calls the callback for every token that intersects the range.
  * If the callback returns `false`, iteration stops and `false` is returned.

src/vs/editor/contrib/unicodeHighlighter/unicodeHighlighter.ts

@@ -20,6 +20,7 @@ import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { UnicodeHighlighterOptions, UnicodeHighlighterReason, UnicodeHighlighterReasonKind, UnicodeTextModelHighlighter } from 'vs/editor/common/modes/unicodeTextModelHighlighter';
 import { IEditorWorkerService, IUnicodeHighlightsResult } from 'vs/editor/common/services/editorWorkerService';
 import { IModeService } from 'vs/editor/common/services/modeService';
+import { isModelDecorationVisible } from 'vs/editor/common/viewModel/viewModelDecorations';
 import { HoverAnchor, HoverAnchorType, IEditorHover, IEditorHoverParticipant, IEditorHoverStatusBar, IHoverPart } from 'vs/editor/contrib/hover/hoverTypes';
 import { MarkdownHover, renderMarkdownHovers } from 'vs/editor/contrib/hover/markdownHoverParticipant';
 import { BannerController } from 'vs/editor/contrib/unicodeHighlighter/bannerController';
@@ -255,8 +256,21 @@ class DocumentUnicodeHighlighter extends Disposable {
 		if (!this._decorationIds.has(decorationId)) {
 			return null;
 		}
-		const range = this._editor.getModel().getDecorationRange(decorationId)!;
-		const text = this._editor.getModel().getValueInRange(range);
+		const model = this._editor.getModel();
+		const range = model.getDecorationRange(decorationId)!;
+		if (
+			!isModelDecorationVisible(model, {
+				range: range,
+				options: this._options.includeComments
+					? DECORATION
+					: DECORATION_HIDE_IN_COMMENTS,
+				id: decorationId,
+				ownerId: 0,
+			})
+		) {
+			return null;
+		}
+		const text = model.getValueInRange(range);
 		return {
 			reason: computeReason(text, this._options)!,
 		};
@@ -341,8 +355,21 @@ class ViewportUnicodeHighlighter extends Disposable {
 		if (!this._decorationIds.has(decorationId)) {
 			return null;
 		}
-		const range = this._editor.getModel().getDecorationRange(decorationId)!;
-		const text = this._editor.getModel().getValueInRange(range);
+		const model = this._editor.getModel();
+		const range = model.getDecorationRange(decorationId)!;
+		const text = model.getValueInRange(range);
+		if (
+			!isModelDecorationVisible(model, {
+				range: range,
+				options: this._options.includeComments
+					? DECORATION
+					: DECORATION_HIDE_IN_COMMENTS,
+				id: decorationId,
+				ownerId: 0,
+			})
+		) {
+			return null;
+		}
 		return {
 			reason: computeReason(text, this._options)!,
 		};