From 457ce3ff7e6acd364caf49a36625805da3bd7663 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Mon, 27 Apr 2020 10:53:33 +0200 Subject: [PATCH] Fixes #95936: Improve width sizing for tokens inspector widget --- .../browser/inspectEditorTokens/inspectEditorTokens.css | 1 + .../browser/inspectEditorTokens/inspectEditorTokens.ts | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.css b/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.css index d7736b342da..63601ef1c79 100644 --- a/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.css +++ b/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.css @@ -32,6 +32,7 @@ .tiw-metadata-value { font-family: var(--monaco-monospace-font); text-align: right; + word-break: break-word; } .tiw-metadata-key { vertical-align: top; diff --git a/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts b/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts index a8810e4b0cf..133f4febc65 100644 --- a/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts +++ b/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts @@ -251,6 +251,7 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget { } let text = this._compute(grammar, semanticTokens, position); this._domNode.innerHTML = text; + this._domNode.style.maxWidth = `${Math.max(this._editor.getLayoutInfo().width * 0.66, 500)}px`; this._editor.layoutContentWidget(this); }, (err) => { this._notificationService.warn(err); @@ -552,7 +553,8 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget { theme.resolveScopes(definition, scopesDefinition); const matchingRule = scopesDefinition[property]; if (matchingRule && scopesDefinition.scope) { - return `${escape(scopesDefinition.scope.join(' '))}
${matchingRule.scope}\n${JSON.stringify(matchingRule.settings, null, '\t')}`; + const strScopes = Array.isArray(matchingRule.scope) ? matchingRule.scope.join(', ') : String(matchingRule.scope); + return `${escape(scopesDefinition.scope.join(' '))}
${strScopes}\n${JSON.stringify(matchingRule.settings, null, '\t')}`; } return ''; } else if (TokenStylingRule.is(definition)) { -- GitLab