Merge branch 'master' into tsConfigExclude

Conflicts: src/compiler/sys.ts
2025-11-18 17:21:48 +00:00 · 2015-06-03 15:12:13 -07:00
parent 70d2938f4f b55117792f
commit 990f19b69e
689 changed files with 25222 additions and 6025 deletions
@@ -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
        }
    ];