From 3860b772e4a9e21aa9b7bd98bc7975691deebc1b Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Fri, 8 Oct 2021 16:58:02 +0200
Subject: [PATCH] Revert "Simplify external .d.ts"

This reverts commit 65b10df98f1d05bf6af4c6233ec4ef1b71a42e27.

See https://www.typescriptlang.org/docs/handbook/modules.html#export--and-import--require
---
 build/gulpfile.editor.js | 45 +++++++++++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js
index cfc3077d4f0..39b26b2f646 100644
--- a/build/gulpfile.editor.js
+++ b/build/gulpfile.editor.js
@@ -198,17 +198,46 @@ const compileEditorESMTask = task.define('compile-editor-esm', () => {
 });
 
 function toExternalDTS(contents) {
+	let lines = contents.split(/\r\n|\r|\n/);
+	let killNextCloseCurlyBrace = false;
+	for (let i = 0; i < lines.length; i++) {
+		let line = lines[i];
 
-	contents = contents.replace(
-		'declare let MonacoEnvironment: monaco.Environment | undefined;',
+		if (killNextCloseCurlyBrace) {
+			if ('}' === line) {
+				lines[i] = '';
+				killNextCloseCurlyBrace = false;
+				continue;
+			}
 
-		'export = monaco;\n'+
-		'declare global {\n' +
-		'\tlet MonacoEnvironment: monaco.Environment | undefined;\n' +
-		'}\n'
-	);
+			if (line.indexOf('    ') === 0) {
+				lines[i] = line.substr(4);
+			} else if (line.charAt(0) === '\t') {
+				lines[i] = line.substr(1);
+			}
 
-	return contents.split(/\r\n|\r|\n/).join('\n').replace(/\n\n\n+/g, '\n\n');
+			continue;
+		}
+
+		if ('declare namespace monaco {' === line) {
+			lines[i] = '';
+			killNextCloseCurlyBrace = true;
+			continue;
+		}
+
+		if (line.indexOf('declare namespace monaco.') === 0) {
+			lines[i] = line.replace('declare namespace monaco.', 'export namespace ');
+		}
+
+		if (line.indexOf('declare let MonacoEnvironment') === 0) {
+			lines[i] = `declare global {\n    let MonacoEnvironment: Environment | undefined;\n}`;
+		}
+
+		if (line.indexOf('\tMonacoEnvironment?') === 0) {
+			lines[i] = `    MonacoEnvironment?: Environment | undefined;`;
+		}
+	}
+	return lines.join('\n').replace(/\n\n\n+/g, '\n\n');
 }
 
 function filterStream(testFunc) {