Merge branch 'main' into dependabot/npm_and_yarn/multi-dae47d5549

Co-authored-by: rzhao271 <[email protected]>

Author: Copilot

monaco-lsp-client/src/adapters/languageFeatures/LspCompletionFeature.ts

@@ -197,6 +197,5 @@ function toMonacoDocumentation(doc: string | MarkupContent | undefined): string
     if (typeof doc === 'string') return doc;
     return {
         value: doc.value,
-        isTrusted: true,
     };
 }

monaco-lsp-client/src/adapters/languageFeatures/LspHoverFeature.ts

@@ -68,12 +68,12 @@ function toMonacoMarkdownString(
 
 function toSingleMarkdownString(content: MarkupContent | MarkedString): monaco.IMarkdownString {
     if (typeof content === 'string') {
-        return { value: content, isTrusted: true };
+        return { value: content };
     }
     if ('kind' in content) {
         // MarkupContent
-        return { value: content.value, isTrusted: true };
+        return { value: content.value };
     }
     // MarkedString with language
-    return { value: `\`\`\`${content.language}\n${content.value}\n\`\`\``, isTrusted: true };
+    return { value: `\`\`\`${content.language}\n${content.value}\n\`\`\`` };
 }

monaco-lsp-client/src/adapters/languageFeatures/LspInlayHintsFeature.ts

@@ -207,6 +207,5 @@ function toMonacoTooltip(tooltip: string | MarkupContent | undefined): string |
 
     return {
         value: tooltip.value,
-        isTrusted: true,
     };
 }

monaco-lsp-client/src/adapters/languageFeatures/LspSignatureHelpFeature.ts

@@ -96,6 +96,5 @@ function toMonacoDocumentation(
     if (typeof doc === 'string') return doc;
     return {
         value: doc.value,
-        isTrusted: true,
     };
 }

package-lock.json

@@ -96,7 +96,7 @@
 		"vscode-languageserver-textdocument": "^1.0.11",
 		"vscode-languageserver-types": "3.17.5",
 		"vscode-uri": "3.0.8",
-		"webpack": "^5.76.0",
+		"webpack": "^5.105.4",
 		"yaserver": "^0.4.0"
 	},
 	"alias": {

package.json

@@ -43,7 +43,7 @@ webpack(
 				monacoEditorPath: path.resolve(REPO_ROOT, 'out/monaco-editor')
 			})]
 	},
-	(err: Error | undefined, stats: webpack.Stats | undefined) => {
+	(err: Error | null, stats: webpack.Stats | undefined) => {
 		if (err) {
 			console.error(err);
 			process.exit(1);