Merge branch 'release-1.5' into master

2026-05-17 21:06:50 -05:00 · 2015-06-01 17:40:35 -07:00
parent 9d736bc4b3 5b94e40149
commit f96cf338d9
192 changed files with 788 additions and 557 deletions
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -142,7 +142,7 @@ module ts {
            paramType: Diagnostics.LOCATION,
        },
        {
-            name: "separateCompilation",
+            name: "isolatedModules",
            type: "boolean",
        },
        {
@@ -188,10 +188,16 @@ module ts {
            type: "boolean",
            description: Diagnostics.Watch_input_files,
        },
+        {
+            name: "experimentalDecorators",
+            type: "boolean",
+            description: Diagnostics.Enables_experimental_support_for_ES7_decorators
+        },
        {
            name: "emitDecoratorMetadata",
            type: "boolean",
-            experimental: true
+            experimental: true,
+            description: Diagnostics.Enables_experimental_support_for_emitting_type_metadata_for_decorators
        }
    ];