From d5e3af3744599b65b9ff62699fbeb7d3519b5b8c Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Sat, 13 Nov 2021 20:15:46 +0100
Subject: [PATCH] Move out remaining files from `monaco-typescript`

---
 .../importTypescript.js                       |  4 +--
 monaco-editor.code-workspace                  | 13 +++++++
 monaco-editor/monaco-editor.code-workspace    | 34 -------------------
 monaco-editor/test/index.js                   |  3 +-
 .../test/typescript}/custom-worker.html       |  0
 .../test/typescript}/custom-worker.js         |  0
 .../test/typescript}/index.html               |  0
 .../test/typescript}/inlayHints.html          |  0
 package.json                                  |  2 +-
 9 files changed, 17 insertions(+), 39 deletions(-)
 rename {monaco-typescript => build}/importTypescript.js (97%)
 create mode 100644 monaco-editor.code-workspace
 delete mode 100644 monaco-editor/monaco-editor.code-workspace
 rename {monaco-typescript/test => monaco-editor/test/typescript}/custom-worker.html (100%)
 rename {monaco-typescript/test => monaco-editor/test/typescript}/custom-worker.js (100%)
 rename {monaco-typescript/test => monaco-editor/test/typescript}/index.html (100%)
 rename {monaco-typescript/test => monaco-editor/test/typescript}/inlayHints.html (100%)

diff --git a/monaco-typescript/importTypescript.js b/build/importTypescript.js
similarity index 97%
rename from monaco-typescript/importTypescript.js
rename to build/importTypescript.js
index 039007c4..3dcb3551 100644
--- a/monaco-typescript/importTypescript.js
+++ b/build/importTypescript.js
@@ -14,7 +14,7 @@ const generatedNote = `//
 
 const REPO_ROOT = path.join(__dirname, '../');
 const TYPESCRIPT_LIB_SOURCE = path.join(REPO_ROOT, 'node_modules/typescript/lib');
-const TYPESCRIPT_LIB_DESTINATION = path.join(REPO_ROOT, 'monaco-typescript/src/lib');
+const TYPESCRIPT_LIB_DESTINATION = path.join(REPO_ROOT, 'src/typescript/lib');
 
 (function () {
 	try {
@@ -111,7 +111,7 @@ define("vs/language/typescript/lib/typescriptServices", [], function() { return
 
 	// Remove pattern that creates warnings with esbuild
 	// e.g.
-	// > monaco-typescript/src/lib/typescriptServices.js:20:21: warning: Top-level "this" will be replaced with undefined since this file is an ECMAScript module
+	// > /src/typescript/lib/typescriptServices.js:20:21: warning: Top-level "this" will be replaced with undefined since this file is an ECMAScript module
 	// 20 │ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 	//    ╵                      ~~~~
 	//
diff --git a/monaco-editor.code-workspace b/monaco-editor.code-workspace
new file mode 100644
index 00000000..18ac4963
--- /dev/null
+++ b/monaco-editor.code-workspace
@@ -0,0 +1,13 @@
+{
+	"folders": [
+		{
+			"path": "../vscode"
+		},
+		{
+			"path": "../vscode-loc"
+		},
+		{
+			"path": "."
+		}
+	]
+}
diff --git a/monaco-editor/monaco-editor.code-workspace b/monaco-editor/monaco-editor.code-workspace
deleted file mode 100644
index 91d7cc91..00000000
--- a/monaco-editor/monaco-editor.code-workspace
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "../vscode"
-		},
-		{
-			"path": "../vscode-loc"
-		},
-		{
-			"path": "."
-		},
-		{
-			"path": "../monaco-css"
-		},
-		{
-			"path": "../monaco-html"
-		},
-		{
-			"path": "../monaco-json"
-		},
-		{
-			"path": "../monaco-languages"
-		},
-		{
-			"path": "../monaco-typescript"
-		},
-		{
-			"path": "../monaco-editor-webpack-plugin"
-		},
-		{
-			"path": "../monaco-editor-samples"
-		},
-	]
-}
diff --git a/monaco-editor/test/index.js b/monaco-editor/test/index.js
index 5471603a..f965b7e5 100644
--- a/monaco-editor/test/index.js
+++ b/monaco-editor/test/index.js
@@ -1,5 +1,4 @@
-/// <reference path="../../node_modules/monaco-editor-core/monaco.d.ts" />
-/// <reference path="../../monaco-typescript/monaco.d.ts" />
+/// <reference path="../../release/monaco.d.ts" />
 define(['require', './samples'], function (require, SAMPLES) {
 	var domutils = require('vs/base/browser/dom');
 
diff --git a/monaco-typescript/test/custom-worker.html b/monaco-editor/test/typescript/custom-worker.html
similarity index 100%
rename from monaco-typescript/test/custom-worker.html
rename to monaco-editor/test/typescript/custom-worker.html
diff --git a/monaco-typescript/test/custom-worker.js b/monaco-editor/test/typescript/custom-worker.js
similarity index 100%
rename from monaco-typescript/test/custom-worker.js
rename to monaco-editor/test/typescript/custom-worker.js
diff --git a/monaco-typescript/test/index.html b/monaco-editor/test/typescript/index.html
similarity index 100%
rename from monaco-typescript/test/index.html
rename to monaco-editor/test/typescript/index.html
diff --git a/monaco-typescript/test/inlayHints.html b/monaco-editor/test/typescript/inlayHints.html
similarity index 100%
rename from monaco-typescript/test/inlayHints.html
rename to monaco-editor/test/typescript/inlayHints.html
diff --git a/package.json b/package.json
index c847d45f..d3ed627a 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
 	"license": "MIT",
 	"scripts": {
 		"simpleserver": "gulp simpleserver",
-		"import-typescript": "node ./monaco-typescript/importTypescript",
+		"import-typescript": "node ./build/importTypescript",
 		"watch-src": "tsc -w -p ./src",
 		"watch-languages": "tsc -w -p ./monaco-languages/src",
 		"watch": "npm-run-all -lp watch-src watch-languages",