Collapse core/compiler/parser into parser

microsoft · Jun 12, 2018 · 066b191 · 066b191
1 parent 7553d90
commit 066b191
Show file tree

Hide file tree

Showing 31 changed files with 461 additions and 3,327 deletions.
diff --git a/Jakefile.js b/Jakefile.js
diff --git a/scripts/produceLKG.ts b/scripts/produceLKG.ts
@@ -0,0 +1,4 @@
+/// <reference types="node" />
+
+const fs = require('fs');
+
diff --git a/src/parser/commandLineParser.ts → src/compiler/commandLineParser.ts b/src/parser/commandLineParser.ts → src/compiler/commandLineParser.ts
diff --git a/src/core/core.ts → src/compiler/core.ts b/src/core/core.ts → src/compiler/core.ts
diff --git a/src/parser/diagnosticMessages.json → src/compiler/diagnosticMessages.json b/src/parser/diagnosticMessages.json → src/compiler/diagnosticMessages.json
diff --git a/src/parser/moduleNameResolver.ts → src/compiler/moduleNameResolver.ts b/src/parser/moduleNameResolver.ts → src/compiler/moduleNameResolver.ts
diff --git a/src/parser/parser.ts → src/compiler/parser.ts b/src/parser/parser.ts → src/compiler/parser.ts
diff --git a/src/core/performance.ts → src/compiler/performance.ts b/src/core/performance.ts → src/compiler/performance.ts
diff --git a/src/parser/scanner.ts → src/compiler/scanner.ts b/src/parser/scanner.ts → src/compiler/scanner.ts
diff --git a/src/parser/sys.ts → src/compiler/sys.ts b/src/parser/sys.ts → src/compiler/sys.ts
diff --git a/src/compiler/tsconfig.json b/src/compiler/tsconfig.json
@@ -3,7 +3,22 @@
     "compilerOptions": {
         "outFile": "../../built/local/compiler.js"
     },
+
+    "references": [],
+
     "files": [
+        "core.ts",
+        "performance.ts",
+
+        "types.ts",
+        "sys.ts",
+        "diagnosticInformationMap.generated.ts",
+        "scanner.ts",
+        "utilities.ts",
+        "parser.ts",
+        "commandLineParser.ts",
+        "moduleNameResolver.ts",
+
         "binder.ts",
         "symbolWalker.ts",
         "checker.ts",
@@ -36,9 +51,5 @@
         "moduleSpecifiers.ts",
         "watch.ts",
         "tsbuild.ts"
-    ],
-    "references": [
-        { "path": "../core" },
-        { "path": "../parser" }
     ]
 }
diff --git a/src/parser/types.ts → src/compiler/types.ts b/src/parser/types.ts → src/compiler/types.ts
diff --git a/src/parser/utilities.ts → src/compiler/utilities.ts b/src/parser/utilities.ts → src/compiler/utilities.ts
diff --git a/src/core/tsconfig.json b/src/core/tsconfig.json
diff --git a/src/harness/tsconfig.json b/src/harness/tsconfig.json
@@ -11,8 +11,6 @@
         ]
     },
     "references": [
-        { "path": "../core" },
-        { "path": "../parser" },
         { "path": "../compiler" },
         { "path": "../services" },
         { "path": "../jsTyping" },

diff --git a/src/jsTyping/tsconfig.json b/src/jsTyping/tsconfig.json
@@ -11,8 +11,7 @@
         ]
     },
     "references": [
-        { "path": "../core" },
-        { "path": "../parser" }
+        { "path": "../compiler" }
     ],
     "files": [
         "shared.ts",

diff --git a/src/parser/diagnosticInformationMap.generated.ts b/src/parser/diagnosticInformationMap.generated.ts
diff --git a/src/parser/diagnosticMessages.generated.json b/src/parser/diagnosticMessages.generated.json
diff --git a/src/parser/tsconfig.json b/src/parser/tsconfig.json
diff --git a/src/server/tsconfig.json b/src/server/tsconfig.json
@@ -9,8 +9,6 @@
         ]
     },
     "references": [
-        { "path": "../core" },
-        { "path": "../parser" },
         { "path": "../compiler" },
         { "path": "../jsTyping" },
         { "path": "../services" }

diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json
@@ -4,10 +4,8 @@
         "outFile": "../../built/local/services.js"
     },
     "references": [
-        { "path": "../core" },
-        { "path": "../parser" },
         { "path": "../compiler" },
-        { "path": "../jsTyping" },
+        { "path": "../jsTyping" }
     ],
     "files": [
         "types.ts",

diff --git a/src/testRunner/tsconfig.json b/src/testRunner/tsconfig.json
@@ -14,8 +14,6 @@
         ]
     },
     "references": [
-        { "path": "../core", "prepend": true },
-        { "path": "../parser", "prepend": true },
         { "path": "../compiler", "prepend": true },
         { "path": "../services", "prepend": true },
         { "path": "../jsTyping", "prepend": true },

diff --git a/src/tsc/tsconfig.json b/src/tsc/tsconfig.json
@@ -7,8 +7,6 @@
         "tsc.ts"
     ],
     "references": [
-        { "path": "../core", "prepend": true },
-        { "path": "../parser", "prepend": true },
         { "path": "../compiler", "prepend": true }
     ]
 }
diff --git a/src/tsconfig.json b/src/tsconfig.json
@@ -4,7 +4,6 @@
     "references": [
         { "path": "./tsc" },
         { "path": "./tsserver" },
-        { "path": "./tsserverLibrary" },
         { "path": "./typingsInstaller" },
         { "path": "./watchGuard" },
         { "path": "./cancellationToken" },

diff --git a/src/tsserver/tsconfig.json b/src/tsserver/tsconfig.json
@@ -11,8 +11,6 @@
         "server.ts"
     ],
     "references": [
-        { "path": "../core", "prepend": true },
-        { "path": "../parser", "prepend": true },
         { "path": "../compiler", "prepend": true },
         { "path": "../services", "prepend": true },
         { "path": "../jsTyping", "prepend": true },

diff --git a/src/tsserverLibrary/empty.ts b/src/tsserverLibrary/empty.ts
diff --git a/src/tsserverLibrary/tsconfig.json b/src/tsserverLibrary/tsconfig.json
diff --git a/src/typescriptServices/empty.ts b/src/typescriptServices/empty.ts
diff --git a/src/typescriptServices/tsconfig.json b/src/typescriptServices/tsconfig.json
diff --git a/src/typingsInstaller/tsconfig.json b/src/typingsInstaller/tsconfig.json
@@ -12,8 +12,7 @@
         ]
     },
     "references": [
-        { "path": "../core", "prepend": true },
-        { "path": "../parser", "prepend": true },
+        { "path": "../compiler", "prepend": true },
         { "path": "../jsTyping", "prepend": true },
         { "path": "../typingsInstallerCore", "prepend": true }
     ],

diff --git a/src/typingsInstallerCore/tsconfig.json b/src/typingsInstallerCore/tsconfig.json
@@ -11,8 +11,7 @@
         ]
     },
     "references": [
-        { "path": "../core" },
-        { "path": "../parser" },
+        { "path": "../compiler" },
         { "path": "../jsTyping" }
     ],
     "files": [