Merge branch 'main' into patch-1

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Monaco Editor Changelog
 
+## [0.48.0]
+
+### Additions
+
+- Various bug fixes
+- Minimap Section Headers (see config option `showRegionSectionHeaders`)
+- Diff Editor Gutter Menu (see config option `renderGutterMenu`)
+- `InlineCompletionsProvider.handlePartialAccept` has `PartialAcceptInfo`
+
+Contributions to `monaco-editor`:
+
+- [@jeremy-rifkin (Jeremy Rifkin)](https://github.com/jeremy-rifkin): Fix bug with highlighting of C++ raw string literals [PR #4436](https://github.com/microsoft/monaco-editor/pull/4436)
+
 ## [0.47.0]
 
 ### Additions

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "monaco-editor",
-	"version": "0.47.0",
-	"vscodeRef": "1e790d77f81672c49be070e04474901747115651",
+	"version": "0.48.0",
+	"vscodeRef": "e170252f762678dec6ca2cc69aba1570769a5d39",
 	"private": true,
 	"description": "A browser based code editor",
 	"homepage": "https://github.com/microsoft/monaco-editor",
@@ -52,7 +52,7 @@
 		"jsdom": "^19.0.0",
 		"jsonc-parser": "^3.0.0",
 		"mocha": "^9.2.0",
-		"monaco-editor-core": "0.48.0-dev-20240320",
+		"monaco-editor-core": "0.48.0-rc",
 		"parcel": "^2.7.0",
 		"pin-github-action": "^1.8.0",
 		"playwright": "^1.32.2",

src/basic-languages/monaco.contribution.ts

@@ -79,6 +79,7 @@ import './systemverilog/systemverilog.contribution';
 import './tcl/tcl.contribution';
 import './twig/twig.contribution';
 import './typescript/typescript.contribution';
+import './typespec/typespec.contribution';
 import './vb/vb.contribution';
 import './wgsl/wgsl.contribution';
 import './xml/xml.contribution';

src/basic-languages/typespec/typespec.contribution.ts

@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { registerLanguage } from '../_.contribution';
+
+declare var AMD: any;
+declare var require: any;
+
+registerLanguage({
+	id: 'typespec',
+	extensions: ['.tsp'],
+	aliases: ['TypeSpec'],
+	loader: () => {
+		if (AMD) {
+			return new Promise((resolve, reject) => {
+				require(['vs/basic-languages/typespec/typespec'], resolve, reject);
+			});
+		} else {
+			return import('./typespec');
+		}
+	}
+});